From ee1caa43237d6193b67b5cf1aef2b925f9dfeefd Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:33:24 +0100 Subject: [PATCH 01/14] Fixes 89,129 --- _maps/map_files/BoxStation/BoxStation.dmm | 31 +++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b42aad1f36026..5894215f7fb94 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4326,8 +4326,8 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "aYf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port) @@ -16771,9 +16771,7 @@ /turf/open/floor/engine, /area/science/explab) "cWC" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, @@ -46647,8 +46645,8 @@ /turf/open/floor/iron, /area/security/brig) "pVb" = ( -/obj/structure/disposalpipe/junction/yjunction{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/closed/wall, /area/quartermaster/sorting) @@ -51140,8 +51138,19 @@ /turf/open/floor/catwalk_floor/iron, /area/engine/gravity_generator) "rPX" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, /area/maintenance/port) "rQp" = ( /obj/effect/turf_decal/stripes/line, @@ -88320,9 +88329,9 @@ aWB cCj aSg aYf -dZN -dfx rPX +aSg +aPz pVb bgB bhX From b8029b2a79351c8a0daa83da202e6b727b80dc40 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:54:45 +0100 Subject: [PATCH 02/14] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 332 ++++++++++++++-------- 1 file changed, 209 insertions(+), 123 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5894215f7fb94..6b85c412b5bd5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1041,6 +1041,18 @@ "aph" = ( /turf/closed/wall, /area/lawoffice) +"apq" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "apt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4325,12 +4337,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) -"aYf" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port) "aYi" = ( /turf/open/floor/plating, /area/vacant_room/commissary) @@ -13301,15 +13307,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"cqi" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engineering) "cqj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/button/door{ @@ -16770,12 +16767,6 @@ }, /turf/open/floor/engine, /area/science/explab) -"cWC" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron, -/area/engine/engineering) "cWH" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -17118,6 +17109,19 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"dgc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow, +/turf/open/floor/engine, +/area/engine/engineering) "dgj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -17740,12 +17744,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"dvS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "dvV" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/turretid{ @@ -21304,6 +21302,12 @@ }, /turf/open/floor/iron/dark, /area/security/prison/shielded) +"eRl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "eRz" = ( /obj/structure/lattice, /obj/structure/grille, @@ -21980,16 +21984,6 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/security/brig) -"fhu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "fhv" = ( /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, @@ -25384,6 +25378,18 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) +"gHB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "gHK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -26577,15 +26583,6 @@ }, /turf/open/floor/circuit/telecomms, /area/tcommsat/server) -"hny" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "hnD" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -29299,6 +29296,12 @@ dir = 4 }, /area/engine/atmos) +"iqt" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall, +/area/quartermaster/sorting) "iqN" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo" @@ -30509,6 +30512,13 @@ }, /turf/open/floor/wood, /area/library) +"iRE" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "iRL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -31623,6 +31633,24 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"jth" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "jto" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -35559,6 +35587,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"lcZ" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/port) "ldd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -40815,15 +40849,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"nuF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "nuK" = ( /obj/effect/landmark/start/assistant, /obj/effect/landmark/event_spawn, @@ -41867,6 +41892,21 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"nPv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "nPA" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -42900,6 +42940,14 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"omF" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/plating, +/area/maintenance/aft) "onp" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -43551,6 +43599,19 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) +"oCd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "oCv" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -46644,12 +46705,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"pVb" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall, -/area/quartermaster/sorting) "pVd" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -47205,15 +47260,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"qkk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "qkq" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/structure/displaycase/captain, @@ -51137,21 +51183,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/gravity_generator) -"rPX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port) "rQp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset, @@ -51486,15 +51517,6 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) -"rWw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "rWK" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ @@ -52548,6 +52570,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"svU" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "swm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -54549,6 +54579,18 @@ }, /turf/open/floor/prison, /area/security/prison) +"thR" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "thS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56831,6 +56873,18 @@ /obj/item/flashlight, /turf/open/floor/iron/dark, /area/engine/engineering) +"udr" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "udA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -59657,6 +59711,21 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"vsW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/engineering) "vtg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -61994,6 +62063,24 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/engine/engineering) +"wui" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "wur" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/pods{ @@ -63132,13 +63219,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) -"wXL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "wXP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -63246,6 +63326,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"xau" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron, +/area/engine/engineering) "xaE" = ( /obj/item/radio/intercom{ pixel_y = -29 @@ -88328,11 +88414,11 @@ aPK aWB cCj aSg -aYf -rPX +lcZ +nPv aSg aPz -pVb +iqt bgB bhX bgv @@ -92159,9 +92245,9 @@ kOu mpK jTP ajo -aqR -aqR -gfW +iRE +mkJ +wui ayE aaa aaa @@ -95583,8 +95669,8 @@ cfz cgR ccw mhm -xxT -cqi +vsW +dgc cMD cAP crv @@ -97038,14 +97124,14 @@ iRe qSy arf twX -rWw -wXL -wXL -nuF -wXL -qkk -nuF -fhu +udr +rOm +rOm +apq +rOm +thR +apq +oCd rOm uiS jbM @@ -97295,7 +97381,7 @@ pEv neT ugn iVg -hny +gHB pLM pLM pLM @@ -97552,7 +97638,7 @@ ixa jaD hDg jMo -vGi +svU oax kcC vGi @@ -97893,7 +97979,7 @@ ccw ccw nDb rnL -cWC +xau wmW cgR hCM @@ -103798,9 +103884,9 @@ bNd bNd bNd bNd -kOf -bAw -dvS +jth +eRl +omF cfj rAw kUk From 5f13f1d8388a1379ef24f68d2d446c9761a02dcf Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:54:53 +0100 Subject: [PATCH 03/14] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 513 +++++++++++++--------- 1 file changed, 302 insertions(+), 211 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 6b85c412b5bd5..6ae7063da5590 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1041,18 +1041,6 @@ "aph" = ( /turf/closed/wall, /area/lawoffice) -"apq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "apt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4337,6 +4325,12 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) +"aYf" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/port) "aYi" = ( /turf/open/floor/plating, /area/vacant_room/commissary) @@ -4932,6 +4926,24 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/starboard) +"beF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "beM" = ( /obj/structure/chair{ dir = 1 @@ -13307,6 +13319,19 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"cqi" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow, +/turf/open/floor/engine, +/area/engine/engineering) "cqj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/button/door{ @@ -16182,6 +16207,21 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"cLh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/engineering) "cLp" = ( /obj/structure/railing{ dir = 8 @@ -16203,6 +16243,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "cMm" = ( @@ -16767,6 +16810,12 @@ }, /turf/open/floor/engine, /area/science/explab) +"cWC" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron, +/area/engine/engineering) "cWH" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -17109,19 +17158,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"dgc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - areastring = "/area/engine/supermatter" - }, -/obj/structure/cable/yellow, -/turf/open/floor/engine, -/area/engine/engineering) "dgj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -17742,8 +17778,19 @@ name = "Dormitories Maintenance"; req_access_txt = "12" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"dvS" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/plating, +/area/maintenance/aft) "dvV" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/turretid{ @@ -20965,6 +21012,24 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"eKr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "eLa" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; @@ -21074,6 +21139,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "eMZ" = ( @@ -21302,12 +21370,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison/shielded) -"eRl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "eRz" = ( /obj/structure/lattice, /obj/structure/grille, @@ -21763,6 +21825,21 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"faE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "fbS" = ( /obj/structure/table, /obj/item/storage/box/chemimp{ @@ -21984,6 +22061,19 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/security/brig) +"fhu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "fhv" = ( /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, @@ -24793,6 +24883,18 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) +"gtR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "gui" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25378,18 +25480,6 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) -"gHB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "gHK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -25692,6 +25782,18 @@ "gQd" = ( /turf/closed/wall, /area/quartermaster/exploration_dock) +"gQG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "gQJ" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -26583,6 +26685,21 @@ }, /turf/open/floor/circuit/telecomms, /area/tcommsat/server) +"hny" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "hnD" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -27974,6 +28091,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "hRX" = ( @@ -29296,12 +29416,6 @@ dir = 4 }, /area/engine/atmos) -"iqt" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall, -/area/quartermaster/sorting) "iqN" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo" @@ -30498,6 +30612,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "iRw" = ( @@ -30512,13 +30629,6 @@ }, /turf/open/floor/wood, /area/library) -"iRE" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "iRL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -30667,6 +30777,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "iVN" = ( @@ -31381,6 +31497,12 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"jlW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "jmC" = ( /obj/structure/table, /obj/item/crowbar/large, @@ -31633,24 +31755,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"jth" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "jto" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -32555,6 +32659,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "jMr" = ( @@ -35587,12 +35694,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) -"lcZ" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port) "ldd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -36150,6 +36251,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "lnP" = ( @@ -36359,6 +36463,9 @@ name = "Security Junction"; sortType = 7 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "lrg" = ( @@ -40179,6 +40286,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "nfd" = ( @@ -40849,6 +40959,18 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"nuF" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "nuK" = ( /obj/effect/landmark/start/assistant, /obj/effect/landmark/event_spawn, @@ -41892,21 +42014,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"nPv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port) "nPA" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -41941,6 +42048,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "nQy" = ( @@ -42940,14 +43050,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"omF" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/maintenance/aft) "onp" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -43599,19 +43701,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) -"oCd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "oCv" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -44133,6 +44222,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "oPg" = ( @@ -46006,6 +46098,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "pEC" = ( @@ -46705,6 +46800,12 @@ }, /turf/open/floor/iron, /area/security/brig) +"pVb" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall, +/area/quartermaster/sorting) "pVd" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -47260,6 +47361,18 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"qkk" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "qkq" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/structure/displaycase/captain, @@ -50816,6 +50929,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "rHU" = ( @@ -51183,6 +51299,13 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/gravity_generator) +"rPX" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "rQp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset, @@ -51517,6 +51640,18 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) +"rWw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "rWK" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ @@ -52570,14 +52705,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"svU" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "swm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -54579,18 +54706,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"thR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "thS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54636,6 +54751,12 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"tiP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "tjb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -56873,18 +56994,6 @@ /obj/item/flashlight, /turf/open/floor/iron/dark, /area/engine/engineering) -"udr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "udA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -57032,6 +57141,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "ugE" = ( @@ -58214,6 +58326,9 @@ /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_y = -32 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "uJd" = ( @@ -59711,21 +59826,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"vsW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/engine, -/area/engine/engineering) "vtg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59824,6 +59924,13 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/hydroponics) +"vvL" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "vvN" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -62063,24 +62170,6 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/engine/engineering) -"wui" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "wur" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/pods{ @@ -63219,6 +63308,14 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) +"wXL" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "wXP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -63326,12 +63423,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"xau" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron, -/area/engine/engineering) "xaE" = ( /obj/item/radio/intercom{ pixel_y = -29 @@ -88414,11 +88505,11 @@ aPK aWB cCj aSg -lcZ -nPv +aYf +faE aSg aPz -iqt +pVb bgB bhX bgv @@ -92245,9 +92336,9 @@ kOu mpK jTP ajo -iRE +rPX mkJ -wui +beF ayE aaa aaa @@ -95669,8 +95760,8 @@ cfz cgR ccw mhm -vsW -dgc +cLh +cqi cMD cAP crv @@ -97124,14 +97215,14 @@ iRe qSy arf twX -udr +rWw rOm rOm -apq +nuF rOm -thR -apq -oCd +qkk +nuF +fhu rOm uiS jbM @@ -97381,7 +97472,7 @@ pEv neT ugn iVg -gHB +hny pLM pLM pLM @@ -97638,7 +97729,7 @@ ixa jaD hDg jMo -svU +wXL oax kcC vGi @@ -97979,7 +98070,7 @@ ccw ccw nDb rnL -xau +cWC wmW cgR hCM @@ -99683,7 +99774,7 @@ anF dwH ahn eMP -riU +gQG ahn anF anF @@ -99940,7 +100031,7 @@ anF anF eTS anF -riU +gQG xEr anF anF @@ -100197,7 +100288,7 @@ anF anF ahn vUB -riU +gQG ahn anF anF @@ -100711,8 +100802,8 @@ gXs gXs ahn gEO -riU -anF +gtR +tiP anF jdh fBN @@ -100969,7 +101060,7 @@ aaa ahn tkF riU -anF +vvL anF ahn ahJ @@ -103884,9 +103975,9 @@ bNd bNd bNd bNd -jth -eRl -omF +eKr +jlW +dvS cfj rAw kUk From a84d20378905a9842b8919cf5e787da29398b24d Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:59:32 +0100 Subject: [PATCH 04/14] Camera fixes --- _maps/shuttles/exploration/exploration_shuttle.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/shuttles/exploration/exploration_shuttle.dmm b/_maps/shuttles/exploration/exploration_shuttle.dmm index c2e4fd1e84e45..b67dca8a646f0 100644 --- a/_maps/shuttles/exploration/exploration_shuttle.dmm +++ b/_maps/shuttles/exploration/exploration_shuttle.dmm @@ -258,13 +258,11 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "F" = ( -/obj/machinery/camera/preset{ - dir = 6 - }, /obj/machinery/newscaster{ pixel_x = 32; pixel_y = 1 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "G" = ( From 424d64d300c26820ff2ef7250e02fe7ed65b76d3 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 14:56:13 +0100 Subject: [PATCH 05/14] Adds in an unsorted loop to the boxstation package loop --- _maps/map_files/BoxStation/BoxStation.dmm | 44 +++++++++++++++++++---- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 6ae7063da5590..7056f67eced4c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4847,6 +4847,9 @@ /obj/item/clothing/head/soft/rainbow, /obj/item/clothing/shoes/sneakers/rainbow, /obj/item/clothing/under/color/rainbow, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "bee" = ( @@ -5200,7 +5203,7 @@ /turf/open/floor/iron, /area/quartermaster/office) "bgB" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/unsorted, /turf/closed/wall, /area/quartermaster/sorting) "bgF" = ( @@ -16479,6 +16482,12 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"cQx" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "cQz" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue, @@ -22226,9 +22235,6 @@ /turf/open/floor/iron/grid/steel, /area/gateway) "fkv" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -22236,6 +22242,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "fkM" = ( @@ -36203,6 +36212,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"lnm" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/airlock/maintenance{ + id_tag = "commissarydoor"; + req_one_access_txt = "12;63;48;50" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, +/area/maintenance/port) "lnp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -38749,6 +38770,12 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"mwS" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "mxi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -45405,6 +45432,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "prA" = ( @@ -88250,10 +88280,10 @@ cCF elS fkv prx -aSg -aPz +cQx +lnm bdW -aSg +mwS aZE bgz biT From 70b3185e08301e3d3b62c954fb1c0c1965daeada Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 15:03:32 +0100 Subject: [PATCH 06/14] Fixes direction of the sorting pipe --- _maps/map_files/BoxStation/BoxStation.dmm | 58 ++++++++++++----------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 7056f67eced4c..1f1fa7ece6a90 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5203,7 +5203,9 @@ /turf/open/floor/iron, /area/quartermaster/office) "bgB" = ( -/obj/structure/disposalpipe/sorting/unsorted, +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 1 + }, /turf/closed/wall, /area/quartermaster/sorting) "bgF" = ( @@ -16482,12 +16484,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"cQx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) "cQz" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue, @@ -30794,6 +30790,18 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"iVk" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/airlock/maintenance{ + id_tag = "commissarydoor"; + req_one_access_txt = "12;63;48;50" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, +/area/maintenance/port) "iVN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -34319,6 +34327,12 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/server) +"kzn" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "kzD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, @@ -36212,18 +36226,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"lnm" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/barricade/wooden/crude, -/obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50" - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating, -/area/maintenance/port) "lnp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -38770,12 +38772,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"mwS" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port) "mxi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -62265,6 +62261,12 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"wvP" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "wvY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -88280,10 +88282,10 @@ cCF elS fkv prx -cQx -lnm +wvP +iVk bdW -mwS +kzn aZE bgz biT From 2aa474f621bb207b2cfcb01b4e8b722a19dd7a4f Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:29:54 +0100 Subject: [PATCH 07/14] Fixes boxstation disposal issues --- _maps/map_files/BoxStation/BoxStation.dmm | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 1f1fa7ece6a90..5b671df80b562 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8065,6 +8065,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/science/mixing) "bHv" = ( @@ -11697,9 +11700,6 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "ccE" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -12032,9 +12032,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "ceI" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -12677,7 +12674,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "cjA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, @@ -23606,11 +23602,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/fitness) @@ -25236,11 +25232,7 @@ dir = 4; pixel_x = -24 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/effect/turf_decal/loading_area, /turf/open/floor/iron/white, /area/medical/virology) "gCm" = ( @@ -25371,6 +25363,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/mixing) "gEs" = ( @@ -26089,6 +26084,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/mixing) "gZG" = ( @@ -31624,9 +31622,6 @@ pixel_x = -5; pixel_y = 30 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -31872,12 +31867,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 24 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -35504,12 +35497,7 @@ /turf/open/floor/iron/white, /area/medical/genetics) "kWa" = ( -/obj/structure/disposaloutlet, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -36618,6 +36606,10 @@ pixel_x = 24; req_access_txt = "39" }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /turf/open/floor/iron/white, /area/medical/virology) "lvx" = ( @@ -40677,7 +40669,6 @@ pixel_x = -22; pixel_y = 1 }, -/obj/effect/turf_decal/loading_area, /obj/machinery/airalarm/directional/west{ pixel_x = -32 }, @@ -46908,6 +46899,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "pWy" = ( @@ -47650,9 +47644,6 @@ id = "quarantineshutters"; name = "isolation shutters" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/white, /area/medical/virology) "qqM" = ( @@ -48847,9 +48838,6 @@ /turf/open/floor/iron, /area/security/brig) "qSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -49355,9 +49343,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/iron, /area/crew_quarters/fitness) "rcC" = ( @@ -51571,6 +51556,8 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/science/mixing) "rUj" = ( @@ -55569,7 +55556,12 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark, /area/crew_quarters/dorms) "tAf" = ( /obj/machinery/light/small, @@ -56953,12 +56945,10 @@ /turf/open/floor/wood, /area/security/detectives_office) "ucv" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/crew_quarters/fitness) "ucP" = ( /obj/effect/turf_decal/tile/blue{ @@ -59576,6 +59566,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/mixing) "vmB" = ( @@ -60892,11 +60885,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 24 + }, /turf/open/floor/iron, /area/science/mixing) "vTj" = ( @@ -61222,7 +61217,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, @@ -61976,6 +61971,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "wph" = ( @@ -65714,9 +65712,6 @@ /turf/open/floor/iron/freezer, /area/security/prison) "xWg" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/light{ dir = 8 }, @@ -65726,6 +65721,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/medical/virology) "xWV" = ( From 4f136343eaf67ca7d56f93597bc8a27b563d32e8 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 19:10:47 +0100 Subject: [PATCH 08/14] Fixes cameras --- _maps/map_files/BoxStation/BoxStation.dmm | 81 ++++++++++++----------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5b671df80b562..d05baf6f32c7f 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8134,7 +8134,6 @@ dir = 1 }, /obj/item/kirbyplants/random, -/obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) "bIm" = ( @@ -8564,7 +8563,7 @@ dir = 4 }, /obj/machinery/camera/preset/toxins{ - dir = 8 + dir = 4 }, /turf/open/floor/plating{ initial_gas_mix = "o2=0.01;n2=0.01;TEMP=293.15"; @@ -15570,6 +15569,9 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, /turf/open/floor/engine, /area/engine/engineering) "cFR" = ( @@ -24642,6 +24644,12 @@ }, /turf/open/floor/prison, /area/security/prison) +"goV" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd") + }, +/turf/open/floor/engine, +/area/science/explab) "goW" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, @@ -39731,6 +39739,13 @@ }, /turf/open/floor/iron, /area/medical/genetics) +"mUT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/entry) "mUU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -41727,8 +41742,7 @@ /turf/open/floor/wood, /area/library) "nJp" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "nJq" = ( @@ -50083,6 +50097,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -51435,12 +51450,13 @@ /turf/open/floor/iron, /area/science/explab) "rRQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/obj/machinery/camera/directional/north, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, -/area/hallway/primary/port) +/area/hallway/primary/central) "rRU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54204,7 +54220,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -55683,9 +55698,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","engine") - }, /turf/open/floor/iron/dark, /area/engine/engineering) "tCh" = ( @@ -56909,12 +56921,12 @@ /turf/open/floor/iron/dark, /area/science/nanite) "ubL" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white/side{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/science/research) +/obj/machinery/camera/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/port) "ubO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60945,15 +60957,14 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "vTI" = ( -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white/corner{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) +/area/hallway/secondary/entry) "vUe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -62118,7 +62129,6 @@ "wti" = ( /obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants/random, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/secondary/entry) "wts" = ( @@ -64146,9 +64156,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, /turf/open/floor/iron, /area/science/explab) "xpk" = ( @@ -78251,7 +78258,7 @@ aaa asE aPt jdt -aRY +mUT arB arB arB @@ -78259,7 +78266,7 @@ tAH rQX rQX arB -awZ +vTI tlO azB rQX @@ -85958,7 +85965,7 @@ aBR aBR aLJ aLE -aOl +ubL aPA aQW aQW @@ -86470,7 +86477,7 @@ aBa aBa aaf aKt -rRQ +aLN bDe aOl aPF @@ -90855,7 +90862,7 @@ gMk gMk bbV qnI -qnI +rRQ qnI efv qnI @@ -91369,7 +91376,7 @@ nbZ nbZ sEj aYl -nJp +aYl aYl aYl sEj @@ -98556,7 +98563,7 @@ dgB aaa aaa dgB -vTI +cAx sAB urY aZV @@ -99585,7 +99592,7 @@ aRt aJq aJq aJq -aJq +nJp aJq qVS aJq @@ -112726,7 +112733,7 @@ bBD tRP bBD bBD -ubL +vZt bBD bBD xiZ @@ -112996,7 +113003,7 @@ xLe tIE fQv tIA -sei +goV sei sei hNK From c8ab7c3bc62a6a5089d6b0769441b855ec901d48 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:21:19 +0100 Subject: [PATCH 09/14] Fixes multiple objects stacked on top of each other --- _maps/map_files/BoxStation/BoxStation.dmm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d05baf6f32c7f..24f0d282e870c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -17408,12 +17408,6 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "dmK" = ( @@ -22506,7 +22500,6 @@ /area/library) "fsG" = ( /obj/structure/bed/roller, -/obj/structure/bed/roller, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -55815,12 +55808,6 @@ pixel_x = -31 }, /obj/item/clothing/head/utility/hardhat/cakehat, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "tEr" = ( @@ -58152,9 +58139,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, From 78742e4fa396a34e5b51fdc59879a8e3016d43ef Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:22:57 +0100 Subject: [PATCH 10/14] Fixes some lights placed on windows --- _maps/map_files/BoxStation/BoxStation.dmm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 24f0d282e870c..2656988e28f5e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -10624,9 +10624,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -12000,9 +11997,6 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "ceB" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 }, @@ -23760,7 +23754,6 @@ /turf/open/floor/iron, /area/science/storage) "fUY" = ( -/obj/machinery/light/small, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, @@ -23770,6 +23763,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "fVk" = ( @@ -29210,9 +29204,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "imi" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/advanced_airlock_controller{ dir = 1; pixel_y = -24 @@ -29223,6 +29214,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "imn" = ( @@ -35394,6 +35386,9 @@ /area/chapel/office) "kUw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -41788,6 +41783,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -56786,7 +56782,6 @@ /turf/open/floor/iron, /area/engine/engineering) "tYh" = ( -/obj/machinery/light, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; name = "N2 Outlet Pump" @@ -62075,9 +62070,6 @@ /turf/open/floor/plating, /area/maintenance/port) "wrE" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, From 7a1744dab0d953d8b796e8c412fdd04b7d0fb98e Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:31:24 +0100 Subject: [PATCH 11/14] Fixes all boxstation light issues --- _maps/map_files/BoxStation/BoxStation.dmm | 101 +++++----------------- 1 file changed, 22 insertions(+), 79 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2656988e28f5e..7a73b04e23595 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5241,9 +5241,6 @@ /area/engine/gravity_generator) "bgZ" = ( /obj/machinery/stasis, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -5254,6 +5251,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "bhh" = ( @@ -6540,12 +6540,10 @@ "bqR" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/medical/sleeper) "bqS" = ( @@ -10620,14 +10618,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"bWU" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/engine/atmos) "bWX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -19448,9 +19438,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "ede" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -19688,6 +19675,7 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/quartermaster/qm) "eiC" = ( @@ -20209,9 +20197,6 @@ "etZ" = ( /obj/structure/table/glass, /obj/item/storage/belt/medical, -/obj/machinery/light{ - dir = 8 - }, /obj/item/storage/box/medipens, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -22857,6 +22842,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "fBh" = ( @@ -24455,12 +24441,10 @@ /area/maintenance/starboard/aft) "gkL" = ( /obj/machinery/washing_machine, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "gkT" = ( @@ -31719,16 +31703,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"jsS" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "jsT" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -32891,6 +32865,9 @@ /area/engine/atmos) "jRJ" = ( /obj/machinery/vending/boozeomat, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "jSj" = ( @@ -33076,9 +33053,6 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "jVS" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, @@ -35163,9 +35137,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -37136,12 +37107,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"lFf" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lFJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -39214,12 +39179,6 @@ }, /turf/closed/wall, /area/maintenance/starboard/aft) -"mHc" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -42452,6 +42411,9 @@ pixel_x = -4; pixel_y = -3 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "nYz" = ( @@ -45578,7 +45540,6 @@ pixel_y = -24 }, /obj/structure/cable/yellow, -/obj/machinery/light, /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -46490,9 +46451,6 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -48026,9 +47984,6 @@ /obj/machinery/computer/cargo{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -54735,15 +54690,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"thV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "thW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -56848,6 +56794,9 @@ /obj/machinery/light_switch{ pixel_x = -28 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "tZA" = ( @@ -63867,12 +63816,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, /area/hallway/secondary/command) -"xkV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) "xli" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -101151,7 +101094,7 @@ bSM bTV bUT fUA -bWU +fYS sYl bYT bZK @@ -101379,7 +101322,7 @@ aNl blh ueA blh -thV +blh oiT blh blh @@ -103162,7 +103105,7 @@ kYi ixC aOO kAz -lFf +fRF wRy fRF fRF @@ -106561,7 +106504,7 @@ nZo ouW dPe bNd -mHc +cOe cOe ahO iBQ @@ -114779,7 +114722,7 @@ kdn sei hNK cNW -xkV +cNW cNW cNW cNW @@ -116266,7 +116209,7 @@ aaa aaa aaf aNa -jsS +aOd aPq aPq ffm From 6388ec16c8da49403887279d42e17c51878871e9 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:42:18 +0100 Subject: [PATCH 12/14] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 69 ++++++++--------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 7a73b04e23595..6426541231e15 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1513,13 +1513,6 @@ dir = 1 }, /area/hallway/secondary/entry) -"axe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "axj" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -13726,11 +13719,13 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "csm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cso" = ( @@ -17110,8 +17105,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dfl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dfs" = ( @@ -20207,13 +20205,6 @@ /obj/machinery/gateway/centerstation, /turf/open/floor/engine, /area/gateway) -"euG" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "euJ" = ( /obj/machinery/camera/directional/north, /obj/effect/turf_decal/tile/blue{ @@ -21240,7 +21231,9 @@ /area/medical/surgery) "ePA" = ( /obj/machinery/light/small, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ePJ" = ( @@ -29296,10 +29289,10 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "ioE" = ( +/obj/effect/spawner/lootdrop/maintenance, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ioN" = ( @@ -39173,12 +39166,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/tech) -"mGS" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -47652,13 +47639,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/maintenance/port) -"qrL" = ( -/obj/structure/closet/emcloset, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "qrR" = ( /obj/effect/turf_decal/pool/corner{ dir = 1 @@ -56037,9 +56017,6 @@ /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste Out" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tIW" = ( @@ -65212,10 +65189,10 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "xPe" = ( +/obj/machinery/atmospherics/pipe/simple, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xPk" = ( @@ -105744,7 +105721,7 @@ cko clH pnq ePA -mGS +cNW cNW aaf aaf @@ -105999,9 +105976,9 @@ cko cnG cko rzf -cnG rVB cvO +cOe gqm aaa aaa @@ -106256,7 +106233,7 @@ cko cnG cko csm -euG +xPe xPe tIO fjl @@ -106512,10 +106489,10 @@ cOe cOe cOe wLJ -cOe mto -axe +mab nyK +cOe cOT aoV aoV @@ -106770,9 +106747,9 @@ cko cnG cko dfl -mab +jUc ioE -cvO +cOe cOT aaa aaa @@ -107026,10 +107003,10 @@ cnG cnG hZj cko -cnG jUc -mAe -qrL +cOe +cvO +cdu cNW aaa aaa From 10d805171cf01645875464468750480398e8ad26 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:22:57 +0100 Subject: [PATCH 13/14] Fixes some lights placed on windows --- _maps/map_files/BoxStation/BoxStation.dmm | 170 ++++++++++++++++------ 1 file changed, 125 insertions(+), 45 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 6426541231e15..2656988e28f5e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1513,6 +1513,13 @@ dir = 1 }, /area/hallway/secondary/entry) +"axe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "axj" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -5234,6 +5241,9 @@ /area/engine/gravity_generator) "bgZ" = ( /obj/machinery/stasis, +/obj/machinery/light{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -5244,9 +5254,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/sleeper) "bhh" = ( @@ -6533,10 +6540,12 @@ "bqR" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/light{ + dir = 8 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/medical/sleeper) "bqS" = ( @@ -10611,6 +10620,14 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"bWU" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/engine/atmos) "bWX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -13719,13 +13736,11 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "csm" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cso" = ( @@ -17105,11 +17120,8 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dfl" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dfs" = ( @@ -19436,6 +19448,9 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "ede" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -19673,7 +19688,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, -/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/quartermaster/qm) "eiC" = ( @@ -20195,6 +20209,9 @@ "etZ" = ( /obj/structure/table/glass, /obj/item/storage/belt/medical, +/obj/machinery/light{ + dir = 8 + }, /obj/item/storage/box/medipens, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -20205,6 +20222,13 @@ /obj/machinery/gateway/centerstation, /turf/open/floor/engine, /area/gateway) +"euG" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "euJ" = ( /obj/machinery/camera/directional/north, /obj/effect/turf_decal/tile/blue{ @@ -21231,9 +21255,7 @@ /area/medical/surgery) "ePA" = ( /obj/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ePJ" = ( @@ -22835,7 +22857,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "fBh" = ( @@ -24434,10 +24455,12 @@ /area/maintenance/starboard/aft) "gkL" = ( /obj/machinery/washing_machine, +/obj/machinery/light/small{ + dir = 4 + }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "gkT" = ( @@ -29289,10 +29312,10 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "ioE" = ( -/obj/effect/spawner/lootdrop/maintenance, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ioN" = ( @@ -31696,6 +31719,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"jsS" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit) "jsT" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -32858,9 +32891,6 @@ /area/engine/atmos) "jRJ" = ( /obj/machinery/vending/boozeomat, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "jSj" = ( @@ -33046,6 +33076,9 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "jVS" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, @@ -35130,6 +35163,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -37100,6 +37136,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"lFf" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "lFJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -39166,6 +39208,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/tech) +"mGS" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/closed/wall, +/area/maintenance/starboard/aft) +"mHc" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -42398,9 +42452,6 @@ pixel_x = -4; pixel_y = -3 }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/sleeper) "nYz" = ( @@ -45527,6 +45578,7 @@ pixel_y = -24 }, /obj/structure/cable/yellow, +/obj/machinery/light, /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -46438,6 +46490,9 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, +/obj/machinery/light{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -47639,6 +47694,13 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/maintenance/port) +"qrL" = ( +/obj/structure/closet/emcloset, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qrR" = ( /obj/effect/turf_decal/pool/corner{ dir = 1 @@ -47964,6 +48026,9 @@ /obj/machinery/computer/cargo{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -54670,6 +54735,15 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"thV" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "thW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -56017,6 +56091,9 @@ /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste Out" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tIW" = ( @@ -56771,9 +56848,6 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/sleeper) "tZA" = ( @@ -63793,6 +63867,12 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, /area/hallway/secondary/command) +"xkV" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/closed/wall, +/area/maintenance/starboard/aft) "xli" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -65189,10 +65269,10 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "xPe" = ( -/obj/machinery/atmospherics/pipe/simple, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xPk" = ( @@ -101071,7 +101151,7 @@ bSM bTV bUT fUA -fYS +bWU sYl bYT bZK @@ -101299,7 +101379,7 @@ aNl blh ueA blh -blh +thV oiT blh blh @@ -103082,7 +103162,7 @@ kYi ixC aOO kAz -fRF +lFf wRy fRF fRF @@ -105721,7 +105801,7 @@ cko clH pnq ePA -cNW +mGS cNW aaf aaf @@ -105976,9 +106056,9 @@ cko cnG cko rzf +cnG rVB cvO -cOe gqm aaa aaa @@ -106233,7 +106313,7 @@ cko cnG cko csm -xPe +euG xPe tIO fjl @@ -106481,7 +106561,7 @@ nZo ouW dPe bNd -cOe +mHc cOe ahO iBQ @@ -106489,10 +106569,10 @@ cOe cOe cOe wLJ +cOe mto -mab +axe nyK -cOe cOT aoV aoV @@ -106747,9 +106827,9 @@ cko cnG cko dfl -jUc +mab ioE -cOe +cvO cOT aaa aaa @@ -107003,10 +107083,10 @@ cnG cnG hZj cko +cnG jUc -cOe -cvO -cdu +mAe +qrL cNW aaa aaa @@ -114699,7 +114779,7 @@ kdn sei hNK cNW -cNW +xkV cNW cNW cNW @@ -116186,7 +116266,7 @@ aaa aaa aaf aNa -aOd +jsS aPq aPq ffm From b0f3e745d5ccc46b0d121c948f8d789d482df293 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:31:24 +0100 Subject: [PATCH 14/14] Fixes all boxstation light issues --- _maps/map_files/BoxStation/BoxStation.dmm | 101 +++++----------------- 1 file changed, 22 insertions(+), 79 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2656988e28f5e..7a73b04e23595 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5241,9 +5241,6 @@ /area/engine/gravity_generator) "bgZ" = ( /obj/machinery/stasis, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -5254,6 +5251,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "bhh" = ( @@ -6540,12 +6540,10 @@ "bqR" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/medical/sleeper) "bqS" = ( @@ -10620,14 +10618,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"bWU" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/engine/atmos) "bWX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -19448,9 +19438,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "ede" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -19688,6 +19675,7 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/quartermaster/qm) "eiC" = ( @@ -20209,9 +20197,6 @@ "etZ" = ( /obj/structure/table/glass, /obj/item/storage/belt/medical, -/obj/machinery/light{ - dir = 8 - }, /obj/item/storage/box/medipens, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -22857,6 +22842,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "fBh" = ( @@ -24455,12 +24441,10 @@ /area/maintenance/starboard/aft) "gkL" = ( /obj/machinery/washing_machine, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "gkT" = ( @@ -31719,16 +31703,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"jsS" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "jsT" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -32891,6 +32865,9 @@ /area/engine/atmos) "jRJ" = ( /obj/machinery/vending/boozeomat, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "jSj" = ( @@ -33076,9 +33053,6 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "jVS" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, @@ -35163,9 +35137,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -37136,12 +37107,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"lFf" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lFJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -39214,12 +39179,6 @@ }, /turf/closed/wall, /area/maintenance/starboard/aft) -"mHc" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -42452,6 +42411,9 @@ pixel_x = -4; pixel_y = -3 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "nYz" = ( @@ -45578,7 +45540,6 @@ pixel_y = -24 }, /obj/structure/cable/yellow, -/obj/machinery/light, /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -46490,9 +46451,6 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -48026,9 +47984,6 @@ /obj/machinery/computer/cargo{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -54735,15 +54690,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"thV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "thW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -56848,6 +56794,9 @@ /obj/machinery/light_switch{ pixel_x = -28 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "tZA" = ( @@ -63867,12 +63816,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, /area/hallway/secondary/command) -"xkV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) "xli" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -101151,7 +101094,7 @@ bSM bTV bUT fUA -bWU +fYS sYl bYT bZK @@ -101379,7 +101322,7 @@ aNl blh ueA blh -thV +blh oiT blh blh @@ -103162,7 +103105,7 @@ kYi ixC aOO kAz -lFf +fRF wRy fRF fRF @@ -106561,7 +106504,7 @@ nZo ouW dPe bNd -mHc +cOe cOe ahO iBQ @@ -114779,7 +114722,7 @@ kdn sei hNK cNW -xkV +cNW cNW cNW cNW @@ -116266,7 +116209,7 @@ aaa aaa aaf aNa -jsS +aOd aPq aPq ffm