From ed19cec2b54ef565efb47cc35b096ea72df22c77 Mon Sep 17 00:00:00 2001 From: Ossa88 Date: Mon, 2 Sep 2024 05:34:14 -0700 Subject: [PATCH] Cheyenne -Reapplied areas -New APCS/ AirAlarms/ LightSwitches/ FireAlarms -Reapplied require ship access to protected areas Sierra -Altered wire coloring to match theme: Red for Live from Cheyenne / Yellow for Local to shuttle MALP -Edited the 4 corner walls to allow them to be curved... was orginally locked to no curve --- .../nanotrasen/nanotrasen_cheyenne.dmm | 1202 +++++++++++------ .../shuttles/subshuttles/nanotrasen_malp.dmm | 11 +- .../subshuttles/nanotrasen_sierra.dmm | 113 +- 3 files changed, 858 insertions(+), 468 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm index 0751c4f54f98..b965b2ca8a4b 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm @@ -1,4 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering/engines/starboard) "ac" = ( /obj/effect/turf_decal/techfloor{ dir = 9 @@ -38,7 +41,7 @@ }, /obj/item/radio/intercom/directional/north, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "ak" = ( /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner, @@ -116,7 +119,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "aJ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 6 @@ -263,8 +266,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "bi" = ( /obj/effect/spawner/lootdrop/materials, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -294,6 +300,31 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"bo" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/engineering{ + dir = 8; + name = "Engineering"; + req_access_txt = "10" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/port) "bp" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/vending/games, @@ -421,7 +452,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "bX" = ( /obj/effect/turf_decal/techfloor{ dir = 5 @@ -502,6 +533,10 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"cq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/storage/eva) "cu" = ( /obj/effect/turf_decal/corner/opaque/brown/half{ dir = 8 @@ -515,7 +550,8 @@ }, /mob/living/simple_animal/turtle{ name = "Leonardo"; - desc = "You wouldn't be able to tell with that hat. But this turtle is secretly a ninja. Shh. Don't tell anyone." + desc = "You wouldn't be able to tell with that hat. But this turtle is secretly a ninja. Shh. Don't tell anyone."; + faction = list("playerNanotrasen") }, /turf/open/floor/plasteel, /area/ship/hallway/aft) @@ -575,6 +611,9 @@ /obj/effect/turf_decal/corner/opaque/blue/border, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "cH" = ( @@ -621,8 +660,11 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "cQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -708,7 +750,7 @@ pixel_y = 23 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "dd" = ( /obj/structure/rack, /obj/item/gun/energy/temperature/security{ @@ -727,8 +769,10 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/wood/birch, /area/ship/crew/canteen) +"dg" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/hallway/central) "dj" = ( -/obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 8 }, @@ -739,15 +783,14 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor/border_only{ - dir = 2 + dir = 1 }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "dk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing, @@ -756,7 +799,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "dl" = ( /obj/effect/turf_decal/corner_techfloor_gray/diagonal{ dir = 8 @@ -778,6 +821,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "dt" = ( @@ -806,8 +852,12 @@ dir = 1 }, /obj/item/poster/random_official, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "dE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -815,8 +865,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "dG" = ( /obj/machinery/light/floor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -940,11 +993,11 @@ /obj/item/toy/plush/spider, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "et" = ( /obj/machinery/light/directional/west, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "ew" = ( /obj/structure/cable{ icon_state = "4-8" @@ -987,14 +1040,14 @@ name = "tactical swivel chair" }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "eH" = ( /obj/structure/extinguisher_cabinet/directional/west{ pixel_x = -27 }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "eM" = ( /obj/machinery/computer/helm/viewscreen/directional/west, /obj/effect/turf_decal/corner/opaque/blue/border{ @@ -1042,7 +1095,7 @@ dir = 4 }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "eX" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1087,6 +1140,7 @@ pixel_x = 0; pixel_y = 0 }, +/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop, /turf/open/floor/plasteel/dark, /area/ship/security) "fm" = ( @@ -1199,7 +1253,7 @@ /obj/item/stack/sheet/mineral/titanium/fifty, /obj/effect/spawner/lootdrop/tool_engie_adv, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "fV" = ( /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 @@ -1244,6 +1298,9 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "gk" = ( @@ -1257,7 +1314,7 @@ }, /obj/effect/landmark/start/quartermaster, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "gm" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ dir = 8 @@ -1270,6 +1327,7 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/tech, /area/ship/bridge) "gr" = ( @@ -1317,6 +1375,7 @@ /obj/effect/turf_decal/trimline/opaque/red/line{ dir = 8 }, +/obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel/tech, /area/ship/security) "gw" = ( @@ -1389,7 +1448,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /obj/effect/spawner/lootdrop/stockparts, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "gR" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 @@ -1445,8 +1504,12 @@ pixel_x = 5; pixel_y = 13 }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "he" = ( /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/north, @@ -1496,19 +1559,9 @@ /obj/machinery/door/window, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) -"hv" = ( -/obj/structure/cable{ - 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/effect/spawner/lootdrop/stockparts, +"hw" = ( /turf/open/floor/plasteel, -/area/ship/science) +/area/ship/hallway/central) "hD" = ( /obj/structure/closet/wall/directional/west, /obj/item/spacecash/bundle/c100, @@ -1517,10 +1570,12 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -18 + pixel_y = -19; + pixel_x = 10 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "hE" = ( /obj/effect/turf_decal/corner/opaque/brown/half, /turf/open/floor/plasteel, @@ -1555,7 +1610,8 @@ /area/ship/crew/toilet) "hL" = ( /obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "1" + req_access_txt = "1"; + req_ship_access = 1 }, /obj/effect/turf_decal/techfloor{ dir = 6 @@ -1568,7 +1624,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/airalarm/directional/east, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) +"hQ" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/crewthree) "hU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1592,6 +1651,11 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering/engine) +"hZ" = ( +/obj/effect/turf_decal/corner/opaque/yellow/diagonal, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel, +/area/ship/cargo) "ib" = ( /obj/machinery/washing_machine, /obj/machinery/light/directional/east, @@ -1714,7 +1778,7 @@ dir = 9 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "iJ" = ( /obj/structure/closet/secure_closet/chemical, /obj/item/reagent_containers/glass/beaker/large, @@ -1790,12 +1854,18 @@ name = "CMO Quarters"; req_access_txt = "40" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "jh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "ji" = ( @@ -1854,6 +1924,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "ju" = ( @@ -1868,7 +1941,7 @@ /area/ship/hangar) "jy" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/port) +/area/ship/storage/eva) "jz" = ( /obj/structure/table/reinforced, /obj/machinery/computer/monitor{ @@ -1890,15 +1963,20 @@ dir = 6 }, /obj/machinery/light_switch{ - pixel_y = 23 + pixel_y = 22; + pixel_x = 11 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "jH" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "jI" = ( /obj/structure/table/wood/reinforced, /obj/item/flashlight/lamp{ @@ -1909,7 +1987,7 @@ pixel_x = 10 }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "jJ" = ( /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ dir = 4 @@ -1925,7 +2003,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/suit_storage_unit/atmos, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "jM" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1998,7 +2076,7 @@ /obj/item/clothing/suit/space/hardsuit/security/hos, /obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) "ki" = ( /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 1 @@ -2054,7 +2132,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "kt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -2085,7 +2163,7 @@ }, /obj/machinery/airalarm/directional/south, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "kA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/catwalk/over/plated_catwalk/dark, @@ -2221,7 +2299,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "lg" = ( /obj/structure/chair/office{ dir = 8; @@ -2234,11 +2312,15 @@ /obj/item/spacecash/bundle/c100, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "ls" = ( /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "lt" = ( @@ -2298,7 +2380,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "lF" = ( /obj/structure/chair/comfy/shuttle{ dir = 4; @@ -2320,10 +2402,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "lI" = ( /obj/structure/table/reinforced, /obj/machinery/fax/nanotrasen, @@ -2333,10 +2417,7 @@ /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, -/obj/effect/spawner/lootdrop/materials, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - filter_types = list("co2","bz","o2","plasma","water_vapor","nob","no2","tritium","freon","pluox","stim") - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "lL" = ( @@ -2452,13 +2533,22 @@ dir = 8 }, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "ms" = ( /obj/structure/table/wood, /obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = -9; + pixel_y = 9 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "mt" = ( @@ -2519,7 +2609,7 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/firealarm/directional/south, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "mI" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned, @@ -2537,7 +2627,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "mL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -2614,8 +2704,13 @@ /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -12 + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "nh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2640,7 +2735,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "nm" = ( /obj/structure/cable{ icon_state = "0-4" @@ -2700,6 +2795,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/ship/hallway/aft) "nA" = ( @@ -2787,7 +2883,7 @@ pixel_y = -18 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "nV" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/nsorange/half{ @@ -2883,7 +2979,7 @@ }, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "ot" = ( /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner, @@ -2897,7 +2993,7 @@ pixel_y = 23 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "oy" = ( /obj/effect/turf_decal/corner/opaque/brown/half, /obj/effect/turf_decal/corner/opaque/ntblue/half{ @@ -2952,7 +3048,7 @@ "oP" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "oS" = ( /obj/effect/turf_decal/corner/opaque/brown/half, /obj/structure/table, @@ -3035,12 +3131,12 @@ dir = 1 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "pg" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "pj" = ( /obj/effect/turf_decal/industrial/loading{ dir = 1 @@ -3064,7 +3160,7 @@ }, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "pw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -3077,8 +3173,12 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "px" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3203,7 +3303,7 @@ }, /obj/effect/spawner/lootdrop/tool_engie_adv, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering/engine) +/area/ship/crew/crewthree) "pZ" = ( /obj/effect/turf_decal/corner/opaque/nsorange{ dir = 1 @@ -3231,7 +3331,7 @@ /obj/item/radio/intercom/directional/east, /obj/effect/spawner/lootdrop/salvage, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "qf" = ( /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 8 @@ -3249,7 +3349,7 @@ pixel_x = 23 }, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "qh" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) @@ -3312,6 +3412,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "qt" = ( @@ -3369,7 +3472,7 @@ /obj/machinery/button/shieldwallgen{ id = "cheyenne_crewholo"; pixel_x = 10; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/button/door{ id = "cheyenne_crewblast"; @@ -3377,7 +3480,7 @@ pixel_y = 25 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "qE" = ( /obj/structure/window/reinforced{ dir = 4 @@ -3429,6 +3532,9 @@ /obj/machinery/printer, /turf/open/floor/wood/walnut, /area/ship/crew/canteen) +"qT" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo/office) "qW" = ( /obj/structure/cable{ icon_state = "2-8" @@ -3450,7 +3556,7 @@ /obj/effect/turf_decal/industrial/outline, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "qZ" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ dir = 5 @@ -3587,7 +3693,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "rK" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/walnut, @@ -3623,10 +3729,15 @@ "rR" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/machinery/reagentgrinder{ - pixel_y = 8 + pixel_y = 18; + pixel_x = -8 }, /obj/structure/table/wood, /obj/machinery/airalarm/directional/west, +/obj/item/storage/box/condimentbottles{ + pixel_x = 6; + pixel_y = 1 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "rU" = ( @@ -3668,7 +3779,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "si" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ dir = 1 @@ -3843,8 +3954,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 2 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "sH" = ( /obj/machinery/light/directional/east, /obj/item/storage/belt/security/webbing, @@ -3884,7 +3998,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "sK" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/open/floor/plasteel/white, @@ -3956,8 +4070,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "th" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -3966,6 +4084,12 @@ dir = 1 }, /obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "tm" = ( @@ -4023,12 +4147,22 @@ "tr" = ( /obj/item/flashlight/lamp/green{ layer = 4.2; - pixel_x = 5; - pixel_y = 13 + pixel_x = -11; + pixel_y = 11 }, /obj/structure/table/wood/reinforced, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 21; + pixel_y = -10 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/firealarm/directional/east, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "ts" = ( /obj/structure/frame/computer, /obj/item/circuitboard/computer/operating, @@ -4110,12 +4244,17 @@ }, /turf/open/floor/plasteel/tech, /area/ship/storage) +"tI" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/engineering/engines/starboard) "tJ" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "tK" = ( /obj/effect/turf_decal/corner/opaque/brown/half, /obj/machinery/light/directional/south, @@ -4174,7 +4313,7 @@ "tV" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "tW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -4362,7 +4501,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "uT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -4463,7 +4602,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "vn" = ( /obj/machinery/vending/snack/random, /obj/effect/turf_decal/siding/wood{ @@ -4506,7 +4645,7 @@ /obj/item/clothing/neck/petcollar, /obj/item/pet_carrier, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) "vs" = ( /obj/structure/bed, /obj/item/bedsheet/random, @@ -4516,7 +4655,7 @@ }, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "vv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/number/one, @@ -4551,8 +4690,11 @@ /turf/open/floor/pod, /area/ship/hangar) "vA" = ( +/obj/machinery/light/directional/west{ + light_color = "#e8eaff" + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "vD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4572,7 +4714,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "vI" = ( /obj/effect/turf_decal/corner/opaque/brown/half{ dir = 8 @@ -4595,8 +4737,9 @@ name = "Chief Engineers Hardsuit" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering/engine) +/area/ship/crew/crewthree) "vK" = ( /obj/structure/closet/wall/directional/south, /obj/item/spacecash/bundle/c100, @@ -4605,10 +4748,12 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 23 + pixel_x = 21; + pixel_y = 10 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "vU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/salvage_50, @@ -4666,6 +4811,9 @@ dir = 8 }, /obj/machinery/holopad/emergency/medical, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "wn" = ( @@ -4677,6 +4825,18 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel, /area/ship/hallway/central) +"wt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned, +/area/ship/hangar) "wv" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ dir = 1 @@ -4703,7 +4863,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "wF" = ( /obj/structure/curtain/cloth/grey, /obj/machinery/door/airlock/public{ @@ -4714,8 +4874,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 2 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "wG" = ( /obj/structure/table/reinforced, /obj/machinery/computer/secure_data/laptop{ @@ -4758,6 +4921,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/ship/hallway/aft) "wO" = ( @@ -4798,6 +4962,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/stairs/wood, /area/ship/crew/dorm) "wZ" = ( @@ -4848,11 +5015,23 @@ }, /turf/open/floor/plating, /area/ship/hangar) -"xl" = ( -/obj/machinery/light/directional/east, -/obj/machinery/suit_storage_unit/industrial, -/turf/open/floor/plasteel, -/area/ship/hangar) +"xg" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"xl" = ( +/obj/machinery/light/directional/east, +/obj/machinery/suit_storage_unit/industrial, +/turf/open/floor/plasteel, +/area/ship/cargo/office) "xm" = ( /obj/machinery/computer/helm{ dir = 8 @@ -4886,7 +5065,7 @@ /area/ship/hallway/aft) "xt" = ( /turf/closed/wall/mineral/titanium, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "xx" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4895,8 +5074,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "xy" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -4907,7 +5089,7 @@ "xA" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "xC" = ( /obj/effect/turf_decal/corner_techfloor_gray/diagonal{ dir = 8 @@ -4964,7 +5146,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/suit_storage_unit/engine, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "xM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -5058,14 +5240,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "ym" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/directional/south, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "yn" = ( /obj/structure/railing/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5074,6 +5259,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/stairs/wood{ dir = 8 }, @@ -5168,7 +5356,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "yC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5187,7 +5375,10 @@ /obj/item/stack/sheet/cardboard, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) +"yN" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/crewfour) "yO" = ( /obj/effect/spawner/lootdrop/salvage_50, /obj/machinery/firealarm/directional/west, @@ -5234,7 +5425,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/north, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "yV" = ( /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 4 @@ -5245,8 +5436,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm/directional/east, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "yW" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) @@ -5257,8 +5453,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/corner/opaque/vired, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "zc" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ dir = 1 @@ -5276,7 +5475,7 @@ /obj/structure/curtain/cloth/grey, /obj/item/toy/plush/moth/error, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "ze" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5493,7 +5692,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "zD" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -5509,7 +5708,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "zI" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -5519,12 +5718,18 @@ }, /obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/wood/walnut, -/area/ship/crew/canteen) +/area/ship/crew/dorm) "zK" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 2 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "zL" = ( @@ -5621,7 +5826,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Aj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/catwalk/over/plated_catwalk/dark, @@ -5643,8 +5848,9 @@ /obj/structure/sign/poster/official/random{ pixel_x = -32 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Am" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/nsorange/half{ @@ -5722,7 +5928,6 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "AB" = ( -/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop, /turf/open/floor/plasteel/dark, /area/ship/security) "AC" = ( @@ -5805,8 +6010,11 @@ name = "Personal Quarters"; req_access_txt = "41" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "AO" = ( /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 1 @@ -5849,6 +6057,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/tech, /area/ship/security) "Be" = ( @@ -5864,7 +6075,7 @@ /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Bi" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 @@ -5913,7 +6124,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Bs" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5926,8 +6137,11 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Bt" = ( /obj/machinery/light/directional/west, /turf/open/floor/plasteel/dark, @@ -6044,13 +6258,13 @@ }, /obj/machinery/button/shieldwallgen{ id = "cheyenne_holo1"; - pixel_y = -1; + pixel_y = -2; name = "Cheyenne Hanger 1"; pixel_x = -6 }, /obj/machinery/button/shieldwallgen{ id = "cheyenne_holo2"; - pixel_y = -1; + pixel_y = -2; name = "Cheyenne Hanger 2"; pixel_x = 5 }, @@ -6096,7 +6310,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "BW" = ( /obj/machinery/camera{ dir = 8 @@ -6104,7 +6318,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /obj/item/radio/intercom/wideband/directional/east, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "BX" = ( /obj/structure/railing, /obj/machinery/light_switch{ @@ -6148,7 +6362,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/camera, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "Cl" = ( /obj/effect/turf_decal/techfloor{ dir = 1 @@ -6182,9 +6396,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 2 }, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_ship_access = 0 +/obj/machinery/door/airlock/mining{ + name = "Machine Shop" }, /turf/open/floor/plasteel/patterned, /area/ship/science) @@ -6206,7 +6419,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "CH" = ( /obj/structure/table/reinforced, /obj/item/screwdriver, @@ -6296,7 +6509,7 @@ /obj/structure/bed, /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "CX" = ( /obj/effect/turf_decal/techfloor{ dir = 8 @@ -6333,15 +6546,22 @@ }, /obj/machinery/light/directional/west, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) +"Dg" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/crewfive) "Dj" = ( /obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 10 + pixel_x = -10; + pixel_y = 12 }, /obj/structure/table/wood/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormfour) "Dl" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -6377,6 +6597,7 @@ /obj/item/gun/ballistic/shotgun/automatic/combat{ pixel_y = -3 }, +/obj/effect/spawner/lootdrop/armory_contraband/metastation, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "Dw" = ( @@ -6407,8 +6628,11 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "DA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -6493,7 +6717,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "DS" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6636,12 +6860,16 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/crew/crewthree) "Eu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "Ev" = ( @@ -6691,6 +6919,7 @@ /obj/effect/turf_decal/corner/opaque/brown/half{ dir = 4 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel, /area/ship/hallway/central) "ED" = ( @@ -6726,8 +6955,9 @@ /obj/structure/bed, /obj/item/bedsheet/hos, /obj/structure/curtain/cloth/fancy, +/obj/machinery/airalarm/directional/north, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) "EN" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/machinery/light/directional/west, @@ -6738,9 +6968,6 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "EQ" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "1" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/industrial/warning{ color = "#808080"; @@ -6748,6 +6975,10 @@ }, /obj/machinery/light/directional/east, /obj/effect/spawner/lootdrop/prison_contraband, +/obj/machinery/door/window/brigdoor/southright{ + req_access_txt = "1"; + req_ship_access = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "ES" = ( @@ -6774,8 +7005,9 @@ /obj/structure/curtain/cloth{ color = "#ADD8E6" }, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "EZ" = ( /obj/machinery/chem_heater, /obj/machinery/airalarm/directional/north, @@ -6814,6 +7046,7 @@ pixel_y = 2 }, /obj/effect/spawner/lootdrop/salvage, +/obj/effect/spawner/lootdrop/stockparts, /turf/open/floor/plating, /area/ship/engineering/engine) "Fc" = ( @@ -6842,7 +7075,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Fe" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -6852,7 +7085,7 @@ /obj/structure/closet/secure_closet/atmospherics, /obj/effect/spawner/lootdrop/tool_engie_common, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "Fg" = ( /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 @@ -6876,6 +7109,7 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/effect/spawner/lootdrop/materials, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "Fo" = ( @@ -6895,14 +7129,17 @@ dir = 10 }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/storage/eva) "Fv" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/airalarm/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -18 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Fw" = ( @@ -6999,13 +7236,14 @@ pixel_y = -7 }, /obj/machinery/light/directional/west, +/obj/effect/spawner/lootdrop/armory_contraband/donutstation, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "FO" = ( /obj/structure/railing, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "FP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -7035,6 +7273,9 @@ "FY" = ( /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) +"FZ" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/dorm/dormthree) "Gb" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7086,7 +7327,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Gi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7101,7 +7342,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Gl" = ( /obj/effect/turf_decal/corner/opaque/nsorange{ dir = 4 @@ -7116,8 +7357,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) +"Gp" = ( +/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "Gu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/trimline/opaque/grey/arrow_cw{ @@ -7167,6 +7416,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "GO" = ( @@ -7221,7 +7473,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "Hg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/industrial/warning{ @@ -7314,7 +7566,7 @@ "Hy" = ( /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Hz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -7415,12 +7667,15 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "Ig" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering/engine) +"Ij" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering/engines/port) "Ik" = ( /mob/living/simple_animal/pet/dog/pug{ name = "McGriff"; @@ -7440,6 +7695,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/stairs/wood, /area/ship/crew/dorm) "Im" = ( @@ -7469,7 +7727,7 @@ }, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Iv" = ( /obj/structure/window/reinforced/spawner, /turf/open/floor/plasteel/mono/dark, @@ -7485,8 +7743,14 @@ "IC" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/rag{ + pixel_x = 7; + pixel_y = 13 + }, /obj/machinery/light/directional/west, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) @@ -7516,7 +7780,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "IM" = ( /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 @@ -7542,8 +7806,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "IS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7605,7 +7872,7 @@ dir = 5 }, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "Jp" = ( /obj/structure/cable{ icon_state = "2-4" @@ -7631,7 +7898,6 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, -/obj/effect/spawner/lootdrop/armory_contraband/metastation, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "Jv" = ( @@ -7676,7 +7942,7 @@ }, /obj/machinery/firealarm/directional/south, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "JB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -7732,6 +7998,13 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew/cryo) +"JQ" = ( +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ship/medical) "JS" = ( /obj/structure/toilet/secret, /obj/machinery/light/directional/east, @@ -7785,7 +8058,7 @@ req_ship_access = 0 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Kb" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7801,7 +8074,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Kh" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/wood, @@ -7961,8 +8234,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/port) "KV" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/effect/decal/cleanable/dirt/dust, @@ -7974,7 +8248,7 @@ /obj/item/toy/cattoy, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "KY" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/railing{ @@ -8070,8 +8344,11 @@ dir = 8 }, /obj/effect/landmark/start/chief_medical_officer, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "Lv" = ( /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west, @@ -8092,7 +8369,7 @@ }, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Lz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/ntspaceworks_big/eight, @@ -8266,7 +8543,7 @@ /obj/machinery/light/directional/west, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "Mc" = ( /obj/structure/table, /obj/machinery/computer/secure_data/laptop{ @@ -8302,7 +8579,6 @@ /obj/effect/turf_decal/techfloor{ dir = 10 }, -/obj/machinery/airalarm/directional/south, /obj/item/flashlight/seclite{ pixel_x = 2; pixel_y = 15 @@ -8314,8 +8590,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -17; + pixel_x = 10 + }, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering/engine) +/area/ship/crew/crewthree) "Mk" = ( /obj/effect/turf_decal/trimline/opaque/red/line{ dir = 10 @@ -8371,7 +8656,6 @@ /area/ship/bridge) "Mr" = ( /obj/machinery/holopad, -/obj/item/gps/cyborg, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Mv" = ( @@ -8381,7 +8665,7 @@ /obj/effect/turf_decal/industrial/hatch/yellow, /obj/effect/spawner/lootdrop/crate_spawner, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Mx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -8409,6 +8693,7 @@ /area/ship/hangar) "MH" = ( /obj/structure/displaycase/captain, +/obj/item/gps/cyborg, /turf/open/floor/plasteel/tech, /area/ship/bridge) "MI" = ( @@ -8425,12 +8710,30 @@ dir = 2 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_ship_access = 0 +/obj/machinery/door/airlock/mining{ + name = "Machine Shop" }, /turf/open/floor/plasteel/patterned, /area/ship/science) +"MK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/railing, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 2 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/ship/hangar) "MM" = ( /obj/machinery/camera, /obj/structure/tank_dispenser/oxygen, @@ -8483,7 +8786,7 @@ dir = 4 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/machinery/firealarm/directional/south, /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Nb" = ( @@ -8496,9 +8799,14 @@ "Nc" = ( /obj/structure/table/wood, /obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/item/reagent_containers/food/drinks/beer, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets{ + pixel_x = 9; + pixel_y = 0 + }, +/obj/effect/spawner/lootdrop/donkpockets{ + pixel_x = -8; + pixel_y = 10 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Nf" = ( @@ -8511,13 +8819,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "Ni" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 @@ -8552,9 +8857,14 @@ "Nz" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/item/storage/box/condimentbottles, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = -6; + pixel_y = 10 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "NA" = ( @@ -8606,9 +8916,15 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"NH" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/dorm/dormfour) "NJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "NK" = ( @@ -8669,7 +8985,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "NW" = ( /obj/structure/aquarium/prefilled, /obj/item/storage/fish_case, @@ -8728,6 +9044,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "Og" = ( @@ -8829,7 +9148,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Ow" = ( /obj/structure/railing/corner, /obj/structure/cable{ @@ -8861,8 +9180,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 2 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) "OA" = ( /obj/structure/cable{ icon_state = "0-2" @@ -8898,7 +9220,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "OH" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/wood, @@ -8962,26 +9284,26 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "OR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "OT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "OV" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -9032,6 +9354,7 @@ dir = 1; pixel_y = -18 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/security) "Pi" = ( @@ -9182,8 +9505,9 @@ /obj/structure/closet/secure_closet/empty{ icon_state = "qm" }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "PD" = ( /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 4 @@ -9195,8 +9519,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "PE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -9250,7 +9575,7 @@ dir = 4 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Qa" = ( /obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt/dust, @@ -9318,12 +9643,28 @@ /obj/machinery/light/directional/west, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/crewtwo) -"Qt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/opaque/red/corner{ - dir = 1 +"Qq" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/engineering{ + dir = 8; + name = "Engineering"; + req_access_txt = "10" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/starboard) +"Qt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/red/corner{ + dir = 1 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -9494,6 +9835,15 @@ /obj/structure/ore_box, /turf/open/floor/plasteel/dark, /area/ship/storage) +"Rd" = ( +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ship/medical) "Rh" = ( /obj/machinery/light/directional/west, /obj/structure/catwalk/over/plated_catwalk/dark, @@ -9509,8 +9859,11 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "Rq" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9523,7 +9876,7 @@ req_ship_access = 0 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Rs" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -9538,7 +9891,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "Rv" = ( /obj/effect/turf_decal/corner_techfloor_gray/diagonal{ dir = 8 @@ -9574,8 +9927,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering/engine) +/area/ship/crew/crewthree) "RJ" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -9682,7 +10036,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/grille, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo/office) "So" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/trimline/opaque/green/arrow_ccw{ @@ -9844,11 +10198,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/security) -"SQ" = ( -/obj/structure/window/reinforced/spawner, -/obj/effect/spawner/lootdrop/armory_contraband, -/turf/open/floor/plasteel/tech, -/area/ship/security/armory) "SS" = ( /obj/item/storage/photo_album/CMO, /obj/item/pet_carrier, @@ -9878,7 +10227,7 @@ icon_state = "cmo" }, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "SW" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 @@ -9910,6 +10259,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "Tg" = ( @@ -9963,8 +10315,11 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Tl" = ( /obj/structure/chair/sofa/brown/directional/south, /obj/structure/sign/poster/official/help_others{ @@ -9993,6 +10348,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "To" = ( @@ -10001,10 +10359,15 @@ /obj/effect/turf_decal/industrial/hatch/yellow, /obj/effect/spawner/lootdrop/salvage_50, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Tp" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "Tr" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/techfloor{ @@ -10088,15 +10451,8 @@ /turf/open/floor/plasteel, /area/ship/science) "TC" = ( -/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/plasteel, -/area/ship/hallway/port) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo) "TE" = ( /obj/effect/turf_decal/techfloor{ dir = 5 @@ -10180,20 +10536,18 @@ pixel_y = 23 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "TW" = ( -/obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/corner/opaque/bottlegreen/half{ dir = 8 }, +/obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/firedoor/border_only{ - dir = 2 - }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "TZ" = ( /obj/structure/curtain, /obj/machinery/shower{ @@ -10217,7 +10571,7 @@ icon_state = "0-8" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Ub" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10246,6 +10600,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "Ue" = ( @@ -10294,7 +10651,7 @@ }, /obj/machinery/airalarm/directional/south, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "Ul" = ( /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ dir = 8 @@ -10465,8 +10822,11 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormthree) "Vd" = ( /obj/structure/cable{ icon_state = "2-4" @@ -10486,7 +10846,7 @@ }, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Vg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -10495,8 +10855,20 @@ dir = 6 }, /obj/effect/landmark/start/head_of_security, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) +"Vl" = ( +/obj/item/flashlight/lamp/green{ + layer = 4.2; + pixel_x = 5; + pixel_y = 13 + }, +/obj/structure/table/wood/reinforced, +/turf/open/floor/wood/ebony, +/area/ship/crew/dorm/dormfour) "Vn" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -10551,7 +10923,7 @@ }, /obj/structure/curtain/cloth/grey, /turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/area/ship/crew/dorm/dormtwo) "Vz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -10585,11 +10957,14 @@ dir = 8 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "VC" = ( -/obj/machinery/light/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/crew/crewfive) "VE" = ( /obj/effect/turf_decal/trimline/opaque/red/end{ dir = 8 @@ -10775,6 +11150,15 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/hangar) +"Wy" = ( +/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "Wz" = ( /obj/machinery/door/airlock/public/glass{ dir = 4 @@ -10796,6 +11180,9 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/fore) +"WF" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "WH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/industrial/warning, @@ -10844,7 +11231,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "WP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/nsorange/half{ @@ -10873,7 +11260,7 @@ dir = 4 }, /turf/open/floor/wood/walnut, -/area/ship/crew/canteen) +/area/ship/crew/dorm) "WY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, @@ -10882,7 +11269,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "WZ" = ( /obj/effect/turf_decal/corner/opaque/nsorange/half{ dir = 8 @@ -10935,7 +11322,7 @@ pixel_y = 23 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Xi" = ( /obj/effect/turf_decal/corner/opaque/brown/half, /obj/machinery/firealarm/directional/south, @@ -10960,6 +11347,9 @@ }, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"Xn" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/crew/dorm/dormtwo) "XA" = ( /obj/effect/turf_decal/techfloor{ dir = 6 @@ -11029,7 +11419,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "XS" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -11120,8 +11510,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/port) +/area/ship/hallway/central) "Yr" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/machinery/firealarm/directional/east, @@ -11144,7 +11535,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Yv" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -11158,7 +11549,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood/walnut, -/area/ship/crew/canteen) +/area/ship/crew/dorm) "Yx" = ( /obj/structure/table/greyscale, /obj/item/flashlight{ @@ -11241,7 +11632,6 @@ /area/ship/hallway/aft) "YT" = ( /obj/structure/window/reinforced/spawner, -/obj/effect/spawner/lootdrop/armory_contraband/donutstation, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "YU" = ( @@ -11331,7 +11721,7 @@ pixel_y = 12 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "YZ" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, @@ -11373,7 +11763,7 @@ /area/ship/hallway/central) "Zk" = ( /turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/area/ship/storage/eva) "Zl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -11416,7 +11806,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "Zw" = ( /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 @@ -11432,16 +11822,21 @@ /obj/machinery/light/directional/west, /obj/machinery/light_switch{ dir = 1; - pixel_y = -18 + pixel_y = -17; + pixel_x = 11 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/carpet/red, -/area/ship/security) +/area/ship/crew/crewfour) "Zy" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "ZA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11466,7 +11861,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/engineering/engines/starboard) "ZC" = ( /obj/effect/turf_decal/industrial/warning{ dir = 5 @@ -11510,6 +11905,7 @@ }, /obj/structure/window/reinforced/spawner, /obj/structure/rack, +/obj/effect/spawner/lootdrop/armory_contraband, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "ZJ" = ( @@ -11572,7 +11968,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ship/hangar) +/area/ship/cargo) "ZV" = ( /obj/structure/railing{ dir = 6; @@ -11672,11 +12068,11 @@ PJ PJ PJ kB -DH -DH -DH -DH -DH +Ij +Ij +Ij +Ij +Ij DH rL BF @@ -11698,13 +12094,13 @@ kS zp hV Qa -hV -DH -DH -DH -DH -DH +xg DH +aa +aa +aa +aa +aa kB PJ PJ @@ -11714,7 +12110,7 @@ PJ PJ PJ kB -DH +Ij jL Fe fT @@ -11746,7 +12142,7 @@ aj Mb Zy YX -DH +aa kB PJ PJ @@ -11756,7 +12152,7 @@ PJ PJ PJ kB -DH +Ij Cf DR Hc @@ -11787,8 +12183,8 @@ ci cP vH Rs -zQ -DH +tI +aa kB PJ PJ @@ -11798,7 +12194,7 @@ PJ PJ PJ kB -DH +Ij tJ bV If @@ -11830,7 +12226,7 @@ Rj aG le pe -DH +aa kB PJ PJ @@ -11840,7 +12236,7 @@ PJ PJ PJ kB -DH +Ij tV mJ UU @@ -11867,12 +12263,12 @@ Ev DH DH DH -DH +hQ Et -DH +aa pw ZB -DH +aa kB PJ PJ @@ -11882,7 +12278,7 @@ PJ PJ PJ kB -DH +Ij yT JA UU @@ -11911,10 +12307,10 @@ Ca BC vJ Mh -DH +aa OJ ym -DH +aa kB PJ PJ @@ -11924,7 +12320,7 @@ PJ PJ PJ kB -DH +Ij ox tf UU @@ -11953,10 +12349,10 @@ Vn BC pW RH -DH +aa TU mG -DH +aa kB PJ PJ @@ -11966,9 +12362,9 @@ PJ PJ PJ kB -DH +Ij zD -BS +bo UU UU UU @@ -11993,12 +12389,12 @@ DH DH DH DH -DH -DH -DH +hQ +hQ +aa BS -zD -DH +Qq +aa kB PJ PJ @@ -12090,12 +12486,12 @@ PJ (13,1,1) = {" PJ PJ -xt -yW -yW -yW -yW -yW +Xn +WF +WF +WF +WF +WF mh mh mh @@ -12112,10 +12508,10 @@ hU fa bs CK -Zt -Zt -Zt -Zt +qT +qT +qT +qT Zt Zt Zt @@ -12132,7 +12528,7 @@ PJ (14,1,1) = {" PJ PJ -yW +WF Vw jI eo @@ -12154,10 +12550,10 @@ Bo fa cA RN -Zt +qT PC CV -Zt +qT Eb HK mI @@ -12174,7 +12570,7 @@ PJ (15,1,1) = {" PJ PJ -yW +WF hM jH ll @@ -12196,7 +12592,7 @@ hU fa AR Kt -Zt +qT jC gl Sk @@ -12216,12 +12612,12 @@ PJ (16,1,1) = {" PJ xt -yW -yW -yW -yW +FZ +FZ +FZ +WF IP -yW +WF mh Zh Zh @@ -12238,7 +12634,7 @@ ai Pz sr Nn -Zt +qT xx xl Sk @@ -12257,10 +12653,10 @@ oZ "} (17,1,1) = {" PJ -yW +FZ zd Uj -yW +FZ bp yn ma @@ -12278,12 +12674,12 @@ mh ko mY rB -Zt -Zt -Zt +TC +TC +qT AM -Zt -Zt +qT +qT BD oO Jj @@ -12299,14 +12695,14 @@ qn "} (18,1,1) = {" PJ -yW +FZ tr UZ wF wU zK UG -mh +yW mh Nc ms @@ -12320,7 +12716,7 @@ mh Wr hU ge -Zt +TC qY Zu mr @@ -12341,10 +12737,10 @@ tF "} (19,1,1) = {" PJ -yW -yW -yW -yW +NH +NH +NH +NH ZJ GM np @@ -12362,7 +12758,7 @@ ji at hU ol -Zt +TC Bh eE mr @@ -12383,10 +12779,10 @@ KQ "} (20,1,1) = {" PJ -yW +NH or hD -yW +NH Og th qr @@ -12404,7 +12800,7 @@ aW Gy tS ol -Zt +TC Xg Io Bs @@ -12425,7 +12821,7 @@ KQ "} (21,1,1) = {" PJ -yW +NH Dj dE sG @@ -12467,10 +12863,10 @@ bL "} (22,1,1) = {" PJ -yW +NH vs eU -yW +NH Cd Zs ew @@ -12509,10 +12905,10 @@ Uo "} (23,1,1) = {" PJ -yW -tr +NH +Vl kz -yW +NH Im jZ eP @@ -12530,7 +12926,7 @@ lz at hU ol -Zt +TC db Hy Gj @@ -12551,10 +12947,10 @@ bL "} (24,1,1) = {" PJ -yW +NH ps CF -yW +NH Tl Do ga @@ -12572,7 +12968,7 @@ mh rH hU mf -Zt +TC ZU Br Hy @@ -12614,10 +13010,10 @@ mh HQ YS Vr -Zt -Zt -Zt -Hy +TC +TC +TC +hZ Ke OC Yy @@ -12658,7 +13054,7 @@ iw fV vI NL -Zt +TC pg IK uh @@ -12684,7 +13080,7 @@ xA et eH Ak -jy +dg mh mh mh @@ -12700,7 +13096,7 @@ bO kd OV tU -Zt +TC lE iI Qz @@ -12727,13 +13123,13 @@ qB Zk oP Tp -Tp +hw OD Df -TC -rJ rJ rJ +Wy +Gp TW ri Zj @@ -12773,7 +13169,7 @@ ks PD Yn Nf -Yn +Nf lG qf dj @@ -12807,7 +13203,7 @@ kB Ae Fd Zk -Zk +cq OT dB qh @@ -12826,7 +13222,7 @@ Ui rU Uc GA -Zt +TC yH FO wR @@ -12868,7 +13264,7 @@ iw Nb EC wn -Zt +TC BW rZ BN @@ -12910,12 +13306,12 @@ Wz lP vX vX -Zt -Zt -Zt +TC +TC +TC ls -JB -Hb +wt +MK ex aA aA @@ -13027,7 +13423,7 @@ Tw FY wj ur -oJ +JQ oJ Ug xq @@ -13181,10 +13577,10 @@ RY "} (39,1,1) = {" PJ -Qh -Qh -Qh -Qh +yN +yN +yN +yN LA be kf @@ -13195,10 +13591,10 @@ iA FY jh ve -qh -qh -qh -qh +Dg +Dg +Dg +Dg yA pa oD @@ -13223,10 +13619,10 @@ RY "} (40,1,1) = {" PJ -Qh +yN vo Zx -Qh +yN ss Tr Fl @@ -13235,18 +13631,18 @@ gR Qh Ay Eq -oJ +Rd Td jb bh Jo -qh +Dg zf ys Kb vX NK -hv +ze Xi vX IM @@ -13265,7 +13661,7 @@ gB "} (41,1,1) = {" PJ -Qh +yN EM Vg Oy @@ -13279,10 +13675,10 @@ qh qh sK iK -qh +Dg Lu OR -qh +Dg SW mv ja @@ -13307,10 +13703,10 @@ oZ "} (42,1,1) = {" PJ -Qh -Qh +yN +yN kg -Qh +yN Wg hL dt @@ -13321,10 +13717,10 @@ LN Us PW cI -qh +Dg VC Go -qh +Dg wd mv ja @@ -13363,10 +13759,10 @@ EZ dN DB iJ -qh +Dg EV SS -qh +Dg SW Oe PT @@ -13405,10 +13801,10 @@ zT zT zT zT -qh -qh -qh -qh +Dg +Dg +Dg +Dg SW mv FF @@ -13478,7 +13874,7 @@ PJ PJ Da zy -SQ +YT xY Da xH diff --git a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm index 6e07216e0f44..586fa7756e3e 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm @@ -196,6 +196,9 @@ }, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) +"kT" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) "mH" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -742,12 +745,12 @@ (1,1,1) = {" MG -Cw +kT pu Cw Cw pu -Cw +kT MG "} (2,1,1) = {" @@ -842,11 +845,11 @@ wA "} (11,1,1) = {" MG -Cw +kT Cw wC wC Cw -Cw +kT MG "} diff --git a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm index 8543052c5603..bca3130d5867 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm @@ -1,27 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/machinery/power/apc/auto_name/directional/east{ locked = 0 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "b" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/power/terminal{ dir = 1 }, /obj/machinery/stasis, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "c" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/chair/comfy/shuttle{ dir = 8 }, @@ -32,6 +26,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "d" = ( @@ -123,10 +120,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "m" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/dark, @@ -145,12 +139,12 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "o" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "p" = ( @@ -187,7 +181,7 @@ "s" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ +/obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plasteel/dark, @@ -196,12 +190,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "u" = ( @@ -215,12 +209,6 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "v" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -232,11 +220,17 @@ dir = 4; id = "sierra_holo" }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/bridge) "w" = ( /obj/machinery/power/smes/engineering, -/obj/structure/cable, +/obj/structure/cable/yellow, /turf/open/floor/plasteel/dark, /area/ship/bridge) "x" = ( @@ -275,9 +269,6 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "C" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/button/door{ dir = 4; pixel_y = 4; @@ -291,12 +282,12 @@ pixel_x = -22; pixel_y = -6 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "D" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/table, /obj/structure/railing{ dir = 4; @@ -305,6 +296,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "E" = ( @@ -366,25 +360,25 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "L" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "M" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "N" = ( @@ -392,37 +386,31 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "O" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "P" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/power/terminal, /obj/structure/table, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Q" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -441,6 +429,12 @@ dir = 2; name = "sierra dock" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/bridge) "R" = ( @@ -457,10 +451,10 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/structure/cable/yellow, /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/mechanical, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ship/bridge) "T" = ( @@ -497,13 +491,10 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Z" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/bridge)