Merge remote-tracking branch 'upstream/master'

SPLURT-Station · Dec 7, 2024 · 72eaee4 · 72eaee4
2 parents 386033b + 92160d5
commit 72eaee4
Show file tree

Hide file tree

Showing 349 changed files with 383,335 additions and 18,902 deletions.
diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm
diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
@@ -3046,6 +3046,14 @@
 "nr" = (
 /turf/closed/wall/r_wall/syndicate,
 /area/ruin/space/has_grav/bubbers/dauntless/sec/prison/holding)
+"nt" = (
+/obj/machinery/button/camkillswitch{
+	pixel_x = -32;
+	pixel_y = 26;
+	req_access = list("syndicate")
+	},
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/bubbers/dauntless/sec/holding)
 "nu" = (
 /obj/effect/turf_decal/stripes/red/line,
 /obj/effect/turf_decal/stripes/red/line{
@@ -3225,6 +3233,10 @@
 	},
 /turf/open/floor/stone,
 /area/ruin/space/has_grav/bubbers/dauntless/service/hydro)
+"on" = (
+/obj/item/assembly/control/camkillswitch/persistence_ext,
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/bubbers/dauntless/service/dorms)
 "oo" = (
 /obj/machinery/light/small/red/directional/west,
 /turf/open/floor/wood/tile,
@@ -13630,7 +13642,7 @@ RP
 dY
 pl
 HC
-RP
+on
 eI
 qr
 ux
@@ -14727,7 +14739,7 @@ JZ
 Wm
 tA
 Ku
-oZ
+nt
 VP
 ru
 HW