Skip to content

Commit

Permalink
Bump root files
Browse files Browse the repository at this point in the history
  • Loading branch information
Koshenko committed Apr 21, 2024
1 parent f9c03f7 commit b618e04
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 42 deletions.
20 changes: 0 additions & 20 deletions .editorconfig

This file was deleted.

2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
931da9e7ef8c0f52a768eed7998e7e62ccdefcdc
# Remove hideous inline tab indentation, and bans it in contributing guidelines
0f435d5dff0a7957e8cba60a41a7fc10439064c3
# Remove one errant disposals pipe
cc78227c693a3246e8d4d2930ee97242f6546246
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
*.gif binary
*.jpg binary
*.png binary
*.ico binary
*.so binary

## Merger hooks, run tools/hooks/install.bat or install.sh to set up
Expand Down
65 changes: 55 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
###Files and folders specified here will never be tracked.

# Local overrides--you can use this to change the config for your dev environment (like setting up SQL) without worrying about committing it
/config/dev_overrides.txt

#Ignore everything in datafolder and subdirectories
/data/**/*
/tmp/**/*
/cache/**/*

#Ignore byond config folder.
/cfg/**/*

#Ignore IDE files we don't need in the repo.
/.vs/**/*
/tgstation/FileContentIndex/**/*
/FileContentIndex/**/*
/v17/**/*
/v18/**/*
/v19/**/*
/v20/**/*
/v21/**/*
/v22/**/*

# Ignore compiled linux libs in the root folder, e.g. librust_g.so
/*.so

Expand Down Expand Up @@ -177,6 +192,9 @@ Temporary Items
/_maps/**/backup/
/_maps/templates.dm

#dmm palette file. You really should be using StrongDMM instead.
*.dmm-pal

#dmdoc default folder
/dmdoc

Expand All @@ -189,13 +207,40 @@ Temporary Items
!/config/title_screens/images/exclude

#Linux docker
/tools/LinuxOneShot/SetupProgram/obj/*
/tools/LinuxOneShot/SetupProgram/bin/*
/tools/LinuxOneShot/SetupProgram/.vs
/tools/LinuxOneShot/Database
/tools/LinuxOneShot/TGS_Config
/tools/LinuxOneShot/TGS_Instances
/tools/LinuxOneShot/TGS_Logs

# Autowiki
/tools/autowiki/node_modules
/tools/tgs_test/.vs/*
/tools/tgs_test/bin/*
/tools/tgs_test/obj/*

# Built auxtools libraries and intermediate files
aux*.dll
libaux*.so
aux*.pdb

# byond-tracy, we intentionally do not ship this and do not want to maintain it
# https://github.com/mafemergency/byond-tracy/
prof.dll
libprof.so

# Tracy can read source files when it is in the root folder, even without absolute paths.
# If you're interested, run this hack:
# https://gist.github.com/Mothblocks/db5462aa84d7d6b1d1b1276b820f62da
Tracy.exe

# JavaScript tools
**/node_modules

# Screenshot tests
/artifacts

# named byond versions config
/tools/build/dm_versions.json

# From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed.
define_sanity_output.txt

# ezdb
/db/
/config/ezdb.txt

# Running OpenDream locally
tgstation.json
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# We don't want prettier to run on anything outside of the TGUI folder, so we have to do this.
/*

# We want it to run into the TGUI folder, however.
!/tgui
25 changes: 25 additions & 0 deletions .tgs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This file is used by TGS (https://github.com/tgstation/tgstation-server) clients to quickly initialize a server instance for the codebase
# The format isn't documented anywhere but hopefully we never have to change it. If there are questions, contact the TGS maintainer Cyberboss/@Dominion#0444
version: 1
# The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
# Must be interpreted as a string, keep quoted
byond: "515.1633"
# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
static_files:
# Config directory should be static
- name: config
# This implies the folder should be pre-populated with contents from the repo
populate: true
# Data directory must be static
- name: data
# String dictionary. The value is the location of the file in the repo to upload to TGS. The key is the name of the file to upload to "<instance_path>/Configuration/EventScripts/"
# This one is for Linux hosted servers
linux_scripts:
PreCompile.sh: tools/tgs_scripts/PreCompile.sh
WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh
InstallDeps.sh: tools/tgs_scripts/InstallDeps.sh
# Same as above for Windows hosted servers
windows_scripts:
PreCompile.bat: tools/tgs_scripts/PreCompile.bat
# The security level the game should be run at
security: Trusted
8 changes: 0 additions & 8 deletions .tgs4.yml

This file was deleted.

10 changes: 10 additions & 0 deletions __odlint.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// This file is included right at the start of the DME.
// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase
// These are essentially nitpicks the DM compiler should pick up on but doesnt

#if !defined(SPACEMAN_DMM) && defined(OPENDREAM)
// This is in a separate file as a hack to avoid SpacemanDMM
// evaluating the #pragma lines, even if its outside a block it cares about
// (Also so people can code-own it. Shoutout to AA)
#include "tools/ci/od_lints.dm"
#endif
6 changes: 3 additions & 3 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export BYOND_MINOR=1633
export RUST_G_VERSION=3.1.0

#node version
export NODE_VERSION=14
export NODE_VERSION_PRECISE=14.16.1
export NODE_VERSION=20
export NODE_VERSION_LTS=20.12.0

# SpacemanDMM git tag
export SPACEMAN_DMM_VERSION=suite-1.8
Expand All @@ -24,7 +24,7 @@ export PYTHON_VERSION=3.9.0
export AUXLUA_REPO=tgstation/auxlua

#auxlua git tag
export AUXLUA_VERSION=1.4.1
export AUXLUA_VERSION=1.4.4

#hypnagogic repo
export CUTTER_REPO=actioninja/hypnagogic
Expand Down
Binary file modified rust_g.dll
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// END_PREFERENCES

// BEGIN_INCLUDE
#include "__odlint.dm"
#include "_maps\_basemap.dm"
#include "code\__byond_version_compat.dm"
#include "code\_compile_options.dm"
Expand Down

0 comments on commit b618e04

Please sign in to comment.