Merge remote-tracking branch 'upstream/master' into chameleon-sneakyness

.github/alternate_byond_versions.txt

@@ -6,4 +6,4 @@
 # Example:
 # 500.1337: runtimestation
 
-515.1603: runtimestation
+515.1620: runtimestation

.github/workflows/autowiki.yml

@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   autowiki:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: "Check for AUTOWIKI_USERNAME"
       id: secrets_set
@@ -30,9 +30,6 @@ jobs:
     - name: Install rust-g
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
-        sudo dpkg --add-architecture i386
-        sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
         bash tools/ci/install_rust_g.sh
     - name: Compile and generate Autowiki files
       if: steps.secrets_set.outputs.SECRETS_ENABLED

.github/workflows/run_integration_tests.yml

@@ -18,7 +18,7 @@ on:
         type: string
 jobs:
   run_integration_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       mysql:
         image: mysql:latest
@@ -43,9 +43,6 @@ jobs:
           mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
       - name: Install rust-g
         run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
           bash tools/ci/install_rust_g.sh
       - name: Install auxlua
         run: |

.tgs.yml

@@ -3,7 +3,7 @@
 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: "514.1588"
+byond: "515.1610"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

README.md

@@ -1,24 +1,26 @@
-## /tg/station codebase
+# monkestation codebase
 
-[![Build Status](https://github.com/tgstation/tgstation/workflows/CI%20Suite/badge.svg)](https://github.com/tgstation/tgstation/actions?query=workflow%3A%22CI+Suite%22)
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open")
-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue")
+[![Build Status](https://github.com/monkestation/monkestation2.0/workflows/CI%20Suite/badge.svg)](https://github.com/monkestation/monkestation2.0/actions?query=workflow%3A%22CI+Suite%22)
+[![Percentage of issues still open](https://isitmaintained.com/badge/open/monkestation/monkestation2.0.svg)](https://isitmaintained.com/project/monkestation/monkestation2.0 "Percentage of issues still open")
+[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/monkestation/monkestation2.0.svg)](https://isitmaintained.com/project/monkestation/monkestation2.0 "Average time to resolve an issue")
 ![Coverage](https://img.shields.io/badge/coverage---3%25-red.svg)
 
-[![resentment](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://www.monkeyuser.com/assets/images/2019/131-bug-free.png) [![resentment](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
+[![forthebadge](monkestation/badges/fueled-by-potassium.svg)](https://forthebadge.com) [![resentment](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://www.monkeyuser.com/assets/images/2019/131-bug-free.png) [![resentment](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
-* **Website:** https://www.tgstation13.org
-* **Code:** https://github.com/tgstation/tgstation
-* **Wiki:** https://tgstation13.org/wiki/Main_Page
-* **Codedocs:** https://codedocs.tgstation13.org/
-* **/tg/station Discord:** https://tgstation13.org/phpBB/viewforum.php?f=60
-* **Coderbus Discord:** https://discord.gg/Vh8TJp9
+| Website                 | Link                                           |
+|-------------------------|------------------------------------------------|
+| Website                 | [https://monkestation.com/](https://monkestation.com/) |
+| Code                    | [https://github.com/Monkestation/Monkestation2.0](https://github.com/Monkestation/Monkestation2.0) |
+| Wiki                    | [https://wiki.monkestation.com/](https://wiki.monkestation.com/) |
+| Codedocs                | [https://codedocs.tgstation13.org/](https://codedocs.tgstation13.org/) |
+| monkestation Discord    | [https://discord.com/invite/monkestation](https://discord.com/invite/monkestation) |
 
-This is the codebase for the /tg/station flavoured fork of SpaceStation 13.
+This is the codebase for the monkestation-flavored fork of Space Station 13.
 
-Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive!
+Space Station 13 is a paranoia-laden, round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive!
 
 ## DOWNLOADING
+
 [Downloading](.github/guides/DOWNLOADING.md)
 
 [Running on the server](.github/guides/RUNNING_A_SERVER.md)
@@ -27,17 +29,18 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
 
 ## :exclamation: How to compile :exclamation:
 
-On **2021-01-04** we have changed the way to compile the codebase.
+On **2021-01-04** we changed the way to compile the codebase.
 
-**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.
+**The quick way**. Find `bin/server.cmd` in this folder and double-click it to automatically build and host the server on port 1337.
 
-**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
+**The long way**. Find `bin/build.cmd` in this folder, and double-click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
 
 **Building tgstation in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.
 
 **[How to compile in VSCode and other build options](tools/build/README.md).**
 
 ## Contributors
+
 [Guides for Contributors](.github/CONTRIBUTING.md)
 
 [/tg/station HACKMD account](https://hackmd.io/@tgstation) - Design documentation here
@@ -46,15 +49,29 @@ On **2021-01-04** we have changed the way to compile the codebase.
 
 ## LICENSE
 
-All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).
+[![license-badge](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/licenses/agpl-3.0.html)
+
+All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014-12-31 at 16:38 PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).
+
+---
+
+[![license-badge](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.html)
 
-All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
+All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014-12-31 at 16:38 PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
 (Including tools unless their readme specifies otherwise.)
 
-See LICENSE and GPLv3.txt for more details.
+See [LICENSE](LICENSE) and [GPLv3.txt](GPLv3.txt) for more details.
+
+---
+
+[![forthebadge](https://forthebadge.com/images/badges/license-mit.svg)](https://forthebadge.com)
 
 The TGS DMAPI is licensed as a subproject under the MIT license.
 
 See the footer of [code/__DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/modules/tgs/LICENSE](./code/modules/tgs/LICENSE) for the MIT license.
 
-All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
+---
+
+[![forthebadge](https://forthebadge.com/images/badges/cc-by-sa.svg)](https://forthebadge.com)
+
+All assets, including icons and sound, are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.

code/__DEFINES/_helpers.dm

@@ -25,14 +25,5 @@
 	} \
 	sleep(time);
 
-#ifdef EXPERIMENT_515_DONT_CACHE_REF
 /// Takes a datum as input, returns its ref string
 #define text_ref(datum) ref(datum)
-#else
-/// Takes a datum as input, returns its ref string, or a cached version of it
-/// This allows us to cache \ref creation, which ensures it'll only ever happen once per datum, saving string tree time
-/// It is slightly less optimal then a []'d datum, but the cost is massively outweighed by the potential savings
-/// It will only work for datums mind, for datum reasons
-/// : because of the embedded typecheck
-#define text_ref(datum) (isdatum(datum) ? (datum:cached_ref ||= "\ref[datum]") : ("\ref[datum]"))
-#endif

code/__DEFINES/_protect.dm

@@ -1,4 +1,5 @@
 ///Protects a datum from being VV'd or spawned through admin manipulation
+#ifndef TESTING
 #define GENERAL_PROTECT_DATUM(Path)\
 ##Path/can_vv_get(var_name){\
 	return FALSE;\
@@ -15,3 +16,6 @@
 ##Path/Write(savefile/savefile){\
 	return;\
 }
+#else
+#define GENERAL_PROTECT_DATUM(Path)
+#endif

code/__DEFINES/blackmarket.dm

@@ -7,4 +7,5 @@
 #define SHIPPING_METHOD_TELEPORT "Teleport"
 // Throws the item from somewhere at the station.
 #define SHIPPING_METHOD_LAUNCH "Launch"
-
+/// item appears at your feet used by auctions
+#define SHIPPING_METHOD_AT_FEET "Feet"

code/__DEFINES/construction.dm

@@ -146,6 +146,7 @@ GLOBAL_LIST_INIT(crafting_category_food, list(
 #define CAT_ENTERTAINMENT "Entertainment"
 #define CAT_TOOLS "Tools"
 #define CAT_CULT "Blood Cult"
+#define CAT_GUNPARTS "Gun Parts"
 
 GLOBAL_LIST_INIT(crafting_category, list(
 	CAT_WEAPON_RANGED,
@@ -166,6 +167,7 @@ GLOBAL_LIST_INIT(crafting_category, list(
 	CAT_ENTERTAINMENT,
 	CAT_TOOLS,
 	CAT_CULT,
+	CAT_GUNPARTS,
 ))
 
 //rcd modes

code/__DEFINES/logging.dm

@@ -49,7 +49,8 @@
 #define LOG_RADIO_EMOTE (1 << 20)
 #define LOG_SPEECH_INDICATORS (1 << 21)
 #define LOG_CLONING (1 << 22)
-#define LOG_MECHCOMP (1 <<23)
+#define LOG_MECHCOMP (1 << 23)
+#define LOG_BLACKMARKET (1 << 24)
 
 //Individual logging panel pages
 #define INDIVIDUAL_GAME_LOG (LOG_GAME)
@@ -86,8 +87,9 @@
 #define LOG_ENTRY_KEY_ID "id"
 #define LOG_ENTRY_KEY_SCHEMA_VERSION "s-ver"
 
-// Category for invalid/missing categories
-#define LOG_CATEGORY_NOT_FOUND "invalid-category"
+// Internal categories
+#define LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND "internal-category-not-found"
+#define LOG_CATEGORY_INTERNAL_ERROR "internal-error"
 
 // Misc categories
 #define LOG_CATEGORY_ATTACK "attack"
@@ -114,6 +116,7 @@
 #define LOG_CATEGORY_MUSIC "music"
 #define LOG_CATEGORY_META "currency"
 #define LOG_CATEGORY_ARTIFACT "artifact"
+#define LOG_CATEGORY_BLACKMARKET "blackmarket"
 
 // Admin categories
 #define LOG_CATEGORY_ADMIN "admin"

code/__DEFINES/overlays.dm

@@ -1,6 +1,6 @@
 // A reasonable number of maximum overlays an object needs
 // If you think you need more, rethink it
-#define MAX_ATOM_OVERLAYS 100
+#define MAX_ATOM_OVERLAYS 250
 
 /// Checks if an atom has reached the overlay limit, and make a loud error if it does.
 #define VALIDATE_OVERLAY_LIMIT(changed_on) \

code/__DEFINES/rust_g.dm

@@ -39,11 +39,8 @@
 #endif
 
 // Handle 515 call() -> call_ext() changes
-#if DM_VERSION >= 515
 #define RUSTG_CALL call_ext
-#else
-#define RUSTG_CALL call
-#endif
+
 
 /// Gets the version of rust_g
 /proc/rustg_get_version() return RUSTG_CALL(RUST_G, "get_version")()
@@ -110,9 +107,15 @@
 #define rustg_dmi_strip_metadata(fname) RUSTG_CALL(RUST_G, "dmi_strip_metadata")(fname)
 #define rustg_dmi_create_png(path, width, height, data) RUSTG_CALL(RUST_G, "dmi_create_png")(path, width, height, data)
 #define rustg_dmi_resize_png(path, width, height, resizetype) RUSTG_CALL(RUST_G, "dmi_resize_png")(path, width, height, resizetype)
+/**
+ * input: must be a path, not an /icon; you have to do your own handling if it is one, as icon objects can't be directly passed to rustg.
+ *
+ * output: json_encode'd list. json_decode to get a flat list with icon states in the order they're in inside the .dmi
+ */
+#define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname)
 
 #define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname)
-#define rustg_file_exists(fname) RUSTG_CALL(RUST_G, "file_exists")(fname)
+#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true")
 #define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname)
 #define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname)
 #define rustg_file_get_line_count(fname) text2num(RUSTG_CALL(RUST_G, "file_get_line_count")(fname))
@@ -123,7 +126,13 @@
 	#define text2file(text, fname) rustg_file_append(text, "[fname]")
 #endif
 
+/// Returns the git hash of the given revision, ex. "HEAD".
 #define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev)
+
+/**
+ * Returns the date of the given revision in the format YYYY-MM-DD.
+ * Returns null if the revision is invalid.
+ */
 #define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev)
 
 #define RUSTG_HTTP_METHOD_GET "get"
@@ -158,8 +167,9 @@
 #define rustg_time_milliseconds(id) text2num(RUSTG_CALL(RUST_G, "time_milliseconds")(id))
 #define rustg_time_reset(id) RUSTG_CALL(RUST_G, "time_reset")(id)
 
+/// Returns the timestamp as a string
 /proc/rustg_unix_timestamp()
-	return text2num(RUSTG_CALL(RUST_G, "unix_timestamp")())
+	return RUSTG_CALL(RUST_G, "unix_timestamp")()
 
 #define rustg_raw_read_toml_file(path) json_decode(RUSTG_CALL(RUST_G, "toml_file_to_json")(path) || "null")
 

code/__DEFINES/sound.dm

@@ -18,6 +18,7 @@
 #define CHANNEL_Z 1008
 #define CHANNEL_WALKMAN 1007 //monkestation edit
 #define CHANNEL_MASTER_VOLUME 1006
+#define CHANNEL_PRUDE 1007
 
 ///Default range of a sound.
 #define SOUND_RANGE 17
@@ -34,7 +35,7 @@
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
 
-#define CHANNEL_HIGHEST_AVAILABLE 1006 //monkestation edit
+#define CHANNEL_HIGHEST_AVAILABLE 1007 //monkestation edit
 
 #define MAX_INSTRUMENT_CHANNELS (128 * 6)
 

code/__DEFINES/stamina.dm

@@ -42,7 +42,7 @@
 ///The amount of stamina at which point swinging is free.
 #define STAMINA_MAXIMUM_TO_SWING 100
 ///The time a mob is stunned when stamina stunned
-#define STAMINA_STUN_TIME 5 SECONDS
+#define STAMINA_STUN_TIME 9 SECONDS
 ///The base value of a stamina stun chance
 #define STAMINA_SCALING_STUN_BASE 20
 ///The maximum additional stun chance based on missing stamina

code/__DEFINES/~monkestation/_patreon.dm

@@ -4,7 +4,8 @@
 #define ASSISTANT_RANK "9641458"
 #define COMMAND_RANK "9641523"
 #define TRAITOR_RANK "9641531" //muh defines
-#define NUKIE_RANK "9641543"
+#define NUKIE_RANK "10901851"
+#define OLD_NUKIE_RANK "9641543"
 
 #define ACCESS_THANKS_RANK 1
 #define ACCESS_ASSISTANT_RANK 2

code/__DEFINES/~monkestation/dcs/signals/signals_guns.dm

@@ -0,0 +1,5 @@
+#define COMSIG_ATTACHMENT_ATTACHED "comsig_attachment_attached"
+#define COMSIG_ATTACHMENT_DETACHED "comsig_attachment_detached"
+#define COMSIG_ATTACHMENT_ATTACH_ATTEMPT "comsig_attachment_attach_attempt"
+#define COMSIG_GUN_RACKED "gun_racked"
+#define COMSIG_ATTACHMENT_STAT_RESET "gun_stat_reset"

code/__DEFINES/~monkestation/guns.dm

@@ -0,0 +1,16 @@
+#define GUN_ATTACH_AK "ak"
+#define GUN_ATTACH_AK_ST "ak_st"
+#define GUN_ATTACH_MK_58 "mk58"
+#define GUN_ATTACH_WINTERMUTE "wintermute"
+
+#define ATTACHMENT_TYPE_MAG "attach_mag"
+#define ATTACHMENT_TYPE_STOCK "attach_stock"
+#define ATTACHMENT_TYPE_GRIP "attach_grip"
+#define ATTACHMENT_TYPE_BARREL "attach_barrel"
+#define ATTACHMENT_TYPE_SIGHT "attach_sight"
+#define ATTACHMENT_TYPE_UNDERBARREL "attach_underbarrel"
+#define ATTACHMENT_TYPE_WELROD "attach_welrod"
+#define ATTACHMENT_TYPE_FRAME "attach_frame"
+#define ATTACHMENT_TYPE_KEYCHAIN "attach_keychain?"
+
+#define ATTACHMENT_COLORABLE (1<<0)

code/__DEFINES/~monkestation/market.dm

@@ -0,0 +1,2 @@
+#define MARKET_PROCESS (1<<0)
+#define MARKET_AUCTION (1<<1)

code/__DEFINES/~monkestation/projectiles.dm

@@ -0,0 +1,5 @@
+//Calibers for guns
+///used in mk58
+#define CALIBER_435 "4.35"
+///used in mk58
+#define CALIBER_235 "2.35"

code/__HELPERS/_auxtools_api.dm

@@ -10,7 +10,7 @@ GLOBAL_PROTECT(auxtools_initialized)
 	}\
 	if (GLOB.auxtools_initialized[LIB] != AUXTOOLS_FULL_INIT) {\
 		if (fexists(LIB)) {\
-			var/string = LIBCALL(LIB,"auxtools_init")();\
+			var/string = call_ext(LIB,"auxtools_init")();\
 			if(findtext(string, "SUCCESS")) {\
 				GLOB.auxtools_initialized[LIB] = AUXTOOLS_FULL_INIT;\
 			} else {\
@@ -23,13 +23,13 @@ GLOBAL_PROTECT(auxtools_initialized)
 
 #define AUXTOOLS_SHUTDOWN(LIB)\
 	if (GLOB.auxtools_initialized[LIB] == AUXTOOLS_FULL_INIT && fexists(LIB)){\
-		LIBCALL(LIB,"auxtools_shutdown")();\
+		call_ext(LIB,"auxtools_shutdown")();\
 		GLOB.auxtools_initialized[LIB] = AUXTOOLS_PARTIAL_INIT;\
 	}\
 
 #define AUXTOOLS_FULL_SHUTDOWN(LIB)\
 	if (GLOB.auxtools_initialized[LIB] && fexists(LIB)){\
-		LIBCALL(LIB,"auxtools_full_shutdown")();\
+		call_ext(LIB,"auxtools_full_shutdown")();\
 		GLOB.auxtools_initialized[LIB] = FALSE;\
 	}