Merge branch 'master' into alarms

Author: 1080pCat

.github/workflows/ci.yml

@@ -136,14 +136,6 @@ jobs:
       fail-fast: false
       matrix:
         byondtype: ['STABLE', 'BETA']
-    services:
-      mariadb:
-        image: mariadb:latest
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306
-        options: --health-cmd "mariadb-admin ping" --health-interval 10s --health-timeout 5s --health-retries 10
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm

@@ -126,14 +126,7 @@
 	turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
 	width = 16
 	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 8;
-	height = 20;
-	id = "freegolem";
-	name = "Free Golem Ship";
-	width = 16
-	},
+/obj/docking_port/mobile/free_golem,
 /turf/simulated/floor/mineral/titanium/purple,
 /area/shuttle/freegolem)
 "C" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -473,6 +473,14 @@
 /obj/item/tank/internals/emergency_oxygen/engi,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
+"ZO" = (
+/obj/structure/closet/firecloset/full,
+/obj/item/clothing/suit/fire/firefighter,
+/obj/item/clothing/head/hardhat/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/mask/gas,
+/turf/simulated/floor/plasteel/freezer,
+/area/ruin/powered/seedvault)
 "ZQ" = (
 /obj/structure/table/glass,
 /obj/item/storage/box/disks_plantgene,
@@ -1166,11 +1174,11 @@ aa
 aa
 aa
 yZ
-al
-yc
+yZ
+yZ
 xe
-eI
-OL
+Wu
+vt
 vt
 vt
 vt
@@ -1196,8 +1204,8 @@ yZ
 yZ
 no
 no
-Lg
-nt
+ZO
+ZO
 vt
 DQ
 nt

_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm

@@ -234,14 +234,7 @@
 	id = "whiteship_away";
 	name = "Deep Space"
 	},
-/obj/docking_port/mobile{
-	dir = 8;
-	id = "whiteship";
-	name = "NEV Cherub";
-	dwidth = 6;
-	height = 19;
-	width = 12
-	},
+/obj/docking_port/mobile/whiteship,
 /turf/simulated/floor/plating,
 /area/shuttle/abandoned)
 "yF" = (

_maps/map_files/generic/Lavaland.dmm

@@ -2336,7 +2336,7 @@
 "fO" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/spawner/window/plasma/grilled,
+/obj/effect/spawner/window/reinforced/plasma/grilled,
 /turf/simulated/floor/plating,
 /area/mine/outpost/hallway/east)
 "fP" = (
@@ -3537,7 +3537,7 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "lf" = (
-/obj/effect/spawner/window/plasma/grilled,
+/obj/effect/spawner/window/reinforced/plasma/grilled,
 /turf/simulated/floor/plating,
 /area/mine/outpost/maintenance/south)
 "lg" = (