From 6929e4e2fa40a1d286a080147d403e7a4b7b80b0 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sat, 31 Aug 2024 23:24:13 +0100 Subject: [PATCH] Fixes double items --- .../map_files/Deltastation/DeltaStation2.dmm | 134 +++++++++--------- 1 file changed, 65 insertions(+), 69 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 65d6b703b1fb8..d3ad4410d48b2 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9253,12 +9253,10 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "biX" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bjh" = ( @@ -9454,9 +9452,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, @@ -9465,7 +9460,7 @@ "bkL" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -14509,10 +14504,6 @@ pixel_x = -1; pixel_y = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/paper/fluff/jobs/medical/hippocratic, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) @@ -24599,7 +24590,6 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt, -/obj/structure/rack, /obj/item/wrench, /obj/item/rollerbed, /turf/open/floor/plating, @@ -28418,6 +28408,10 @@ /area/science/robotics/lab) "dGo" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "dGA" = ( @@ -30066,6 +30060,10 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "dSh" = ( @@ -30228,10 +30226,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/desk_bell{ pixel_x = 5; pixel_y = -1 @@ -31755,6 +31749,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ehA" = ( @@ -31964,20 +31962,12 @@ /turf/closed/wall, /area/medical/medbay/aft) "ekb" = ( -/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 = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 10 }, -/turf/open/floor/prison, -/area/security/prison) +/turf/open/floor/iron, +/area/engine/atmos) "ekz" = ( /obj/item/kirbyplants/random, /obj/machinery/camera/directional/north{ @@ -36154,10 +36144,6 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/clipboard{ pixel_x = -4; pixel_y = 2 @@ -45237,6 +45223,10 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "ikW" = ( @@ -45660,10 +45650,6 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/item/folder/white{ pixel_x = -5; pixel_y = 3 @@ -46350,6 +46336,16 @@ /area/crew_quarters/kitchen) "iEe" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, /turf/open/floor/iron, /area/hallway/primary/aft) "iEp" = ( @@ -46451,10 +46447,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ pixel_y = 32 }, @@ -53900,6 +53892,10 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "lif" = ( @@ -57630,10 +57626,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window/reinforced, @@ -58113,10 +58105,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -73456,9 +73444,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/main) "rpS" = ( @@ -77782,6 +77767,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "sHi" = ( @@ -82707,6 +82696,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ujf" = ( @@ -83480,6 +83473,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/security/checkpoint/medical) "uvs" = ( @@ -83870,6 +83867,13 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, /turf/open/floor/iron, /area/hallway/primary/aft) "uEb" = ( @@ -86469,6 +86473,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, /turf/open/floor/iron, /area/hallway/primary/aft) "vuq" = ( @@ -87639,9 +87650,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, @@ -90782,10 +90790,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -93750,10 +93754,6 @@ /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "xDV" = ( @@ -95382,10 +95382,6 @@ /area/janitor/custodian) "ybx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -119248,7 +119244,7 @@ bdd hvQ hvQ hvQ -hvQ +ekb bkL rZo bom @@ -145719,7 +145715,7 @@ wkM wkM wkM vvI -ekb +fEe did aFm cGe