From 1e26a36b896cea19afd5c0fe786eea37344d4e71 Mon Sep 17 00:00:00 2001 From: gavla <96078776+shayoki@users.noreply.github.com> Date: Sun, 1 Mar 2026 04:52:56 -0600 Subject: [PATCH] Ci map fixes (#5293) ## About The Pull Request This should fix new PRs that are failing unit tests due to irrelevant mapping issues from a space ruin and weirdly placed firelock. --- .../SpaceRuins/skyrat/vaulttango.dmm | 10 +---- .../IceBoxStation/iceboxstation_barber.dmm | 37 ++++++++++--------- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 2 + 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm index 3905c6cf239..564130f0622 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm @@ -1437,14 +1437,6 @@ dir = 1 }, /area/ruin/space/has_grav/vaulttango) -"WB" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/vaulttango) "WN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 @@ -3399,7 +3391,7 @@ Im KW Qg RR -WB +RR ZM ai PK diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_barber.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_barber.dmm index da0e386de6b..c9b9ba57635 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_barber.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_barber.dmm @@ -31,6 +31,9 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"e" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "f" = ( /obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/purple{ @@ -44,14 +47,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/airlock/public{ - name = "Massage Parlour" - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple, /obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/airlock/public{ + name = "Massage Parlour" + }, /turf/open/floor/iron, /area/station/service/barber) "j" = ( @@ -137,12 +140,11 @@ /turf/open/floor/iron, /area/station/service/barber) "B" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/sign/barber/directional/north{ + pixel_y = 16 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "C" = ( /obj/structure/bed/pod, /obj/structure/window/spawner/directional/south, @@ -185,6 +187,11 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/service/barber) +"M" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "N" = ( /obj/structure/chair/comfy/barber_chair{ dir = 8 @@ -205,10 +212,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/station/service/barber) -"U" = ( -/obj/structure/sign/barber/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "V" = ( /obj/machinery/vending/barbervend, /obj/effect/turf_decal/tile/purple{ @@ -255,10 +258,10 @@ o f c x -a +e "} (3,1,1) = {" -B +a S l K @@ -275,7 +278,7 @@ I m b x -U +e "} (5,1,1) = {" a @@ -285,7 +288,7 @@ C L V w -a +B "} (6,1,1) = {" a @@ -295,5 +298,5 @@ w w w w -a +M "} diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index da9324c78b2..74c78c27b04 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -6485,6 +6485,7 @@ req_access = list("kitchen") }, /obj/machinery/door/firedoor, +/obj/effect/landmark/firealarm_sanity, /turf/open/floor/iron/large, /area/station/service/janitor) "bUS" = ( @@ -49278,6 +49279,7 @@ name = "Hydroponics Deliveries"; req_access = list("hydroponics") }, +/obj/effect/landmark/firealarm_sanity, /turf/open/floor/iron/large, /area/station/service/hydroponics) "nQs" = (