Merge branch 'master' into sec-mask

ss220club · Dec 31, 2024 · a514daf · a514daf
2 parents 081014a + 9e859b9
commit a514daf
Show file tree

Hide file tree

Showing 360 changed files with 4,262 additions and 2,318 deletions.
diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml
@@ -72,7 +72,7 @@ jobs:
           rustup target add i686-pc-windows-gnu
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
+          sudo apt-get install zlib1g-dev:i386 lib32gcc-13-dev mingw-w64 mingw-w64-i686-dev
 
           # Build it.
           cargo build --release --target i686-unknown-linux-gnu

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -19,11 +19,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "af" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "ag" = (
@@ -1827,12 +1823,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/bmp_ship/aft)
 "go" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/fore)
 "gp" = (
@@ -2118,12 +2109,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hp" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hq" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -323,7 +323,7 @@
 /area/ruin/space/powered/bar)
 "bn" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "bo" = (
@@ -484,7 +484,7 @@
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/space/nearstation)
 "pb" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/machinery/door_control{
 	id = "SpaceBar";
 	name = "Public Shutters";
@@ -895,7 +895,7 @@
 /area/ruin/space/powered)
 "QU" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -949,7 +949,7 @@
 	},
 /area/ruin/space/powered/bar)
 "VR" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "VU" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -3173,7 +3173,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "iq" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/space/nearstation)
 "ir" = (
@@ -5147,7 +5147,7 @@
 	},
 /area/ruin/space/derelict/arrival)
 "nM" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/derelict/hallway/primary)
 "nN" = (
@@ -5344,7 +5344,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "on" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/ruin/space/derelict/arrival)
 "op" = (

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -51723,7 +51723,7 @@
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "fmT" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
@@ -87313,7 +87313,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard/east)
 "xWz" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9

diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -72250,7 +72250,7 @@
 	},
 /obj/machinery/power/apc/directional/west,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Hardsuit Storage West";
+	c_tag = "Atmospherics Hardsuit Storage West";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -89371,7 +89371,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/alarm/directional/north,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Hardsuit Storage North East"
+	c_tag = "Atmospherics Hardsuit Storage North East"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -92362,7 +92362,7 @@
 /area/station/hallway/primary/starboard)
 "sjz" = (
 /obj/machinery/camera{
-	c_tag = "AI Satellite ExteriorEast";
+	c_tag = "AI Satellite Exterior East";
 	dir = 4;
 	network = list("SS13","MiniSat")
 	},
@@ -113546,7 +113546,7 @@
 /obj/item/stack/cable_coil,
 /obj/item/t_scanner,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Control ROom";
+	c_tag = "Atmospherics Control Room";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{

diff --git a/_maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm b/_maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aD" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
@@ -498,7 +498,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "zW" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "Ab" = (
@@ -605,7 +605,7 @@
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "HE" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/lavaland_air{
 	icon_state = "blue";
@@ -847,7 +847,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "TL" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "TW" = (

diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm
@@ -69,13 +69,11 @@
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered/unpowered_structures)
 "gZ" = (
-/obj/item/stack/tile{
-	pixel_y = 14
-	},
+/obj/item/stack/tile/mineral/plastitanium,
 /turf/template_noop,
 /area/template_noop)
 "he" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/mineral/plastitanium,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered/unpowered_structures)
 "hp" = (
@@ -99,7 +97,6 @@
 	dir = 8
 	},
 /obj/item/shard{
-	icon_state = "large";
 	pixel_y = 9;
 	pixel_x = 19
 	},
@@ -234,10 +231,6 @@
 /obj/effect/mapping_helpers/turfs/damage,
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered/unpowered_structures)
-"rT" = (
-/obj/item/stack/tile,
-/turf/template_noop,
-/area/template_noop)
 "sP" = (
 /obj/effect/mapping_helpers/turfs/burn,
 /turf/simulated/floor/plating/airless,
@@ -489,7 +482,6 @@
 /area/ruin/space/unpowered/unpowered_structures)
 "KK" = (
 /obj/item/shard{
-	icon_state = "large";
 	pixel_y = 9;
 	pixel_x = 19
 	},
@@ -517,12 +509,6 @@
 /obj/effect/mapping_helpers/turfs/damage,
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered/unpowered_structures)
-"Mt" = (
-/obj/item/stack/tile{
-	pixel_x = 22
-	},
-/turf/template_noop,
-/area/template_noop)
 "ME" = (
 /obj/structure/shuttle/engine/propulsion,
 /turf/simulated/floor/plating/airless,
@@ -539,7 +525,6 @@
 	icon_state = "small"
 	},
 /obj/item/shard{
-	icon_state = "large";
 	pixel_y = 9
 	},
 /turf/template_noop,
@@ -620,13 +605,6 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered/unpowered_structures)
-"Ss" = (
-/obj/item/stack/tile{
-	pixel_y = 14;
-	pixel_x = 18
-	},
-/turf/simulated/floor/plating/airless,
-/area/ruin/space/unpowered/unpowered_structures)
 "SJ" = (
 /obj/structure/table_frame,
 /obj/item/wrench,
@@ -642,10 +620,7 @@
 /area/ruin/space/unpowered/unpowered_structures)
 "Uf" = (
 /obj/effect/mapping_helpers/turfs/burn,
-/obj/item/stack/tile{
-	pixel_y = 14;
-	pixel_x = 18
-	},
+/obj/item/stack/tile/mineral/plastitanium,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered/unpowered_structures)
 "Ui" = (
@@ -734,9 +709,7 @@
 /area/template_noop)
 "YV" = (
 /obj/structure/lattice,
-/obj/item/stack/tile{
-	pixel_y = 14
-	},
+/obj/item/stack/tile/mineral/plastitanium,
 /turf/template_noop,
 /area/template_noop)
 "ZY" = (
@@ -1001,7 +974,7 @@ VC
 nr
 Dj
 YS
-rT
+gZ
 VC
 CH
 sP
@@ -1024,7 +997,7 @@ Ly
 VC
 EM
 SK
-Ss
+he
 nr
 OI
 VC
@@ -1634,7 +1607,7 @@ Pg
 Ok
 jF
 SK
-Mt
+gZ
 Ly
 Ly
 Ly
@@ -1749,7 +1722,7 @@ Ly
 Ly
 Ly
 ao
-Mt
+gZ
 Ly
 Ly
 Ly

diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm
@@ -1404,9 +1404,7 @@
 /area/awaymission/space_battle/engineering)
 "eM" = (
 /obj/structure/window/plasmareinforced,
-/obj/machinery/atmospherics/binary/circulator{
-	icon_state = "circ8-off"
-	},
+/obj/machinery/atmospherics/binary/circulator,
 /turf/simulated/floor/engine/airless,
 /area/awaymission/space_battle/cruiser)
 "eN" = (
@@ -2242,7 +2240,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel/airless,
 /area/awaymission/space_battle/hallway2)
 "hj" = (
@@ -4360,7 +4358,7 @@
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/awaymission/space_battle/syndicate/syndicate5)
 "nZ" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/space,
 /area/space)
 "oa" = (
@@ -4502,9 +4500,7 @@
 /obj/structure/window/plasmareinforced{
 	dir = 1
 	},
-/obj/machinery/atmospherics/binary/circulator{
-	icon_state = "circ8-off"
-	},
+/obj/machinery/atmospherics/binary/circulator,
 /turf/simulated/floor/engine/airless,
 /area/awaymission/space_battle/cruiser)
 "ov" = (

diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
@@ -48023,7 +48023,7 @@
 	},
 /area/station/public/dorms)
 "fmT" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9
@@ -87066,7 +87066,7 @@
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/apmaint)
 "tUi" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "4-8"