Merge remote-tracking branch 'upstream/master220' into hot-tajaran-se…

…x-under-the-shower
ss220-space · Aug 7, 2024 · 707722a · 707722a
2 parents fa0a4d0 + fbcc934
commit 707722a
Show file tree

Hide file tree

Showing 417 changed files with 5,440 additions and 3,093 deletions.
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -12,7 +12,7 @@ export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
 export BETA_BYOND_MINOR=1642
 # For the RUSTG library. Not actually installed by CI but kept as a reference
-export RUSTG_VERSION=3.1.0-ss220
+export RUSTG_VERSION=3.3.0-ss220
 #For DMJIT librarry
 export DMJIT_VERSION=v0.1.2
 

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -38778,9 +38778,6 @@
 /area/library/game_zone)
 "dRW" = (
 /obj/effect/landmark/start/captain,
-/obj/machinery/light{
-	dir = 1
-	},
 /turf/simulated/floor/carpet/royalblue,
 /area/crew_quarters/captain/bedroom)
 "dRX" = (
@@ -39492,8 +39489,7 @@
 "dUJ" = (
 /obj/structure/window/full/reinforced,
 /obj/structure/marker_beacon{
-	icon_state = "markerteal-on";
-	initialized = 1
+	icon_state = "markerteal-on"
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
@@ -46981,8 +46977,7 @@
 "fvt" = (
 /obj/structure/window/full/reinforced,
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
@@ -84965,8 +84960,7 @@
 /area/space)
 "oJy" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerlime-on";
-	initialized = 1
+	icon_state = "markerlime-on"
 	},
 /obj/structure/window/full/reinforced,
 /turf/simulated/floor/plating,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/USSP_gorky17.dmm b/_maps/map_files/RandomRuins/SpaceRuins/USSP_gorky17.dmm
@@ -3633,8 +3633,7 @@
 /area/ruin/space/USSP_gorky17/arrival)
 "nN" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/USSP_gorky17/asteroids)
@@ -5950,8 +5949,7 @@
 	network = list("USSP_gorky17")
 	},
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/machinery/computer/old_frame/macintosh{
 	layer = 3.15;
@@ -9635,8 +9633,7 @@
 "IV" = (
 /obj/structure/lattice,
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/space,
 /area/template_noop)
@@ -11481,8 +11478,7 @@
 /area/ruin/space/USSP_gorky17/check1)
 "Pg" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/structure/lattice,
 /turf/space,
@@ -12192,8 +12188,7 @@
 /area/ruin/space/USSP_gorky17/common)
 "RP" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/space,
 /area/template_noop)

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/USSP_gorky17_collapsed.dmm b/_maps/map_files/RandomRuins/SpaceRuins/USSP_gorky17_collapsed.dmm
@@ -4519,8 +4519,7 @@
 /area/ruin/space/USSP_gorky17/collapsed/arrival)
 "nN" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/USSP_gorky17/collapsed/asteroids)
@@ -7333,8 +7332,7 @@
 	network = list("USSP_gorky17")
 	},
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/machinery/computer/old_frame/macintosh{
 	layer = 3.15;
@@ -11922,8 +11920,7 @@
 "IV" = (
 /obj/structure/lattice,
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/space,
 /area/template_noop)
@@ -14040,8 +14037,7 @@
 /area/ruin/space/USSP_gorky17/collapsed/check1)
 "Pg" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/structure/lattice,
 /turf/space,
@@ -14943,8 +14939,7 @@
 /area/ruin/space/USSP_gorky17/collapsed/common)
 "RP" = (
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /turf/space,
 /area/template_noop)

diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm
@@ -1129,7 +1129,6 @@
 	broken = 1;
 	density = 0;
 	icon_state = "eng";
-	initialized = 1;
 	locked = 0;
 	opened = 1
 	},
@@ -4575,7 +4574,6 @@
 	broken = 1;
 	density = 0;
 	icon_state = "eng";
-	initialized = 1;
 	locked = 0;
 	opened = 1
 	},
@@ -6151,7 +6149,6 @@
 /obj/structure/closet{
 	custom_door_overlay = "yellow";
 	density = 0;
-	initialized = 1;
 	name = "Engineering gear";
 	opened = 1
 	},
@@ -6781,7 +6778,6 @@
 	broken = 1;
 	density = 0;
 	icon_state = "eng";
-	initialized = 1;
 	locked = 0;
 	opened = 1
 	},
@@ -8389,7 +8385,6 @@
 /obj/structure/closet{
 	custom_door_overlay = "yellow";
 	density = 0;
-	initialized = 1;
 	name = "Engineering gear";
 	opened = 1
 	},
@@ -8677,7 +8672,6 @@
 	broken = 1;
 	density = 0;
 	icon_state = "eng";
-	initialized = 1;
 	locked = 0;
 	opened = 1
 	},
@@ -10361,7 +10355,6 @@
 	broken = 1;
 	density = 0;
 	icon_state = "eng";
-	initialized = 1;
 	locked = 0;
 	opened = 1
 	},
@@ -17889,7 +17882,6 @@
 /obj/structure/closet{
 	custom_door_overlay = "yellow";
 	density = 0;
-	initialized = 1;
 	name = "Engineering gear";
 	opened = 1
 	},

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -6484,8 +6484,7 @@
 	},
 /obj/effect/decal/warning_stripes/southeast,
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -8220,8 +8219,7 @@
 	},
 /obj/effect/decal/warning_stripes/northeast,
 /obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on";
-	initialized = 1
+	icon_state = "markerburgundy-on"
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -9241,8 +9239,7 @@
 	},
 /obj/effect/decal/warning_stripes/southeast,
 /obj/structure/marker_beacon{
-	icon_state = "markercerulean-on";
-	initialized = 1
+	icon_state = "markercerulean-on"
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -10217,8 +10214,7 @@
 	},
 /obj/effect/decal/warning_stripes/northeast,
 /obj/structure/marker_beacon{
-	icon_state = "markercerulean-on";
-	initialized = 1
+	icon_state = "markercerulean-on"
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -11942,8 +11938,7 @@
 "aMq" = (
 /obj/effect/decal/cleanable/crayon{
 	color = "#66171a";
-	icon_state = "security";
-	initialized = 1
+	icon_state = "security"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/livingcomplex)
@@ -12281,7 +12276,6 @@
 	},
 /obj/effect/decal/cleanable/crayon{
 	icon_state = "yip";
-	initialized = 1;
 	pixel_x = 14;
 	pixel_y = 32
 	},
@@ -72816,7 +72810,6 @@
 	},
 /obj/structure/closet/secure_closet/security{
 	broken = 1;
-	initialized = 1;
 	locked = 0
 	},
 /turf/simulated/floor/plating,