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

SierraBay · Nov 26, 2024 · fe25a8c · fe25a8c
2 parents 5303de2 + b046b80
commit fe25a8c
Show file tree

Hide file tree

Showing 276 changed files with 3,212 additions and 1,505 deletions.
diff --git a/.github/workflows/changelog_generation.yml b/.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

diff --git a/.github/workflows/check_changelog.yml b/.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: Установка зависимостей

diff --git a/.github/workflows/codeql-analysis.yml b/.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

diff --git a/.github/workflows/generate_documentation.yml b/.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@920cbb300dcd3f0568dbc42700c61e2fd9e6139c
+        uses: JamesIves/github-pages-deploy-action@62fec3add6773ec5dbbf18d2ee4260911aa35cf4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

diff --git a/.github/workflows/make_changelogs.yml b/.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

diff --git a/.github/workflows/test.yml b/.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 }}"

diff --git a/baystation12.dme b/baystation12.dme
@@ -312,6 +312,7 @@
 #include "code\datums\extensions\local_network.dm"
 #include "code\datums\extensions\penetration.dm"
 #include "code\datums\extensions\state_machine.dm"
+#include "code\datums\extensions\support_lattice.dm"
 #include "code\datums\extensions\appearance\appearance.dm"
 #include "code\datums\extensions\appearance\base_icon_state.dm"
 #include "code\datums\extensions\appearance\cardborg.dm"
@@ -420,6 +421,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"
@@ -1404,6 +1406,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"

diff --git a/code/__defines/__renderer.dm b/code/__defines/__renderer.dm
@@ -62,29 +62,31 @@
 	#define TURF_SHADOW_LAYER           2.02
 	//ABOVE TURF
 	#define DECAL_LAYER                 2.03
-	#define RUNE_LAYER                  2.04
-	#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 CATWALK_LAYER               2.09
-	#define ABOVE_CATWALK_LAYER         2.10
-	#define BLOOD_LAYER                 2.11
-	#define MOUSETRAP_LAYER             2.12
-	#define PLANT_LAYER                 2.13
-	#define AO_LAYER                    2.14
-	#define ABOVE_AO_LAYER              2.141
+
+	#define AO_LAYER                    2.04
+	#define ABOVE_AO_LAYER              2.05
+	#define RUNE_LAYER                  2.06
+	#define ABOVE_TILE_LAYER            2.07
+	#define EXPOSED_PIPE_LAYER          2.08
+	#define EXPOSED_WIRE_LAYER          2.09
+	#define ABOVE_EXPOSED_WIRE_LAYER    2.10
+	#define CATWALK_LAYER               2.11
+	#define ABOVE_CATWALK_LAYER         2.12
+	#define BLOOD_LAYER                 2.13
+	#define MOUSETRAP_LAYER             2.14
+	#define PLANT_LAYER                 2.15
+
 	//HIDING MOB
-	#define HIDING_MOB_LAYER            2.15
-	#define SHALLOW_FLUID_LAYER         2.16
-	#define MOB_SHADOW_LAYER            2.17
+	#define HIDING_MOB_LAYER            2.16
+	#define SHALLOW_FLUID_LAYER         2.17
+	#define MOB_SHADOW_LAYER            2.18
 	//OBJ
-	#define BELOW_DOOR_LAYER            2.18
-	#define OPEN_DOOR_LAYER             2.19
-	#define BELOW_TABLE_LAYER           2.20
-	#define TABLE_LAYER                 2.21
-	#define BELOW_OBJ_LAYER             2.22
-	#define STRUCTURE_LAYER             2.23
+	#define BELOW_DOOR_LAYER            2.19
+	#define OPEN_DOOR_LAYER             2.20
+	#define BELOW_TABLE_LAYER           2.21
+	#define TABLE_LAYER                 2.22
+	#define BELOW_OBJ_LAYER             2.23
+	#define STRUCTURE_LAYER             2.24
 	// OBJ_LAYER                        3
 	#define ABOVE_OBJ_LAYER             3.01
 	#define CLOSED_DOOR_LAYER           3.02

diff --git a/code/__defines/byond_tracy.dm b/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]")
diff --git a/code/__defines/colors.dm b/code/__defines/colors.dm
@@ -52,8 +52,8 @@
 #define COLOR_WHITE            "#ffffff"
 #define COLOR_GOLD             "#ffcc33"
 #define COLOR_CLOSET_GOLD      "#6d6133"
-#define COLOR_NT_RED           "#9d2300"
 #define COLOR_BOTTLE_GREEN     "#1f6b4f"
+#define COLOR_NT_RED           "#9d2300"
 #define COLOR_PALE_BTL_GREEN   "#57967f"
 #define COLOR_GUNMETAL         "#545c68"
 #define COLOR_WALL_GUNMETAL    "#353a42"
@@ -88,7 +88,6 @@
 #define CABLE_COLOR_YELLOW "#ffbf00"
 #define CABLE_COLOR_GREEN "#008000"
 #define CABLE_COLOR_BLUE "#3366cc"
-#define CABLE_COLOR_PINK "#800080"
 #define CABLE_COLOR_ORANGE "#ff9900"
 #define CABLE_COLOR_CYAN "#5ca1cc"
 #define CABLE_COLOR_WHITE "#c0c0c0"

diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm
@@ -114,6 +114,9 @@ var/global/log_end= world.system_type == UNIX ? ascii2text(13) : ""
 	to_world_log("## UNIT_TEST ##: [text]")
 	log_debug(text)
 
+/proc/log_computer_command(text)
+	if (config.log_computer_commands)
+		game_log("COMPUTER_COMMAND", text)
 
 //This replaces world.log so it displays both in DD and the file
 /proc/log_world(text)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -53,7 +53,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 
 	use_call = "use"
 	. = use_before(atom, user, click_params)
-	if (!. && user.a_intent == I_HURT)
+	if (!. && (user.a_intent == I_HURT || user.a_intent == I_DISARM))
 		use_call = "weapon"
 		. = atom.use_weapon(src, user, click_params)
 	if (!.)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
@@ -54,10 +54,15 @@
 
 	/// log world.log to game log
 	var/static/log_world_output = FALSE
-//[SIERRA-ADD]
+
+	//[SIERRA-ADD]
 	/// log signals messages
 	var/static/log_signals = FALSE
-//[/SIERRA-ADD]
+	//[/SIERRA-ADD]
+
+	/// log computer commands
+	var/static/log_computer_commands = FALSE
+
 	/// Allows admins with relevant permissions to have their own ooc colour
 	var/static/allow_admin_ooccolor = FALSE
 
@@ -550,6 +555,8 @@
 				log_hrefs = TRUE
 			if ("log_runtime")
 				log_runtime = TRUE
+			if ("log_computer_commands")
+				log_computer_commands = TRUE
 			if ("generate_asteroid")
 				generate_map = TRUE
 			if ("no_click_cooldown")

diff --git a/code/controllers/subsystems/initialization/fabrication.dm b/code/controllers/subsystems/initialization/fabrication.dm
@@ -135,5 +135,7 @@ SUBSYSTEM_DEF(fabrication)
 		if (stage.can_begin_with(target) && stage.is_appropriate_tool(tool))
 			var/obj/item/crafting_holder/crafting = new (turf, stage, target, tool, user)
 			if (stage.progress_to(tool, user, crafting))
+				if (!length(stage.next_stages))
+					crafting.advance_to(stage, user, tool)
 				return crafting
 			qdel(crafting)