Merge remote-tracking branch 'off/master' into merge-upstream

.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: "515.1633"
+byond: "515.1637"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm

@@ -75,7 +75,7 @@
 /turf/open/floor/grass/fairy,
 /area/ruin/powered/hermit)
 "wf" = (
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime,
+/obj/item/gun/energy/laser/musket/prime,
 /obj/structure/table/wood,
 /obj/item/flashlight/lantern,
 /turf/open/floor/wood,

_maps/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -1192,7 +1192,7 @@
 	},
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/item/organ/internal/brain,
-/obj/item/skillchip/job/research_director,
+/obj/item/skillchip/research_director,
 /obj/effect/turf_decal/tile/neutral/half{
 	dir = 4
 	},

_maps/deathmatch/maint_mania.dmm

@@ -193,7 +193,7 @@
 /turf/open/indestructible,
 /area/deathmatch)
 "zF" = (
-/obj/item/ammo_casing/shotgun/improvised,
+/obj/effect/spawner/random/junk_shell,
 /turf/open/indestructible,
 /area/deathmatch)
 "AG" = (

_maps/map_files/Birdshot/birdshot.dmm

@@ -49319,7 +49319,7 @@
 /obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{
 	dir = 6
 	},
-/obj/machinery/meter,
+/obj/machinery/meter/layer2,
 /turf/open/floor/iron,
 /area/station/engineering/atmos/pumproom)
 "qQg" = (

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -22987,6 +22987,10 @@
 	dir = 1
 	},
 /area/station/security/prison)
+"gZR" = (
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
 "gZT" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -58482,11 +58486,6 @@
 /obj/structure/fake_stairs/wood/directional/north,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
-"rPu" = (
-/obj/structure/cable,
-/obj/machinery/power/smes/engineering,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
 "rPL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -256513,7 +256512,7 @@ qAS
 fUc
 jaX
 glI
-rPu
+gZR
 kKL
 kKL
 mbG
@@ -257541,7 +257540,7 @@ dvS
 pwd
 glI
 tsR
-rPu
+gZR
 lUC
 tXV
 kvX