Merge branch 'dev-sierra' into upstream-pr-34844

.github/workflows/changelog_generation.yml

@@ -16,13 +16,13 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0 # Otherwise, we will fail to push refs
           ref: dev-sierra
           token: ${{ secrets.BOT_TOKEN }}
       - name: Python setup
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/check_changelog.yml

@@ -19,7 +19,7 @@ jobs:
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/sierra_check_changelog.py
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/tags.yml
       - name: Установка Python
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.x'
       - name: Установка зависимостей

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/generate_documentation.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: paths-filter
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
@@ -37,9 +37,9 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -49,7 +49,7 @@ jobs:
         run: |
           ~/dmdoc
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@94f3c658273cf92fb48ef99e5fbc02bd2dc642b2
+        uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

.github/workflows/make_changelogs.yml

@@ -16,11 +16,11 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: paths-filter
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
@@ -32,9 +32,9 @@ jobs:
     needs: PreFlight
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -60,9 +60,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -90,16 +90,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -128,16 +128,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -166,16 +166,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"

baystation12.dme

@@ -235,6 +235,7 @@
 #include "code\controllers\subsystems\initialization\culture.dm"
 #include "code\controllers\subsystems\initialization\customitems.dm"
 #include "code\controllers\subsystems\initialization\fabrication.dm"
+#include "code\controllers\subsystems\initialization\icon_updates.dm"
 #include "code\controllers\subsystems\initialization\materials.dm"
 #include "code\controllers\subsystems\initialization\misc.dm"
 #include "code\controllers\subsystems\initialization\misc_early.dm"
@@ -243,11 +244,11 @@
 #include "code\controllers\subsystems\initialization\persistence.dm"
 #include "code\controllers\subsystems\initialization\robots.dm"
 #include "code\controllers\subsystems\initialization\webhooks.dm"
+#include "code\controllers\subsystems\initialization\xenoarch.dm"
 #include "code\controllers\subsystems\processing\circuit.dm"
 #include "code\controllers\subsystems\processing\disposals.dm"
 #include "code\controllers\subsystems\processing\fast_process.dm"
 #include "code\controllers\subsystems\processing\graphs.dm"
-#include "code\controllers\subsystems\processing\icon_updates.dm"
 #include "code\controllers\subsystems\processing\nano.dm"
 #include "code\controllers\subsystems\processing\obj.dm"
 #include "code\controllers\subsystems\processing\processing.dm"
@@ -324,7 +325,6 @@
 #include "code\datums\extensions\multitool\store.dm"
 #include "code\datums\extensions\multitool\circuitboards\buildtype_select.dm"
 #include "code\datums\extensions\multitool\circuitboards\circuitboards.dm"
-#include "code\datums\extensions\multitool\circuitboards\shuttle_console.dm"
 #include "code\datums\extensions\multitool\circuitboards\stationalert.dm"
 #include "code\datums\extensions\multitool\items\clothing.dm"
 #include "code\datums\extensions\multitool\items\items.dm"
@@ -420,6 +420,7 @@
 #include "code\datums\repositories\attack_logs.dm"
 #include "code\datums\repositories\cameras.dm"
 #include "code\datums\repositories\client.dm"
+#include "code\datums\repositories\computer_logs.dm"
 #include "code\datums\repositories\follow.dm"
 #include "code\datums\repositories\images.dm"
 #include "code\datums\repositories\mobs.dm"
@@ -1220,7 +1221,6 @@
 #include "code\game\objects\structures\extinguisher.dm"
 #include "code\game\objects\structures\fireaxe_cabinet.dm"
 #include "code\game\objects\structures\fitness.dm"
-#include "code\game\objects\structures\flora.dm"
 #include "code\game\objects\structures\fountain.dm"
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\grille.dm"
@@ -1283,6 +1283,8 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\service.dm"
+#include "code\game\objects\structures\flora\flora.dm"
+#include "code\game\objects\structures\flora\tree.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\bed.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\stools.dm"
@@ -1403,6 +1405,7 @@
 #include "code\modules\admin\secrets\fun_secrets\power_all_smes.dm"
 #include "code\modules\admin\secrets\fun_secrets\waddle.dm"
 #include "code\modules\admin\secrets\investigation\attack_logs.dm"
+#include "code\modules\admin\secrets\investigation\computer_logs.dm"
 #include "code\modules\admin\secrets\investigation\view_persistant.dm"
 #include "code\modules\admin\verbs\adminhelp.dm"
 #include "code\modules\admin\verbs\adminjump.dm"
@@ -3335,8 +3338,10 @@
 #include "mods\global_modpacks.dm"
 #include "mods\_master_files\code\_onclick\click.dm"
 #include "mods\_master_files\code\game\world.dm"
+#include "mods\_master_files\code\game\antagonist\station\changeling.dm"
 #include "mods\_master_files\code\game\gamemodes\ert.dm"
 #include "mods\_master_files\code\game\objects\effects\decals\contraband.dm"
+#include "mods\_master_files\code\game\objects\structures\mineral_bath.dm"
 #include "mods\_master_files\code\game\objects\structures\signs.dm"
 #include "mods\_master_files\code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
 #include "mods\_master_files\code\modules\client\asset_cache.dm"
@@ -3370,11 +3375,14 @@
 #include "mods\_master_files\code\modules\culture_descriptor\religion\religions_unathi.dm"
 #include "mods\_master_files\code\modules\culture_descriptor\religion\religions_vox.dm"
 #include "mods\_master_files\code\modules\events\gravity.dm"
+#include "mods\_master_files\code\modules\mob\living\life.dm"
+#include "mods\_master_files\code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
 #include "mods\_master_files\code\modules\overmap\distress.dm"
 #include "mods\_master_files\code\modules\overmap\panicbutton.dm"
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
 #include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
+#include "mods\_master_files\code\modules\psionics\events\mini_spasm.dm"
 #include "mods\_master_files\code\modules\species\species.dm"
 #include "mods\_master_files\code\modules\species\station\adherent.dm"
 #include "mods\_master_files\code\modules\species\station\human_subspecies.dm"

code/__defines/ZAS.dm

@@ -139,3 +139,5 @@ GLOBAL_LIST_INIT(gzn_check, list(
 	}
 
 #endif
+
+#define GAS_STANDARD_AIRMIX "STANDARD_AIRMIX"

code/__defines/__renderer.dm

@@ -66,7 +66,7 @@
 	#define ABOVE_TILE_LAYER            2.05
 	#define EXPOSED_PIPE_LAYER          2.06
 	#define EXPOSED_WIRE_LAYER          2.07
-	#define EXPOSED_WIRE_TERMINAL_LAYER 2.08
+	#define ABOVE_EXPOSED_WIRE_LAYER    2.08
 	#define CATWALK_LAYER               2.09
 	#define ABOVE_CATWALK_LAYER         2.10
 	#define BLOOD_LAYER                 2.11

code/__defines/byond_tracy.dm

@@ -1,31 +1,33 @@
 // Implements https://github.com/mafemergency/byond-tracy
 // Client https://github.com/wolfpld/tracy
-// As of now, only 0.8.2 is supported as a client, this might change in the future however
 
-// In case you need to start the capture as soon as the server boots, uncomment the following lines and recompile:
 
-// /world/New()
-// 	prof_init()
-// 	. = ..()
+#ifdef PROFILE_FROM_BOOT
+/world/New()
+	profiler_init()
+	return ..()
+#endif
 
-/client/proc/profiler_start()
-	set name = "Start Tracy Profiler"
+
+/client/proc/profiler_init_verb()
+	set name = "Start Profiler"
 	set category = "Debug"
 	set desc = "Starts the tracy profiler, which will await the client connection."
-	switch(alert("Are you sure? Tracy will remain active until the server restarts.", "Tracy Init", "No", "Yes"))
-		if("Yes")
-			prof_init()
+	var/response = alert("Are you sure? The profiler will run until restart.", null, "No", "Yes")
+	if (response != "Yes")
+		return
+	profiler_init()
 
-/**
- * Starts Tracy
- */
-/proc/prof_init()
+/// Starts the profiler.
+/proc/profiler_init()
 	var/lib
-
-	switch(world.system_type)
-		if(MS_WINDOWS) lib = "prof.dll"
-		if(UNIX) lib = "libprof.so"
-		else CRASH("Tracy initialization failed: unsupported platform or DLL not found.")
-
+	switch (world.system_type)
+		if (MS_WINDOWS)
+			lib = "tracy.dll"
+		if (UNIX)
+			lib = "tracy.so"
+		else
+			CRASH("Tracy initialization failed: unsupported platform or DLL not found.")
 	var/init = CALL_EXT(lib, "init")()
-	if("0" != init) CRASH("[lib] init error: [init]")
+	if(init != "0")
+		CRASH("[lib] init error: [init]")

code/__defines/misc.dm

@@ -523,3 +523,7 @@
 ///from /datum/bank_account/pay_debt(), after a portion or all the debt has been paid.
 #define COMSIG_BANK_ACCOUNT_DEBT_PAID "bank_account_debt_paid"
 //[/SIERRA-ADD]
+
+/// A null statement to guard against EmptyBlock lint without necessitating the use of pass()
+/// Used to avoid proc-call overhead. But use sparingly. Probably pointless in most places.
+#define EMPTY_BLOCK_GUARD ;

code/__defines/mobs.dm

@@ -486,7 +486,7 @@
 #define FAKE_INVIS_ALPHA_THRESHOLD 127 // If something's alpha var is at or below this number, certain things will pretend it is invisible.
 
 #define PRONOUNS_THEY_THEM	"they/them"
-#define PRONOUNS_HE_HIM		"he/his"
+#define PRONOUNS_HE_HIM		"he/him"
 #define PRONOUNS_SHE_HER	"she/her"
 #define PRONOUNS_IT_ITS		"it/its"
 #define PRONOUNS_HE_THEY	"he/they"

code/__defines/skills.dm

@@ -39,3 +39,4 @@
 #define SKILL_MEDICAL       /singleton/hierarchy/skill/medical/medical
 #define SKILL_ANATOMY       /singleton/hierarchy/skill/medical/anatomy
 #define SKILL_CHEMISTRY     /singleton/hierarchy/skill/medical/chemistry
+#define SKILL_VIROLOGY      /singleton/hierarchy/skill/medical/chemistry/virology

code/__defines/subsystem-priority.dm

@@ -3,19 +3,20 @@
 // SS_BACKGROUND handles high server load differently than Normal and SS_TICKER do.
 // Higher priority also means a larger share of a given tick before sleep checks.
 
+
+// [SIERRA-ADD] - SSINPUT
+#define SS_PRIORITY_INPUT          1000 // Input MUST ALWAYS BE HIGHEST PRIORITY!!!
+
 #define SS_PRIORITY_DEFAULT 50          // Default priority for all processes levels
 
 // SS_TICKER
 #define SS_PRIORITY_TIMER 30
 #define SS_PRIORITY_OVERLAYS 20
-#define SS_PRIORITY_ICON_UPDATE 10
+
 
 // Normal
 #define SS_PRIORITY_TICKER         100 // Gameticker.
-// [SIERRA-ADD] - SSINPUT
-#define SS_PRIORITY_INPUT          99 // Input things.
-#define SS_PRIORITY_EXPLOSIVES     90 // Explosion processing.
-// [/SIERRA-ADD]
+#define SS_PRIORITY_EXPLOSIVES     90 // Explosion processing. // [/SIERRA-ADD]
 #define SS_PRIORITY_MOB            95  // Mob Life().
 #define SS_PRIORITY_MACHINERY      95  // Machinery + powernet ticks.
 #define SS_PRIORITY_AIR            80  // ZAS processing.
@@ -26,6 +27,7 @@
 #define SS_PRIORITY_CHAT           40  // Chat
 #define SS_PRIORITY_AI             25  // Mob AI
 #define SS_PRIORITY_ALARM          20  // Alarm processing.
+#define SS_PRIORITY_ICON_UPDATE    20  // Queued icon updates. Mostly used by APCs and tables.
 #define SS_PRIORITY_EVENT          20  // Event processing and queue handling.
 #define SS_PRIORITY_SHUTTLE        20  // Shuttle movement.
 #define SS_PRIORITY_CIRCUIT_COMP   20  // Processing circuit component do_work.