diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm index 9ffe9798819..2efc6c74d88 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm @@ -1160,18 +1160,12 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "ct" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/plaque{ desc = "In front of you is a small part of the wreckage recovered from the DS-2 Station after its destruction. Many loyal members of the syndicate were lost that day, but the syndicate has since come back stronger than ever."; name = "DS-2 Memorial plaque" }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/closed/wall/r_wall/plastitanium/syndicate/cruiser, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "cu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/chair{ @@ -7619,13 +7613,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/sign/barber{ - pixel_x = 14 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, /obj/effect/turf_decal/siding/wideplating_new/corner, +/obj/structure/sign/barber/directional/east, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "pN" = ( @@ -16859,9 +16851,6 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/closet/emcloset/wall{ - pixel_y = 32 - }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "HS" = ( @@ -25864,7 +25853,7 @@ fE ue yE Vm -gV +aZ gV gV Gg @@ -25933,7 +25922,7 @@ QP ue kQ mu -aZ +gV gV qI Cf @@ -27231,9 +27220,9 @@ yo iB Dn cv -aH -HQ ct +HQ +TJ sQ Sz Yu diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 55295b92d33..f6f8ac3da12 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -13154,10 +13154,6 @@ "aZb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/south{ - c_tag = "Bar South"; - network = list("ss13","bar") - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -13520,6 +13516,10 @@ dir = 1 }, /obj/machinery/light/floor, +/obj/machinery/camera/directional/south{ + c_tag = "Bar South"; + network = list("ss13","bar") + }, /turf/open/floor/stone, /area/station/service/bar) "bae" = ( @@ -24666,7 +24666,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/north, +/obj/machinery/computer/security/telescreen/ordnance/directional/north, /turf/open/floor/iron, /area/station/science/ordnance/testlab) "bGe" = ( @@ -30864,15 +30864,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) -"cdT" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering SMES" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/engine_smes) "cdU" = ( /obj/structure/chair/office/light{ dir = 4 @@ -38841,6 +38832,7 @@ /obj/machinery/atmospherics/components/binary/crystallizer{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/open/floor/engine, /area/station/engineering/atmos) "dtB" = ( @@ -41087,6 +41079,9 @@ "ewU" = ( /obj/structure/cable, /obj/machinery/modular_computer/preset/engineering, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering SMES" + }, /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "ewX" = ( @@ -47186,11 +47181,6 @@ "hvP" = ( /obj/structure/window/reinforced/tinted/spawner/directional/south, /obj/machinery/light/directional/east, -/obj/machinery/camera/directional/south{ - c_tag = "Prison - Library"; - network = list("ss13","prison"); - pixel_y = 8 - }, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -47772,6 +47762,10 @@ /obj/effect/turf_decal/trimline/dark/line{ dir = 9 }, +/obj/machinery/camera/directional/west{ + c_tag = "Prison Hallway West"; + network = list("ss13","prison") + }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "hIZ" = ( @@ -58415,11 +58409,6 @@ /turf/open/floor/engine, /area/station/science/explab) "msK" = ( -/obj/machinery/camera{ - c_tag = "Prison - Garden"; - dir = 5; - network = list("ss13","prison") - }, /obj/effect/turf_decal/siding/wideplating_new{ dir = 4 }, @@ -67539,10 +67528,6 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "qEv" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Prison Hallway West"; - network = list("ss13","prison") - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68323,10 +68308,6 @@ pixel_x = -5; pixel_y = 7 }, -/obj/machinery/camera{ - c_tag = "Cargo - Drone Bay"; - dir = 6 - }, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/drone_bay) "qTo" = ( @@ -71493,11 +71474,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/camera/directional/east{ - c_tag = "Chief Medical Office"; - network = list("ss13","medbay"); - pixel_y = -22 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "skF" = ( @@ -73521,6 +73497,7 @@ pixel_y = -2 }, /obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/science/ordnance/testlab) "tfs" = ( @@ -75091,6 +75068,7 @@ /obj/effect/turf_decal/siding/white{ dir = 5 }, +/obj/machinery/camera/directional/east, /turf/open/water, /area/station/security/prison) "tPr" = ( @@ -77098,6 +77076,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/camera/directional/west, /turf/open/floor/wood, /area/station/security/prison) "uNg" = ( @@ -78990,6 +78969,11 @@ pixel_y = -3 }, /obj/machinery/keycard_auth/wall_mounted/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Chief Medical Office"; + network = list("ss13","medbay"); + pixel_y = -22 + }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "vEh" = ( @@ -80041,7 +80025,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/ordnance/directional/east, /turf/open/floor/iron, /area/station/science/ordnance/testlab) "wed" = ( @@ -113040,7 +113023,7 @@ tau cay tau xIb -cdT +cjf cCY kul kul @@ -118166,7 +118149,7 @@ bRC bMQ bwO cfn -bVW +lNr dtr bXS bZI diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index 392f482f03a..085ec6159a3 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -5548,6 +5548,7 @@ /area/station/command/heads_quarters/hop) "bTm" = ( /obj/machinery/light/directional/east, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) "bTC" = ( @@ -10899,15 +10900,6 @@ "dJN" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/science) -"dKh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "Xenobio Pen 1 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "dKi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/kirbyplants/random, @@ -18603,7 +18595,6 @@ id = "xenobio4"; name = "Xenobio Pen 4 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -18790,7 +18781,6 @@ id = "xenobio1"; name = "Xenobio Pen 1 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -20290,7 +20280,6 @@ id = "xenobio6"; name = "Xenobio Pen 6 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -21901,15 +21890,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) -"hAi" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "hAk" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Desk" @@ -23150,6 +23130,7 @@ name = "Xenobio Pen 5 Blast DOors"; req_access = list("xenobiology") }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) "hXp" = ( @@ -23183,6 +23164,7 @@ name = "Xenobio Pen 2 Blast Door"; req_access = list("xenobiology") }, +/obj/structure/cable, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "hYa" = ( @@ -24022,15 +24004,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/central) -"iof" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "ioj" = ( /obj/structure/railing/corner{ dir = 1 @@ -27683,15 +27656,6 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"jEd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "Xenobio Pen 3 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "jED" = ( /turf/open/misc/beach/sand, /area/station/command/vault) @@ -32615,15 +32579,6 @@ "ljt" = ( /turf/open/floor/iron/dark, /area/station/security/brig/entrance) -"ljw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; - name = "Xenobio Pen 2 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "ljB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38667,7 +38622,6 @@ id = "xenobio2"; name = "Xenobio Pen 2 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -39656,7 +39610,6 @@ id = "xenobio7"; name = "Xenobio Pen 7 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -40783,7 +40736,6 @@ id = "xenobio8"; name = "Xenobio Pen 8 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -41592,15 +41544,6 @@ /obj/structure/closet/crate/freezer, /turf/open/floor/iron/white, /area/station/maintenance/port/greater) -"oeQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "oeS" = ( /obj/machinery/disposal/bin, /obj/item/radio/intercom/directional/south, @@ -45254,13 +45197,8 @@ /turf/open/misc/asteroid, /area/station/security/prison/garden) "ptc" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast Door" - }, -/turf/open/floor/engine, +/turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "ptd" = ( /obj/structure/cable, @@ -45835,15 +45773,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"pEs" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast Door" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "pEA" = ( /obj/structure/table/reinforced, /obj/item/hfr_box/body/waste_output{ @@ -50583,6 +50512,7 @@ name = "Xenobio Pen 7 Blast DOors"; req_access = list("xenobiology") }, +/obj/structure/cable, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "riD" = ( @@ -51324,7 +51254,6 @@ /turf/open/floor/plating, /area/station/engineering/storage/tech) "rtR" = ( -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) @@ -58971,7 +58900,6 @@ id = "xenobio5"; name = "Xenobio Pen 5 Blast Door" }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -60396,7 +60324,6 @@ name = "Xenobio Pen 1 Blast Door"; req_access = list("xenobiology") }, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) "uGj" = ( @@ -67817,6 +67744,7 @@ name = "Xenobio Pen 4 Blast Door"; req_access = list("xenobiology") }, +/obj/structure/cable, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "xeU" = ( @@ -68721,7 +68649,6 @@ name = "Containment Pen 3"; req_access = list("xenobiology") }, -/obj/structure/cable, /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, @@ -102110,16 +102037,16 @@ hNy oYs pjo gqd -iof +oYs nDX xvS -jEd +oYs toN nhe -ljw +oYs mEp gsY -dKh +oYs oYs gAc ixB @@ -102365,20 +102292,20 @@ cCZ hNy hNy oYs -rlY -rlY +ptc +ptc xeN -rlY +ptc rlY gzR -rlY -rlY +ptc +ptc hXT -rlY -ixB +ptc +rsj uFX rtR -ixB +rsj ixB vMN xOJ @@ -102622,20 +102549,20 @@ cCZ hNy hNy oYs -rlY +ptc rlY bvV -rlY -rlY +ptc +ptc ris -rlY +ptc rlY aKi -rlY +ptc ixB hXj bTm -rsj +ixB ixB ryZ aAW @@ -102881,16 +102808,16 @@ hNy oYs ePP nRz -hAi +oYs nRU nzC -ptc +oYs nWX gUg -pEs +oYs uud ueB -oeQ +oYs oYs gAc rsj diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 2c153abe886..12861e9fe70 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -1997,11 +1997,6 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) -"aAr" = ( -/obj/structure/spacevine, -/obj/structure/wall_torch/spawns_lit, -/turf/open/misc/dirt/planet, -/area/centcom/holding/cafe/park) "aAu" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -5193,6 +5188,7 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/light/directional/west, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -5928,13 +5924,6 @@ /obj/structure/flora/tree/palm, /turf/open/misc/beach/sand, /area/centcom/holding/cafe/park) -"dai" = ( -/obj/structure/wall_torch/spawns_lit{ - pixel_x = -11; - pixel_y = -10 - }, -/turf/open/misc/dirt/planet, -/area/centcom/holding/cafe/park) "dau" = ( /obj/machinery/door/airlock/wood/glass{ desc = "A strange small bar. It's actually remarkably close to Space Station 13."; @@ -10253,7 +10242,7 @@ /turf/open/floor/iron, /area/centcom/interlink) "jsJ" = ( -/obj/structure/wall_torch/spawns_lit, +/obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) "jsN" = ( @@ -17513,6 +17502,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, +/obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) "sGU" = ( @@ -57783,7 +57773,7 @@ ayI ayI ayI ayI -jsJ +awt ajj ajj ajj @@ -57796,9 +57786,9 @@ ajj ajj ajj ajj -jsJ ayI ayI +awt ajj ajj ajj @@ -59627,7 +59617,7 @@ atp atp aPf aPf -jsJ +ayI ajj ajj ajj @@ -59827,7 +59817,7 @@ aaa aaa aaa ajj -jsJ +qMl ajj ajj ajj @@ -59886,7 +59876,7 @@ aPf ayI ayI ayI -jsJ +qMl ayI ayI ayI @@ -60404,7 +60394,7 @@ ayI ayI ayI ayI -jsJ +mgr vZb oyf aTV @@ -61420,12 +61410,12 @@ qJm qJm atp aPf -jsJ ayI ayI ayI ayI ayI +awt ajj ajj iGS @@ -62195,7 +62185,7 @@ atp aPf aPf ayI -jsJ +ayI ayI ayI asw @@ -62454,7 +62444,7 @@ aPf ayI ayI ayI -ayI +awt asw azB azB @@ -62711,7 +62701,7 @@ aPf ayI ayI ayI -jsJ +ayI asw azB azB @@ -62965,7 +62955,7 @@ aaY aPf aPf cEy -aAr +aqP aPf aPf aPf @@ -68040,7 +68030,7 @@ aaa aTb yeY iCw -bhV +iCw bYl iCw iCw @@ -72164,9 +72154,9 @@ aaa aaa ajj aPf -jsJ ayI ayI +awt ajj aFP aeT @@ -74994,7 +74984,7 @@ aPf aPf aPf aPf -ayI +jsJ ayI ayI ayI @@ -75252,7 +75242,7 @@ aPf aPf aPf aPf -dai +ayI aPf aNU aPf @@ -76278,7 +76268,7 @@ ajj aPf aPf ayI -ayI +mgr ayI aPf aPf @@ -76534,7 +76524,7 @@ aaa ajj aPf aPf -jsJ +ayI aPf ayI ayI @@ -77565,7 +77555,7 @@ aPf jsJ ayI ayI -jsJ +ayI aPf aPf aGb