Merge pull request #59 from SPLURT-Station/upstream-update-b24-12d

[UPSTREAM UPDATE] 26.12.2024

.github/labeler.yml

@@ -1,9 +1,90 @@
 # Changes to anything in the _map subfolder
 Map Edit:
 - changed-files:
-  - any-glob-to-any-file: '_maps/**'
+    - any-glob-to-any-file: '_maps/**'
 
 # Changes to a .dmi
 Sprites:
 - changed-files:
-  - any-glob-to-any-file: '**/*.dmi'
+    - any-glob-to-any-file: '**/*.dmi'
+
+# Changes to .dm files
+Code:
+- changed-files:
+    - any-glob-to-any-file: '**/*.dm'
+
+# Changes to admin files or specific logging files
+Administration:
+- changed-files:
+    - any-glob-to-any-file: '**/admin/**'
+    - any-glob-to-any-file: '**/logging.dm'
+    - any-glob-to-any-file: '**/_logging.dm'
+
+# Changes to datums ruins or shuttles files regardless of root
+Mapping:
+- changed-files:
+    - any-glob-to-any-file: '**/datums/ruins/**'
+    - any-glob-to-any-file: '**/datums/shuttles/**'
+    - any-glob-to-any-file: '**/datums/shuttles.dm'
+
+# Any file within the config subfolder
+Requires Config Change:
+- changed-files:
+    - any-glob-to-any-file: 'config/**'
+
+# Changes to dependency files
+Dependencies:
+- changed-files:
+    - any-glob-to-any-file: '**/package.json'
+    - any-glob-to-any-file: '**/package-lock.json'
+    - any-glob-to-any-file: '**/yarn.lock'
+
+# When the .DME is changed
+DME Edit:
+- changed-files:
+    - any-glob-to-any-file: './*.dme'
+    - any-glob-to-any-file: '**/*.dme'
+
+# Changes to JavaScript files
+Javascript:
+- changed-files:
+    - any-glob-to-any-file: '**/*.js'
+
+# Changes to a .ogg or anything in the sound folder
+Sound:
+- changed-files:
+    - any-glob-to-any-file: '**/*.ogg'
+    - any-glob-to-any-file: '**/*.wav'
+    - any-glob-to-any-file: 'sound/**'
+
+# Changes to SQL
+SQL:
+- changed-files:
+    - any-glob-to-any-file: 'SQL/**'
+
+# Encompasses both the tgui and the tgui-next folder
+TGUI:
+- changed-files:
+    - any-glob-to-any-file: 'tgui/**'
+    - any-glob-to-any-file: 'tgui-next/**'
+
+# Changes to the .Github folder
+Github:
+- changed-files:
+    - any-glob-to-any-file: '.github/**'
+
+# Changes to the tools folder
+Tools:
+- changed-files:
+    - any-glob-to-any-file: 'tools/**'
+
+# Changes to image files
+Image:
+- changed-files:
+    - any-glob-to-any-file: '**/*.png'
+    - any-glob-to-any-file: '**/*.jpg'
+    - any-glob-to-any-file: '**/*.jpeg'
+    - any-glob-to-any-file: '**/*.gif'
+    - any-glob-to-any-file: '**/*.bmp'
+    - any-glob-to-any-file: '**/*.webp'
+    - any-glob-to-any-file: '**/*.svg'

_maps/map_files/KiloStation/KiloStation.dmm

@@ -4259,6 +4259,7 @@
 	dir = 1
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
 /turf/open/floor/engine/telecomms,
 /area/station/tcommsat/server)
 "bxE" = (

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -26791,6 +26791,18 @@
 	pixel_x = -6;
 	pixel_y = 4
 	},
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/obj/item/pen{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/obj/item/folder/red{
+	pixel_x = 9;
+	pixel_y = 4
+	},
 /turf/open/floor/iron/white,
 /area/station/security/checkpoint/science/research)
 "hMN" = (
@@ -28176,10 +28188,7 @@
 /obj/effect/turf_decal/trimline/brown/filled/line{
 	dir = 5
 	},
-/obj/structure/rack,
-/obj/item/crowbar,
-/obj/item/wrench,
-/obj/item/radio,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/iron/smooth,
 /area/station/security/checkpoint/supply)
 "ijj" = (
@@ -56076,6 +56085,10 @@
 /area/station/hallway/primary/aft)
 "pHC" = (
 /obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/structure/rack,
+/obj/item/radio,
+/obj/item/crowbar,
+/obj/item/wrench,
 /turf/open/floor/iron/smooth_edge{
 	dir = 1
 	},
@@ -56274,19 +56287,7 @@
 	c_tag = "Security Post - Science";
 	network = list("ss13","rd")
 	},
-/obj/structure/table,
-/obj/item/folder/red{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/paper_bin{
-	pixel_x = 5;
-	pixel_y = 4
-	},
-/obj/item/pen{
-	pixel_x = 5;
-	pixel_y = 4
-	},
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/iron/white/smooth_edge{
 	dir = 1
 	},
@@ -65363,7 +65364,7 @@
 "snJ" = (
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/item/radio/intercom/directional/west,
-/obj/structure/sink/directional/east,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/iron/freezer,
 /area/station/security/checkpoint/medical)
 "snO" = (