From 13c57485f4a7cd81d4ad4460c5cfe270ff016e81 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sat, 3 Aug 2024 21:32:11 -0700 Subject: [PATCH 1/4] Update nanotrasen_osprey.dmm --- .../shuttles/nanotrasen/nanotrasen_osprey.dmm | 1648 +++++++++++------ 1 file changed, 1089 insertions(+), 559 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 341cb1224936..16cd5d71e8cd 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -85,10 +85,26 @@ /area/ship/cargo) "aE" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) +"aH" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/white, +/area/ship/medical) "aI" = ( -/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "aL" = ( @@ -106,6 +122,14 @@ }, /turf/open/floor/plasteel, /area/ship/cargo/office) +"aV" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/ship/cargo/office) "aW" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -151,6 +175,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "bg" = ( @@ -190,12 +215,22 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) +"by" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "bA" = ( /obj/effect/turf_decal/corner/transparent/neutral, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "bF" = ( @@ -241,9 +276,9 @@ /turf/open/floor/plasteel, /area/ship/cargo) "bT" = ( -/obj/structure/spider/stickyweb, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/toy/figure/cargotech, +/obj/structure/mecha_wreckage/gygax{ + name = "\The mistake" + }, /turf/open/floor/plating, /area/ship/cargo) "cd" = ( @@ -312,10 +347,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "co" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/ship/science) "cp" = ( @@ -336,27 +373,14 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/canteen) "ct" = ( -/obj/structure/closet/secure_closet{ - icon_state = "science"; - name = "scientist's locker"; - req_access_txt = "47" - }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, -/obj/item/storage/backpack/duffelbag, -/obj/item/storage/backpack/messenger/tox, -/obj/item/storage/backpack/satchel/tox, -/obj/item/storage/backpack/science, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/rnd/scientist/skirt, -/obj/item/clothing/under/rank/rnd/scientist, -/obj/item/clothing/suit/toggle/labcoat/science, -/obj/item/clothing/glasses/science, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/rechargefloor, /turf/open/floor/plasteel/white, /area/ship/science) "cD" = ( @@ -364,10 +388,7 @@ name = "AI Core Access"; req_one_access_txt = "16" }, -/obj/structure/rack, -/obj/item/aicard, -/obj/item/borg/upgrade/ai, -/obj/item/mmi/posibrain, +/obj/machinery/telecomms/broadcaster, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "cI" = ( @@ -405,6 +426,9 @@ }, /turf/open/floor/plating, /area/ship/cargo) +"cO" = ( +/turf/closed/wall/mineral/plastitanium, +/area/template_noop) "cT" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 5 @@ -436,8 +460,16 @@ dir = 8; pixel_y = 0 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) +"de" = ( +/obj/structure/railing/wood{ + dir = 8 + }, +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/ship/cargo/office) "dm" = ( /obj/effect/turf_decal/industrial/stand_clear, /obj/structure/cable{ @@ -480,6 +512,21 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) +"dv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/closet/crate{ + name = "food crate" + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "dw" = ( /obj/machinery/cryopod{ dir = 1 @@ -502,6 +549,10 @@ }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) +"dB" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/ship/cargo/office) "dE" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -523,6 +574,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "dN" = ( @@ -534,7 +586,8 @@ "dP" = ( /obj/structure/bed, /obj/structure/curtain/cloth/fancy, -/obj/item/bedsheet/captain, +/obj/structure/bed/double, +/obj/item/bedsheet/double/captain, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "dS" = ( @@ -580,6 +633,15 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"eo" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "ep" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -598,6 +660,17 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"ex" = ( +/obj/machinery/sleeper, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/turf/open/floor/plasteel/white, +/area/ship/medical) "ez" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -639,6 +712,18 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"eF" = ( +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/transparent/neutral, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "eG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -652,6 +737,9 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"eK" = ( +/turf/open/floor/wood, +/area/ship/cargo/office) "eP" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -696,7 +784,7 @@ /area/ship/engineering/atmospherics) "eZ" = ( /obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/science/ai_chamber) "fa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -720,6 +808,7 @@ "fc" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/north, +/obj/structure/bedsheetbin, /turf/open/floor/wood, /area/ship/crew/dorm) "fg" = ( @@ -738,6 +827,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/trash/can/food/peaches/maint, /obj/machinery/light/small/directional/north, +/obj/machinery/ore_silo, /turf/open/floor/plating, /area/ship/cargo) "fj" = ( @@ -792,6 +882,20 @@ }, /turf/open/floor/engine/hull, /area/ship/external) +"fN" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "fU" = ( /obj/machinery/button/door{ dir = 1; @@ -827,8 +931,19 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"ge" = ( +/obj/machinery/door/airlock/mining{ + name = "Cargo Office"; + req_access_txt = "31" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "gg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -843,6 +958,9 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) +"gl" = ( +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "go" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -922,6 +1040,11 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, /area/ship/crew/canteen) +"gR" = ( +/obj/structure/table/wood, +/obj/machinery/printer, +/turf/open/floor/wood, +/area/ship/cargo/office) "gT" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) @@ -958,6 +1081,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/porta_turret/ai, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "hg" = ( @@ -971,7 +1095,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/central) "hh" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/science) "hj" = ( /obj/machinery/mass_driver{ @@ -1014,7 +1138,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/science) "ht" = ( /obj/structure/closet/secure_closet{ @@ -1042,6 +1166,7 @@ /obj/item/clothing/head/caphat/parade, /obj/item/clothing/suit/armor/vest/capcarapace, /obj/item/clothing/gloves/color/captain/nt, +/obj/item/clothing/under/rank/civilian/lawyer/galaxy, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "hv" = ( @@ -1128,6 +1253,27 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"ig" = ( +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "medical doctor's locker" + }, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/messenger/med, +/obj/item/storage/backpack/medic, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/medical/doctor/skirt, +/obj/item/clothing/under/rank/medical/doctor, +/obj/item/clothing/suit/toggle/labcoat, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "ik" = ( /obj/machinery/portable_atmospherics/scrubber/huge/movable, /obj/machinery/light/small/directional/east, @@ -1152,6 +1298,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "ip" = ( @@ -1188,15 +1337,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "it" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "iv" = ( @@ -1206,7 +1347,7 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "iw" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo) "iA" = ( /obj/structure/disposalpipe/segment{ @@ -1228,6 +1369,9 @@ icon_state = "4-8" }, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "iD" = ( @@ -1244,7 +1388,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "iI" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) "iM" = ( /obj/structure/table, @@ -1301,7 +1445,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/science) "jc" = ( /obj/machinery/light/directional/north, @@ -1316,6 +1460,19 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) +"jg" = ( +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -3; + pixel_y = 13 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) "jk" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/corner/opaque/blue{ @@ -1386,6 +1543,19 @@ /obj/item/storage/box/shipping, /turf/open/floor/plasteel, /area/ship/cargo/office) +"jI" = ( +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) "jM" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -1598,7 +1768,16 @@ /turf/open/floor/plasteel, /area/ship/cargo/office) "kU" = ( -/obj/machinery/recharge_station, +/obj/machinery/door/window/brigdoor/westleft{ + dir = 4; + req_one_access_txt = "61" + }, +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass{ + amount = 5 + }, +/obj/item/surveillance_upgrade, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "kV" = ( @@ -1621,6 +1800,9 @@ /obj/structure/railing{ layer = 2.91 }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "la" = ( @@ -1638,6 +1820,11 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) +"lc" = ( +/obj/structure/table/wood, +/obj/machinery/computer/bookmanagement, +/turf/open/floor/wood, +/area/ship/cargo/office) "lh" = ( /obj/structure/chair{ dir = 4 @@ -1681,21 +1868,13 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/science/ai_chamber) "lr" = ( -/obj/machinery/door/window/brigdoor/westleft{ - name = "AI Core Access"; - req_one_access_txt = "16" - }, -/obj/structure/AIcore, -/obj/item/circuitboard/aicore, -/obj/item/stack/sheet/rglass{ - amount = 5 - }, /obj/item/radio/intercom/directional/south, /obj/item/radio/intercom/directional/north{ frequency = 1351; freqlock = 1 }, /obj/item/radio/intercom/wideband/directional/east, +/obj/machinery/recharge_station, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "lt" = ( @@ -1892,32 +2071,32 @@ /turf/open/floor/plasteel, /area/ship/cargo/office) "mu" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "osprey_production" - }, +/obj/machinery/mineral/ore_redemption, /turf/open/floor/plating, /area/ship/cargo) -"my" = ( -/obj/structure/table, -/obj/item/stack/packageWrap{ - pixel_y = 9 +"mv" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 }, -/obj/item/hand_labeler{ - pixel_x = 2; - pixel_y = 8 +/obj/effect/turf_decal/corner/opaque/lime, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 }, +/obj/machinery/vending/medical, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"my" = ( /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 8 }, -/obj/item/storage/box/gloves{ - pixel_x = -3; - pixel_y = -8 - }, /obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, /turf/open/floor/plasteel/white, /area/ship/science) "mB" = ( @@ -1941,14 +2120,7 @@ /turf/open/floor/plasteel, /area/ship/cargo/office) "mH" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal/five{ - pixel_x = -3 - }, -/obj/item/stack/sheet/glass/five{ - pixel_x = 2; - pixel_y = 5 - }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "mI" = ( @@ -1962,6 +2134,7 @@ icon_state = "4-8" }, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel, /area/ship/hallway/central) "mR" = ( @@ -2056,8 +2229,28 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/item/stack/sheet/glass/five{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/stack/sheet/metal/five{ + pixel_x = -3 + }, +/obj/structure/closet/crate, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"nG" = ( +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/white, +/area/ship/medical) "nK" = ( /obj/structure/sign/warning/docking{ pixel_y = 9 @@ -2094,16 +2287,8 @@ /turf/open/floor/plasteel, /area/ship/medical) "nT" = ( -/obj/structure/filingcabinet/double/grey, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 1 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/plasteel, -/area/ship/cargo/office) +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew/canteen) "nZ" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -2334,7 +2519,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "pm" = ( -/obj/structure/frame/computer{ +/obj/machinery/computer/communications{ dir = 8 }, /turf/open/floor/plasteel/tech/grid, @@ -2369,6 +2554,17 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) +"pw" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/turf/open/floor/plasteel/white, +/area/ship/medical) "pz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2399,6 +2595,10 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"pG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "pH" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -2434,6 +2634,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/ship/science) +"pN" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "pP" = ( /obj/machinery/atmospherics/components/unary/tank/toxins, /obj/effect/turf_decal/industrial/outline/yellow, @@ -2478,27 +2682,14 @@ /turf/open/floor/plating, /area/ship/engineering) "qb" = ( -/obj/structure/closet/secure_closet{ - icon_state = "science"; - name = "scientist's locker"; - req_access_txt = "47" - }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, -/obj/item/storage/backpack/duffelbag, -/obj/item/storage/backpack/messenger/tox, -/obj/item/storage/backpack/satchel/tox, -/obj/item/storage/backpack/science, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/rnd/scientist/skirt, -/obj/item/clothing/under/rank/rnd/scientist, -/obj/item/clothing/suit/toggle/labcoat/science, -/obj/item/clothing/glasses/science, /obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/mech_bay_recharge_port, /turf/open/floor/plasteel/white, /area/ship/science) "qc" = ( @@ -2508,6 +2699,10 @@ /obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) +"qf" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "qp" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2544,6 +2739,9 @@ }, /obj/effect/turf_decal/corner/transparent/neutral, /obj/structure/closet/emcloset/wall/directional/south, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "qw" = ( @@ -2553,6 +2751,13 @@ /obj/item/trash/can, /turf/open/floor/wood, /area/ship/crew/canteen) +"qA" = ( +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) "qL" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -2602,6 +2807,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel, /area/ship/crew/canteen) +"qQ" = ( +/obj/structure/railing/wood, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "qX" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 4 @@ -2676,6 +2885,10 @@ pixel_y = -32 }, /obj/machinery/airalarm/directional/west, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gps, +/obj/item/gps, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "rz" = ( @@ -2758,12 +2971,16 @@ dir = 8 }, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "rX" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "rZ" = ( @@ -2782,9 +2999,13 @@ }, /turf/open/floor/plasteel, /area/ship/crew/canteen) +"sa" = ( +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/ship/cargo/office) "sd" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/science) "si" = ( /obj/structure/disposalpipe/segment{ @@ -2793,6 +3014,9 @@ /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "sl" = ( @@ -2866,38 +3090,6 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "sE" = ( -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 5 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/storage/cans/sixbeer, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2907,6 +3099,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/closet/crate, +/obj/item/vending_refill/coffee, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "sG" = ( @@ -3011,6 +3205,10 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) +"tu" = ( +/obj/machinery/light/dim/directional/north, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "tx" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters/preopen{ @@ -3033,9 +3231,6 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/structure/closet/crate, -/obj/item/vending_refill/coffee, -/obj/effect/spawner/lootdrop/maintenance/three, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -3050,6 +3245,9 @@ dir = 4 }, /obj/structure/closet/emcloset/wall/directional/north, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "tO" = ( @@ -3122,6 +3320,12 @@ /obj/effect/turf_decal/box/white{ color = "#2CB2E8" }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "uq" = ( @@ -3157,7 +3361,6 @@ /turf/open/floor/plasteel, /area/ship/crew/janitor) "ux" = ( -/obj/machinery/computer/operating, /obj/effect/turf_decal/corner/opaque/pink{ dir = 8 }, @@ -3197,6 +3400,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "uI" = ( @@ -3225,6 +3429,16 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) +"uL" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/turf/open/floor/plasteel/white, +/area/ship/medical) "uM" = ( /obj/machinery/door/airlock{ name = "Cryopod Room" @@ -3245,6 +3459,9 @@ "uN" = ( /obj/effect/turf_decal/corner/transparent/neutral, /obj/item/kirbyplants/random, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "uQ" = ( @@ -3340,6 +3557,13 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) +"vM" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "vY" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible, /obj/structure/cable{ @@ -3376,6 +3600,15 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) +"wi" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/obj/item/defibrillator/loaded, +/turf/open/floor/plasteel/white, +/area/ship/medical) "wj" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -3462,13 +3695,24 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "wr" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/corner/opaque/blue, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"wt" = ( +/obj/effect/turf_decal/corner/opaque/pink{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ +/obj/effect/turf_decal/corner/opaque/pink{ dir = 8 }, +/obj/machinery/shower{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/curtain, /turf/open/floor/plasteel/white, /area/ship/medical) "wx" = ( @@ -3559,9 +3803,6 @@ dir = 4 }, /obj/effect/turf_decal/corner/opaque/lime, -/obj/structure/sign/poster/official/moth/epi{ - pixel_y = 32 - }, /obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/medical) @@ -3665,6 +3906,18 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"xC" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/machinery/stasis{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "xE" = ( /obj/machinery/light_switch{ dir = 1; @@ -3727,8 +3980,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "xN" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/machinery/vending/clothing, /turf/open/floor/wood, /area/ship/crew/dorm) "xP" = ( @@ -3773,11 +4025,6 @@ icon_state = "med"; name = "medicine locker" }, -/obj/item/storage/firstaid/fire{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/storage/firstaid/regular, /obj/machinery/button/door{ dir = 1; id = "ospreymed"; @@ -3793,6 +4040,10 @@ /obj/machinery/camera/autoname{ dir = 1 }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "yd" = ( @@ -3812,6 +4063,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/ship/crew/cryo) +"ym" = ( +/obj/structure/crate_shelf, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "yn" = ( /obj/structure/disposalpipe/sorting/wrap, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -3844,6 +4099,10 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) +"yt" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/ship/cargo/office) "yw" = ( /obj/effect/turf_decal/corner/opaque/red, /obj/effect/turf_decal/corner/opaque/white{ @@ -3861,6 +4120,9 @@ /obj/machinery/status_display/shuttle{ pixel_x = 32 }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "yC" = ( @@ -3882,6 +4144,11 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"yH" = ( +/obj/structure/crate_shelf, +/obj/machinery/light/directional/west, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "yI" = ( /obj/machinery/camera/autoname{ dir = 5 @@ -3898,7 +4165,6 @@ }, /obj/machinery/door/window/brigdoor/westleft{ dir = 4; - name = "Comms Relay"; req_one_access_txt = "61" }, /turf/open/floor/circuit, @@ -3918,6 +4184,7 @@ /obj/machinery/status_display/shuttle{ pixel_x = 32 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "yS" = ( @@ -3985,6 +4252,12 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) +"zq" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "zt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -4045,6 +4318,7 @@ }, /obj/machinery/vending/snack/random, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "zL" = ( @@ -4136,6 +4410,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "Ag" = ( @@ -4168,6 +4443,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel, /area/ship/hallway/central) "Aj" = ( @@ -4205,11 +4481,27 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden/layer1, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) +"Aq" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "AB" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, /obj/item/kirbyplants/random, +/obj/effect/turf_decal/corner/transparent/neutral, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "AR" = ( @@ -4261,7 +4553,6 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Bc" = ( -/obj/structure/table/optable, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, @@ -4356,7 +4647,7 @@ /area/ship/cargo/office) "BH" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm) "BK" = ( /obj/structure/disposalpipe/segment{ @@ -4453,8 +4744,8 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Cv" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/cargo) +/turf/closed/wall/mineral/plastitanium, +/area/ship/science/ai_chamber) "Cw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/patterned, @@ -4469,6 +4760,13 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/closet/crate/internals, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "CC" = ( @@ -4487,10 +4785,26 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "CF" = ( -/turf/closed/wall/mineral/titanium, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/turf/open/floor/plasteel/white, /area/ship/medical) "CH" = ( /obj/structure/disposalpipe/segment{ @@ -4513,6 +4827,19 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"CI" = ( +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/white, +/area/ship/medical) "CL" = ( /obj/machinery/door/airlock{ name = "Restroom"; @@ -4545,6 +4872,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "CT" = ( @@ -4588,8 +4920,6 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Dj" = ( -/obj/structure/table/glass, -/obj/item/defibrillator, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, @@ -4597,9 +4927,7 @@ dir = 1 }, /obj/effect/turf_decal/corner/opaque/pink, -/obj/structure/sign/warning/nosmoking/circle{ - pixel_x = 25 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "Dq" = ( @@ -4610,7 +4938,6 @@ /turf/open/floor/engine/hull, /area/ship/external) "Dx" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/cargo_one, @@ -4649,7 +4976,7 @@ /obj/structure/sign/number/eight{ color = "Black" }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) "DH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4684,7 +5011,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/science) "DU" = ( /obj/structure/sign/nanotrasen, @@ -4713,10 +5040,6 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Ee" = ( -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "medical doctor's locker" - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -4726,16 +5049,6 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 }, -/obj/item/storage/backpack/duffelbag/med, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/medic, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/medical/doctor/skirt, -/obj/item/clothing/under/rank/medical/doctor, -/obj/item/clothing/suit/toggle/labcoat, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/light_switch{ dir = 4; @@ -4768,6 +5081,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "Ey" = ( @@ -4825,6 +5139,7 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/light/small/directional/south, +/obj/item/flashlight/lamp, /turf/open/floor/wood, /area/ship/crew/dorm) "EW" = ( @@ -4951,7 +5266,7 @@ /obj/structure/sign/warning/docking{ pixel_y = -8 }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) "FL" = ( /turf/open/floor/plasteel, @@ -4970,9 +5285,8 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "FZ" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin, /obj/item/radio/intercom/directional/north, +/obj/machinery/vending/autodrobe, /turf/open/floor/wood, /area/ship/crew/dorm) "Ga" = ( @@ -4996,6 +5310,9 @@ /area/ship/crew/canteen) "Ge" = ( /obj/effect/turf_decal/corner/transparent/neutral, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Gk" = ( @@ -5153,6 +5470,10 @@ }, /obj/item/storage/box/masks, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "Hf" = ( @@ -5207,6 +5528,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/ship/hallway/central) +"Hp" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/turf/open/floor/wood, +/area/ship/cargo/office) +"Hq" = ( +/obj/structure/bookcase/random, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Ht" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -5231,6 +5561,10 @@ pixel_x = -1; pixel_y = 12 }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "Hy" = ( @@ -5284,13 +5618,9 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "HU" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/blue, /turf/open/floor/plasteel/white, /area/ship/medical) "HV" = ( @@ -5312,8 +5642,6 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 1 }, -/obj/machinery/photocopier, -/obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel, /area/ship/cargo/office) "Ig" = ( @@ -5346,6 +5674,9 @@ icon_state = "1-2" }, /obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Iq" = ( @@ -5426,13 +5757,6 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/structure/closet/crate/internals, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "IL" = ( @@ -5495,11 +5819,11 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/closet/crate, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "IY" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/engineering/atmospherics) "Jc" = ( /obj/structure/disposalpipe/segment, @@ -5613,6 +5937,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "JX" = ( @@ -5654,6 +5979,19 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/cargo) +"KB" = ( +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 8 + }, +/obj/machinery/computer/mech_bay_power_console, +/turf/open/floor/plasteel/white, +/area/ship/science) "KC" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 @@ -5671,10 +6009,6 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "KE" = ( -/obj/structure/closet/secure_closet{ - icon_state = "brig_phys"; - name = "paramedic's locker" - }, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 @@ -5682,16 +6016,6 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 }, -/obj/item/storage/backpack/duffelbag/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/medic, -/obj/item/storage/backpack/messenger/para, -/obj/item/clothing/shoes/sneakers/blue, -/obj/item/clothing/under/rank/medical/paramedic/skirt, -/obj/item/clothing/under/rank/medical/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, /turf/open/floor/plasteel/white, /area/ship/medical) "KI" = ( @@ -5720,6 +6044,14 @@ /obj/machinery/computer/med_data{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "Ll" = ( @@ -5771,13 +6103,7 @@ name = "AI Core Access"; req_one_access_txt = "16" }, -/obj/structure/rack, -/obj/item/aiModule/core/full/asimov, -/obj/item/aiModule/core/full/corp, -/obj/item/aiModule/core/freeformcore, -/obj/item/aiModule/reset/purge{ - pixel_y = 5 - }, +/obj/machinery/telecomms/receiver, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "LF" = ( @@ -5837,6 +6163,12 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) +"LZ" = ( +/obj/machinery/computer/arcade/orion_trail{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/cargo/office) "Ma" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -5863,12 +6195,34 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) +"Me" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Mo" = ( /obj/effect/turf_decal/industrial/warning/corner, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) +"Ms" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Mu" = ( /obj/structure/window/reinforced{ dir = 8 @@ -5953,7 +6307,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/cargo) "MM" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/engineering) "MR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -5978,11 +6332,20 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"Nh" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Ni" = ( /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 8 }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Nm" = ( @@ -6056,6 +6419,11 @@ }, /turf/open/floor/plasteel, /area/ship/cargo/office) +"Nt" = ( +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Nv" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -6106,19 +6474,15 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, +/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "NH" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -3; - pixel_y = 13 - }, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/pink, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "NP" = ( @@ -6292,8 +6656,14 @@ id = "ospreymed" }, /obj/machinery/door/firedoor/window, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/medical) +"OT" = ( +/obj/structure/table/wood, +/obj/machinery/bookbinder, +/turf/open/floor/wood, +/area/ship/cargo/office) "OV" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6380,8 +6750,32 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/effect/turf_decal/corner/transparent/neutral, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"Ps" = ( +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"PB" = ( +/obj/machinery/sleeper, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/white, +/area/ship/medical) "PE" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/corner/opaque/mauve{ @@ -6408,7 +6802,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/cryo) "PP" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/crew/cryo) "PQ" = ( /obj/structure/disposalpipe/sorting/mail/flip{ @@ -6472,9 +6866,6 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -6484,6 +6875,9 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "Qr" = ( @@ -6510,6 +6904,9 @@ dir = 4 }, /obj/machinery/light/dim/directional/north, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Qv" = ( @@ -6530,6 +6927,9 @@ dir = 9 }, /obj/effect/turf_decal/corner/transparent/neutral, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "QD" = ( @@ -6543,16 +6943,21 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/opaque/blue/corner, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"QH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "QI" = ( @@ -6591,6 +6996,12 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"QQ" = ( +/obj/machinery/computer/arcade/battle{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/cargo/office) "QW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -6602,7 +7013,7 @@ /obj/structure/sign/number/one{ color = "Black" }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) "Ri" = ( /obj/structure/cable{ @@ -6620,7 +7031,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "Rq" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm) "Rr" = ( /turf/open/floor/plasteel/stairs/left{ @@ -6686,6 +7097,7 @@ }, /obj/item/stack/sheet/mineral/plasma/twenty, /obj/machinery/light/directional/north, +/obj/item/storage/box/stockparts/t3, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "RI" = ( @@ -6767,11 +7179,8 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Se" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/ship/science) +/turf/closed/wall/mineral/plastitanium, +/area/ship/medical) "Si" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -6783,6 +7192,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/ship/hallway/central) +"Sl" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/machinery/stasis{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Sm" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6805,6 +7230,15 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) +"So" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Su" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/airalarm/directional/west, @@ -6880,6 +7314,7 @@ dir = 5 }, /obj/item/radio/intercom/directional/west, +/obj/item/gps, /turf/open/floor/plasteel/dark, /area/ship/bridge) "SO" = ( @@ -6921,19 +7356,6 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/structure/closet/secure_closet{ - icon_state = "cargo"; - name = "\proper cargo technician's locker"; - req_access_txt = "31" - }, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/messenger, -/obj/item/storage/backpack/duffelbag, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/under/rank/cargo/tech/skirt, -/obj/item/clothing/under/rank/cargo/tech, -/obj/item/clothing/head/safety_helmet, /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel, /area/ship/cargo/office) @@ -6950,6 +7372,21 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "SW" = ( +/obj/structure/closet/secure_closet{ + icon_state = "science"; + name = "scientist's locker"; + req_access_txt = "47" + }, +/obj/item/storage/backpack/duffelbag, +/obj/item/storage/backpack/messenger/tox, +/obj/item/storage/backpack/satchel/tox, +/obj/item/storage/backpack/science, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/rnd/scientist/skirt, +/obj/item/clothing/under/rank/rnd/scientist, +/obj/item/clothing/suit/toggle/labcoat/science, +/obj/item/clothing/glasses/science, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/button/door{ dir = 8; id = "ospreysci_window"; @@ -6991,10 +7428,6 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "Ti" = ( -/obj/machinery/conveyor/inverted{ - dir = 5; - id = "osprey_production" - }, /turf/open/floor/plating, /area/ship/cargo) "Tn" = ( @@ -7106,6 +7539,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "TJ" = ( @@ -7169,7 +7605,7 @@ /area/ship/cargo) "TZ" = ( /obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/machinery/rnd/production/circuit_imprinter, /turf/open/floor/plasteel/dark, /area/ship/science) "Uc" = ( @@ -7192,15 +7628,20 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "Uj" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor/shutters{ - id = "ospreywindows" +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plating, -/area/ship/medical) -"Uo" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Uo" = ( +/obj/structure/disposalpipe/segment{ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -7215,24 +7656,37 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"UB" = ( -/obj/machinery/sleeper{ +"Us" = ( +/obj/effect/turf_decal/corner/opaque/blue{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"UB" = ( /obj/effect/turf_decal/corner/opaque/lime{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/lime{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/structure/sign/warning/nosmoking/circle{ - pixel_x = -25 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) +"UF" = ( +/obj/machinery/door/window/brigdoor/westleft{ + dir = 4; + req_one_access_txt = "61" + }, +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass{ + amount = 5 + }, +/obj/item/malf_upgrade, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) "UG" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -7262,6 +7716,16 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/cryo) +"Vb" = ( +/obj/structure/window/plasma/reinforced/spawner/east, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/structure/window/plasma/reinforced/spawner, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/junglebush, +/obj/machinery/light/floor, +/turf/open/floor/grass/ship, +/area/ship/medical) "Vf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -7277,7 +7741,7 @@ /area/ship/medical) "Vl" = ( /obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo) "Vq" = ( /obj/machinery/conveyor{ @@ -7425,6 +7889,23 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"Wd" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced/unanchored, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/radiation, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Wf" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 @@ -7440,14 +7921,20 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Wj" = ( -/obj/machinery/mineral/processing_unit, -/turf/open/floor/plating, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Wk" = ( /obj/structure/sign/number/four{ color = "Black" }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) "Wn" = ( /obj/structure/table/wood, @@ -7469,6 +7956,10 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/blue, /area/ship/bridge) +"Wt" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/ship/cargo/office) "WE" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7700,6 +8191,10 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/royalblue, /area/ship/bridge) +"XW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "XX" = ( /obj/effect/turf_decal/borderfloor{ dir = 8 @@ -7745,13 +8240,16 @@ "YD" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue, /turf/open/floor/plasteel/white, /area/ship/medical) "YF" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/clipboard, -/obj/item/pen/red, /obj/machinery/button/door{ dir = 4; id = "ospreycargo"; @@ -7773,18 +8271,9 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/item/folder/yellow, -/obj/item/stamp/denied{ - pixel_x = 4 - }, -/obj/item/stamp{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/pen/red, -/obj/item/holochip{ - credits = 4000 - }, +/obj/item/spacecash/bundle/c500, +/obj/item/spacecash/bundle/c500, +/obj/structure/table, /turf/open/floor/plasteel, /area/ship/cargo/office) "YH" = ( @@ -7826,10 +8315,6 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "YP" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, @@ -7849,6 +8334,19 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"YS" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Zj" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/borderfloor{ @@ -7859,6 +8357,11 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) +"Zl" = ( +/obj/structure/bookcase/random, +/obj/machinery/light/floor, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Zo" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 4 @@ -7872,6 +8375,11 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) +"Zq" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Zr" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) @@ -7905,8 +8413,12 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"ZI" = ( +/obj/structure/stairs, +/turf/open/floor/wood, +/area/ship/cargo/office) "ZJ" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) "ZK" = ( /obj/structure/window/reinforced{ @@ -7920,10 +8432,28 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/machinery/porta_turret/ai, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "ZR" = ( -/obj/machinery/porta_turret/ai, +/obj/structure/rack, +/obj/item/aiModule/core/freeformcore, +/obj/item/aiModule/reset/purge{ + pixel_y = 5 + }, +/obj/item/aiModule/core/full/corp, +/obj/item/aiModule/core/full/asimov, +/obj/item/mmi/posibrain, +/obj/item/borg/upgrade/ai, +/obj/item/borg/upgrade/ai, +/obj/item/aicard, +/obj/machinery/door/window/brigdoor/westleft, +/obj/machinery/door/window/brigdoor/westleft{ + dir = 4; + req_one_access_txt = "61" + }, +/obj/structure/window/plasma/reinforced/spawner, +/obj/structure/window/plasma/reinforced/spawner/north, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "ZW" = ( @@ -7947,24 +8477,24 @@ /area/ship/science/ai_chamber) "ZY" = ( /obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/rnd/production/protolathe/department/science, +/obj/machinery/rnd/production/protolathe, /turf/open/floor/plasteel/dark, /area/ship/science) "ZZ" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/plastitanium, /area/ship/crew/cryo) (1,1,1) = {" li -WU +MM pD pD rG rG pD pD -WU +MM li li li @@ -7980,26 +8510,26 @@ li li li li -yj +IY Hk Hk wT wT Hk Hk -yj +IY li "} (2,1,1) = {" li -WU +MM Tn VA qX Tr Tn VA -WU +MM li li li @@ -8015,26 +8545,26 @@ li li li li -yj +IY wo wQ kB hU wo wQ -yj +IY li "} (3,1,1) = {" li -WU +MM eE eE EW LB eE eE -WU +MM li li li @@ -8050,26 +8580,26 @@ li li li li -yj +IY kG kG cJ cJ kG kG -yj +IY li "} (4,1,1) = {" li -WU +MM pP ap KC Gr oi mZ -WU +MM li li li @@ -8085,26 +8615,26 @@ li li li li -yj +IY Iv Bl Tz ra Ri dS -yj +IY li "} (5,1,1) = {" li -WU +MM NT Yc RY SD BN ci -WU +MM MM li li @@ -8120,7 +8650,7 @@ li li li IY -yj +IY pT pH kb @@ -8132,7 +8662,7 @@ li "} (6,1,1) = {" li -WU +MM qc PS Fj @@ -8140,17 +8670,17 @@ QD vY yg Tg -WU +MM ao kP uz -VV -VV -VV -VV -VV -VV -VV +Cv +Cv +Cv +Cv +Cv +Cv +Cv ao kP uz @@ -8167,7 +8697,7 @@ li "} (7,1,1) = {" li -WU +MM qa gX hr @@ -8175,21 +8705,21 @@ vx XK jn MT -VV +Cv Aj -VV +Cv HE -VV -kU +Cv +UF VV yP VV kU -VV +Cv pe eZ ZX -VV +Cv RB qp HV @@ -8202,7 +8732,7 @@ li "} (8,1,1) = {" li -WU +MM RE JO uh @@ -8232,12 +8762,12 @@ sq sw cp Uc -yj +IY li "} (9,1,1) = {" li -WU +MM Hf gX oQ @@ -8267,12 +8797,12 @@ HK hm HK Qb -yj +IY li "} (10,1,1) = {" li -WU +MM Mu Ix WK @@ -8302,12 +8832,12 @@ lV Mo eX fU -yj +IY li "} (11,1,1) = {" li -WU +MM Qv lz Em @@ -8337,12 +8867,12 @@ NP yj pJ gC -yj +IY li "} (12,1,1) = {" li -WU +MM Zo LF LK @@ -8372,12 +8902,12 @@ lM yj oo oo -yj +IY li "} (13,1,1) = {" li -WU +MM bH Xz OA @@ -8407,12 +8937,12 @@ RI yj ik lA -yj +IY li "} (14,1,1) = {" li -WU +MM WU WU WU @@ -8442,7 +8972,7 @@ yj yj yj yj -yj +IY li "} (15,1,1) = {" @@ -8488,7 +9018,7 @@ Tq rJ bl yQ -sJ +eF sJ gy yE @@ -8552,7 +9082,7 @@ li "} (18,1,1) = {" li -IW +Rq iO KD fb @@ -8567,7 +9097,7 @@ gT wn UL YR -UL +UT UT UL Ry @@ -8582,12 +9112,12 @@ ea yI Su dw -gV +PP li "} (19,1,1) = {" li -IW +Rq fc pv iv @@ -8617,12 +9147,12 @@ PJ UZ uk SU -gV +PP li "} (20,1,1) = {" li -IW +Rq rz SO Xv @@ -8652,12 +9182,12 @@ tp yl gB sI -gV +PP li "} (21,1,1) = {" li -IW +Rq Oh hv LV @@ -8667,16 +9197,16 @@ IW bh Cn mg -Cn -ak -ak -ak ak +Ps +Ps +Ps +Ps Ni -ak -ak -ak -ak +Ps +Ps +Ps +Ps in RW Cn @@ -8687,22 +9217,22 @@ FL FL FL EO -gV +PP li "} (22,1,1) = {" li Rq -IW +Rq FZ xN ET -IW -IW +Rq +Rq ZJ Es cY -Nd +fN Nd Si Nd @@ -8716,12 +9246,12 @@ eG Qy Ge ZJ -gV -gV +PP +PP bs Fr Wb -gV +PP PP li "} @@ -8734,7 +9264,7 @@ YI YI Rq li -sG +ZJ su ZJ AB @@ -8750,7 +9280,7 @@ zU uN ZJ kV -sG +ZJ li PP EN @@ -8771,8 +9301,8 @@ li li li li -sG -cq +ZJ +nT cq cq cq @@ -8782,8 +9312,8 @@ cq WZ zy cq -cq -sG +nT +ZJ li li li @@ -8912,7 +9442,7 @@ li li li li -cq +nT lY rH gt @@ -9017,7 +9547,7 @@ li li li li -cq +nT DK tO qN @@ -9027,12 +9557,12 @@ DA yq tT DY -cq -li -li -li -li -li +nT +iI +iI +iI +iI +iI li li li @@ -9047,12 +9577,12 @@ li li li li -li -li -li -li -li -Zr +Se +Se +Se +Se +Se +Se Zr Zr Zr @@ -9062,14 +9592,14 @@ Zr ke xB Zr -Zr -li -li -li -li -li -li -li +Se +yH +ym +ym +yH +iI +iI +iI li li li @@ -9081,13 +9611,13 @@ li li li li -li -li -li -li -li -li -Zr +Se +Se +Sl +xC +xC +wt +ig ux Xl KE @@ -9097,14 +9627,14 @@ Zr eP dN Ih -Zr -li -li -li -li -li -li -li +Se +gl +gl +gl +gl +ZI +aV +iI li li li @@ -9116,13 +9646,13 @@ li li li li -li -li -li -li -li -li -Uj +Se +YS +zq +WN +WN +WN +WN Bc WN Vh @@ -9132,15 +9662,15 @@ nL PV FP HU -Uj -li -li -li -li -li -li -li -li +nG +gl +gl +gl +qQ +de +dB +iI +iI li li li @@ -9151,31 +9681,31 @@ li li li li -li -li -li -li -li -li -Uj +Se +pw +wi +jg +NH +NH +NH Dj NH -WN +Us CQ Lc OS QE uE -HU +Nt Uj -li -li -li -li -li -li -li -li +XW +Ms +by +qQ +eK +sa +QQ +iI li li li @@ -9186,15 +9716,15 @@ li li li li -li -li -li -li -li -li -Zr -Zr -Zr +Se +PB +eo +eo +eo +uL +Vb +Aq +So aI un YD @@ -9203,14 +9733,14 @@ zQ vl jk Zr -li -li -li -li -li -li -li -li +gl +Zl +Zl +qQ +yt +sa +LZ +iI li li li @@ -9221,31 +9751,31 @@ li li li li -li -li -li -li -li -li -Uj +Se +ex +Nh +gH +it +QH +Wj UB it -WN -CQ +it +qf Hx oW Qm Ac -wr -Uj -li -li -li -li -li -li -li -li +qA +jI +pG +Zq +vM +qQ +gR +Wt +iI +iI li li li @@ -9256,13 +9786,13 @@ li li li li -li -li -li -li -li -li -Uj +Se +Se +aH +Nh +WN +WN +WN IU WN gH @@ -9272,14 +9802,14 @@ Zr Sm il wr -Uj -li -li -li -li -li -li -li +CI +gl +Hq +Hq +qQ +lc +dB +iI li li li @@ -9292,12 +9822,12 @@ li li li li -li -li -li -li +Se +Se +mv +Me CF -Zr +Wd wR JD gg @@ -9307,14 +9837,14 @@ Zr CH QK Sd -Zr -CF -li -li -li -li -li -li +Se +tu +gl +pN +qQ +OT +Hp +iI li li li @@ -9328,28 +9858,28 @@ li li li li -li -hh +cO IL IL IL IL -Zr +IL +Se cd cd dE Zr xJ oX -Pl -Pl -Pl -Pl iI -li -li -li -li +iI +ge +ge +iI +iI +iI +iI +iI li li li @@ -9364,7 +9894,7 @@ li li li hh -IL +KB YP my kL @@ -9379,10 +9909,10 @@ Xe Pl YF Ie -nT -Pl +Ie +iI +iI iI -li li li li @@ -9398,9 +9928,9 @@ li li li li -IL +hh qb -Se +hG co Oj pL @@ -9416,7 +9946,7 @@ AS mW tH Nv -Pl +iI li li li @@ -9433,7 +9963,7 @@ li li li li -IL +hh ct hG Iq @@ -9451,7 +9981,7 @@ aL mF ZW Zs -Pl +iI li li li @@ -9468,7 +9998,7 @@ li li li li -IL +hh PE Vf iM @@ -9486,7 +10016,7 @@ kS yn mq SG -Pl +iI li li li @@ -9503,7 +10033,7 @@ li li li li -IL +hh fF TG ss @@ -9521,7 +10051,7 @@ Nr tH IT SR -Pl +iI li li li @@ -9687,7 +10217,7 @@ IL sy yd nE -CA +dv IA gw xG @@ -9714,10 +10244,10 @@ li li li iw -Cv +iw bT Ti -Wj +Ti Wc yd yd @@ -9730,7 +10260,7 @@ ZK iZ wd ry -Cv +iw iw li li @@ -9749,7 +10279,7 @@ li li li li -Cv +iw fh mu OG @@ -9765,7 +10295,7 @@ Fs NA Cj TP -Cv +iw li li li @@ -9785,7 +10315,7 @@ li li li iw -Cv +iw Gw cN jo @@ -9799,7 +10329,7 @@ yT na ML Oq -Cv +iw iw li li @@ -9821,19 +10351,19 @@ li li li iw -Cv -Cv -Cv -Cv +iw +iw +iw +iw wx Gt Gt Gt Os Vl -Cv -Cv -Cv +iw +iw +iw iw li li @@ -9858,7 +10388,7 @@ li li li iw -Cv +iw Dq fJ fJ @@ -9866,7 +10396,7 @@ hQ fJ fJ qM -Cv +iw iw li li @@ -9893,7 +10423,7 @@ li li li li -Cv +iw li li li @@ -9901,7 +10431,7 @@ li li li li -Cv +iw li li li From 5ca8a5786c534df183ee047050abcfaecc57aae8 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sat, 3 Aug 2024 21:37:04 -0700 Subject: [PATCH 2/4] TWO STETHASCOPES --- .../shuttles/nanotrasen/nanotrasen_osprey.dmm | 1412 +++++++++-------- 1 file changed, 707 insertions(+), 705 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 16cd5d71e8cd..eca33ad2af8b 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -87,17 +87,6 @@ /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/plastitanium, /area/ship/cargo/office) -"aH" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/white, -/area/ship/medical) "aI" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 @@ -122,14 +111,6 @@ }, /turf/open/floor/plasteel, /area/ship/cargo/office) -"aV" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/wood, -/area/ship/cargo/office) "aW" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -215,13 +196,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) -"by" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "bA" = ( /obj/effect/turf_decal/corner/transparent/neutral, /obj/structure/disposalpipe/segment{ @@ -275,12 +249,33 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/ship/cargo) +"bO" = ( +/obj/structure/railing/wood{ + dir = 8 + }, +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/ship/cargo/office) +"bS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "bT" = ( /obj/structure/mecha_wreckage/gygax{ name = "\The mistake" }, /turf/open/floor/plating, /area/ship/cargo) +"cb" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/turf/open/floor/plasteel/white, +/area/ship/medical) "cd" = ( /obj/machinery/door/airlock/medical{ name = "Infirmary"; @@ -426,9 +421,6 @@ }, /turf/open/floor/plating, /area/ship/cargo) -"cO" = ( -/turf/closed/wall/mineral/plastitanium, -/area/template_noop) "cT" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 5 @@ -439,6 +431,13 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) +"cU" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "cY" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -463,13 +462,6 @@ /obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) -"de" = ( -/obj/structure/railing/wood{ - dir = 8 - }, -/obj/machinery/vending/games, -/turf/open/floor/wood, -/area/ship/cargo/office) "dm" = ( /obj/effect/turf_decal/industrial/stand_clear, /obj/structure/cable{ @@ -512,21 +504,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) -"dv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/closet/crate{ - name = "food crate" - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "dw" = ( /obj/machinery/cryopod{ dir = 1 @@ -549,14 +526,17 @@ }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) -"dB" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/ship/cargo/office) "dE" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) +"dF" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "dJ" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 @@ -633,15 +613,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"eo" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "ep" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -660,17 +631,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"ex" = ( -/obj/machinery/sleeper, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/turf/open/floor/plasteel/white, -/area/ship/medical) "ez" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -712,18 +672,6 @@ }, /turf/open/floor/plating, /area/ship/engineering) -"eF" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/turf/open/floor/plasteel, -/area/ship/hallway/central) "eG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -737,9 +685,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"eK" = ( -/turf/open/floor/wood, -/area/ship/cargo/office) "eP" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -882,20 +827,12 @@ }, /turf/open/floor/engine/hull, /area/ship/external) -"fN" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 +"fO" = ( +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/medical) "fU" = ( /obj/machinery/button/door{ dir = 1; @@ -936,14 +873,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"ge" = ( -/obj/machinery/door/airlock/mining{ - name = "Cargo Office"; - req_access_txt = "31" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "gg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -958,7 +887,8 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) -"gl" = ( +"gk" = ( +/obj/structure/bookcase/random, /turf/open/floor/wood/bamboo, /area/ship/cargo/office) "go" = ( @@ -998,6 +928,11 @@ /obj/effect/turf_decal/industrial/shutoff, /turf/open/floor/plasteel, /area/ship/hallway/central) +"gz" = ( +/obj/structure/bookcase/random, +/obj/machinery/light/floor, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "gB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -1032,6 +967,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) +"gL" = ( +/obj/structure/stairs, +/turf/open/floor/wood, +/area/ship/cargo/office) "gM" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters{ @@ -1040,11 +979,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, /area/ship/crew/canteen) -"gR" = ( -/obj/structure/table/wood, -/obj/machinery/printer, -/turf/open/floor/wood, -/area/ship/cargo/office) "gT" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) @@ -1253,27 +1187,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"ig" = ( -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "medical doctor's locker" - }, -/obj/item/storage/backpack/duffelbag/med, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/medical/doctor/skirt, -/obj/item/clothing/under/rank/medical/doctor, -/obj/item/clothing/suit/toggle/labcoat, -/obj/item/clothing/glasses/hud/health, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "ik" = ( /obj/machinery/portable_atmospherics/scrubber/huge/movable, /obj/machinery/light/small/directional/east, @@ -1303,6 +1216,12 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"io" = ( +/obj/machinery/computer/arcade/orion_trail{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/cargo/office) "ip" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1460,19 +1379,9 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) -"jg" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -3; - pixel_y = 13 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) +"jh" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew/canteen) "jk" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/corner/opaque/blue{ @@ -1543,19 +1452,6 @@ /obj/item/storage/box/shipping, /turf/open/floor/plasteel, /area/ship/cargo/office) -"jI" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) "jM" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -1571,6 +1467,10 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) +"jR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "jU" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -1585,6 +1485,20 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, /area/ship/crew/canteen) +"jV" = ( +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -3; + pixel_y = 13 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/plasteel/white, +/area/ship/medical) "kb" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel/patterned/grid, @@ -1777,7 +1691,7 @@ /obj/item/stack/sheet/rglass{ amount = 5 }, -/obj/item/surveillance_upgrade, +/obj/item/malf_upgrade, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "kV" = ( @@ -1820,11 +1734,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) -"lc" = ( -/obj/structure/table/wood, -/obj/machinery/computer/bookmanagement, -/turf/open/floor/wood, -/area/ship/cargo/office) "lh" = ( /obj/structure/chair{ dir = 4 @@ -2074,17 +1983,6 @@ /obj/machinery/mineral/ore_redemption, /turf/open/floor/plating, /area/ship/cargo) -"mv" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/machinery/vending/medical, -/turf/open/floor/plasteel/white, -/area/ship/medical) "my" = ( /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 @@ -2110,6 +2008,11 @@ /obj/effect/turf_decal/industrial/caution, /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/central) +"mE" = ( +/obj/structure/table/wood, +/obj/machinery/bookbinder, +/turf/open/floor/wood, +/area/ship/cargo/office) "mF" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2225,6 +2128,17 @@ /obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"nC" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/machinery/vending/medical, +/turf/open/floor/plasteel/white, +/area/ship/medical) "nE" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -2239,18 +2153,6 @@ /obj/structure/closet/crate, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"nG" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, -/area/ship/medical) "nK" = ( /obj/structure/sign/warning/docking{ pixel_y = 9 @@ -2286,11 +2188,22 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/ship/medical) -"nT" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/canteen) -"nZ" = ( -/obj/structure/disposalpipe/segment{ +"nN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"nT" = ( +/obj/structure/railing/wood, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) +"nZ" = ( +/obj/structure/disposalpipe/segment{ dir = 2 }, /obj/effect/turf_decal/corner/opaque/brown, @@ -2509,6 +2422,26 @@ }, /turf/open/floor/plating, /area/ship/science/ai_chamber) +"pf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"pi" = ( +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/white, +/area/ship/medical) "pk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2554,17 +2487,6 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) -"pw" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/turf/open/floor/plasteel/white, -/area/ship/medical) "pz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2595,10 +2517,6 @@ }, /turf/open/floor/plating, /area/ship/engineering) -"pG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "pH" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -2634,10 +2552,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/ship/science) -"pN" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "pP" = ( /obj/machinery/atmospherics/components/unary/tank/toxins, /obj/effect/turf_decal/industrial/outline/yellow, @@ -2699,10 +2613,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) -"qf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "qp" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2717,6 +2627,19 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) +"qr" = ( +/obj/effect/turf_decal/corner/opaque/blue, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "qs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2733,6 +2656,25 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"qt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/closet/crate/internals, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "qv" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -2751,13 +2693,6 @@ /obj/item/trash/can, /turf/open/floor/wood, /area/ship/crew/canteen) -"qA" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) "qL" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -2807,9 +2742,13 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"qQ" = ( -/obj/structure/railing/wood, -/turf/open/floor/wood/bamboo, +"qR" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, /area/ship/cargo/office) "qX" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ @@ -2867,6 +2806,12 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/science/ai_chamber) +"rh" = ( +/obj/machinery/computer/arcade/battle{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/cargo/office) "ry" = ( /obj/item/storage/backpack/explorer, /obj/item/storage/backpack/satchel/explorer, @@ -2900,6 +2845,22 @@ }, /turf/open/floor/wood, /area/ship/crew/dorm) +"rA" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/turf/open/floor/plasteel/white, +/area/ship/medical) "rG" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 @@ -2999,10 +2960,6 @@ }, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"sa" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood, -/area/ship/cargo/office) "sd" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/plastitanium, @@ -3205,10 +3162,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"tu" = ( -/obj/machinery/light/dim/directional/north, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "tx" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters/preopen{ @@ -3218,6 +3171,19 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) +"tz" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "tF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3430,15 +3396,13 @@ /turf/open/floor/plasteel, /area/ship/crew/janitor) "uL" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 +/obj/machinery/door/airlock/mining{ + name = "Cargo Office"; + req_access_txt = "31" }, -/obj/effect/turf_decal/corner/opaque/lime, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/obj/machinery/door/firedoor, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "uM" = ( /obj/machinery/door/airlock{ name = "Cryopod Room" @@ -3469,6 +3433,23 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"va" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"ve" = ( +/obj/machinery/sleeper, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/turf/open/floor/plasteel/white, +/area/ship/medical) "vi" = ( /obj/structure/table, /obj/item/storage/bag/trash{ @@ -3557,12 +3538,10 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) -"vM" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood/bamboo, +"vQ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/bookmanagement, +/turf/open/floor/wood, /area/ship/cargo/office) "vY" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible, @@ -3574,6 +3553,12 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) +"wa" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "wb" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -3600,15 +3585,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"wi" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/obj/item/defibrillator/loaded, -/turf/open/floor/plasteel/white, -/area/ship/medical) "wj" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -3695,24 +3671,10 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "wr" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"wt" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ +/obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/shower{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/warning{ - dir = 5 - }, -/obj/structure/curtain, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "wx" = ( @@ -3906,18 +3868,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"xC" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/machinery/stasis{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "xE" = ( /obj/machinery/light_switch{ dir = 1; @@ -4020,6 +3970,23 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"ya" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "yc" = ( /obj/structure/closet/secure_closet{ icon_state = "med"; @@ -4044,6 +4011,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/white, /area/ship/medical) "yd" = ( @@ -4063,10 +4031,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/ship/crew/cryo) -"ym" = ( -/obj/structure/crate_shelf, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "yn" = ( /obj/structure/disposalpipe/sorting/wrap, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -4099,10 +4063,6 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) -"yt" = ( -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/ship/cargo/office) "yw" = ( /obj/effect/turf_decal/corner/opaque/red, /obj/effect/turf_decal/corner/opaque/white{ @@ -4144,11 +4104,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"yH" = ( -/obj/structure/crate_shelf, -/obj/machinery/light/directional/west, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "yI" = ( /obj/machinery/camera/autoname{ dir = 5 @@ -4252,12 +4207,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) -"zq" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "zt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -4481,18 +4430,6 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden/layer1, /turf/open/floor/plasteel/dark, /area/ship/science/ai_chamber) -"Aq" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "AB" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 @@ -4645,8 +4582,21 @@ }, /turf/open/floor/plating, /area/ship/cargo/office) -"BH" = ( -/obj/structure/sign/nanotrasen, +"Bx" = ( +/obj/machinery/door/window/brigdoor/westleft{ + dir = 4; + req_one_access_txt = "61" + }, +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass{ + amount = 5 + }, +/obj/item/surveillance_upgrade, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"BH" = ( +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm) "BK" = ( @@ -4733,6 +4683,15 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"Cs" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Cu" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -4745,7 +4704,7 @@ /area/ship/cargo) "Cv" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/science/ai_chamber) +/area/ship/medical) "Cw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/patterned, @@ -4760,13 +4719,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/crate/internals, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, +/obj/structure/closet/crate{ + name = "food crate" + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "CC" = ( @@ -4791,21 +4746,9 @@ /turf/open/floor/plasteel, /area/ship/hallway/central) "CF" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/obj/machinery/light/dim/directional/north, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "CH" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -4827,19 +4770,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"CI" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, -/area/ship/medical) "CL" = ( /obj/machinery/door/airlock{ name = "Restroom"; @@ -4957,6 +4887,11 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) +"DC" = ( +/obj/structure/crate_shelf, +/obj/machinery/light/directional/west, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "DE" = ( /obj/effect/turf_decal/industrial/loading{ dir = 8 @@ -5271,6 +5206,9 @@ "FL" = ( /turf/open/floor/plasteel, /area/ship/crew/cryo) +"FN" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/science/ai_chamber) "FP" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5280,6 +5218,15 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"FS" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/obj/item/defibrillator/loaded, +/turf/open/floor/plasteel/white, +/area/ship/medical) "FV" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -5422,6 +5369,10 @@ }, /turf/open/floor/wood, /area/ship/crew/dorm) +"GQ" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/ship/cargo/office) "GU" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/borderfloor{ @@ -5528,15 +5479,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Hp" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/turf/open/floor/wood, -/area/ship/cargo/office) -"Hq" = ( -/obj/structure/bookcase/random, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "Ht" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -5618,9 +5560,8 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "HU" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "HV" = ( @@ -5759,6 +5700,17 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"IC" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink, +/turf/open/floor/plasteel/white, +/area/ship/medical) "IL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) @@ -5835,6 +5787,11 @@ }, /turf/open/floor/noslip, /area/ship/engineering) +"Jk" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/turf/open/floor/wood, +/area/ship/cargo/office) "Jl" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ dir = 1 @@ -5944,6 +5901,15 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/janitor) +"JZ" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Ka" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5966,6 +5932,23 @@ /obj/machinery/camera/autoname, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) +"Kh" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/machinery/shower{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/curtain, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Ko" = ( /obj/structure/window/plasma/reinforced, /obj/structure/cable{ @@ -5979,19 +5962,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"KB" = ( -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 8 - }, -/obj/machinery/computer/mech_bay_power_console, -/turf/open/floor/plasteel/white, -/area/ship/science) "KC" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 @@ -6091,6 +6061,9 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/ship/crew/canteen) +"LA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/template_noop) "LB" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible, /obj/effect/turf_decal/industrial/warning{ @@ -6163,12 +6136,6 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) -"LZ" = ( -/obj/machinery/computer/arcade/orion_trail{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ship/cargo/office) "Ma" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -6195,34 +6162,21 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) -"Me" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/north, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/o2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Mo" = ( /obj/effect/turf_decal/industrial/warning/corner, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"Ms" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) +"Mp" = ( +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "Mu" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6279,6 +6233,27 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) +"MH" = ( +/obj/structure/window/plasma/reinforced/spawner/east, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/structure/window/plasma/reinforced/spawner, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/junglebush, +/obj/machinery/light/floor, +/turf/open/floor/grass/ship, +/area/ship/medical) +"MI" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime, +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/white, +/area/ship/medical) "MJ" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -6332,12 +6307,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Nh" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Ni" = ( /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 8 @@ -6419,11 +6388,6 @@ }, /turf/open/floor/plasteel, /area/ship/cargo/office) -"Nt" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Nv" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -6635,6 +6599,22 @@ }, /turf/open/floor/plating, /area/ship/cargo) +"OE" = ( +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/transparent/neutral, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"OF" = ( +/obj/effect/turf_decal/corner/opaque/blue, +/turf/open/floor/plasteel/white, +/area/ship/medical) "OG" = ( /obj/machinery/conveyor_switch/oneway{ id = "osprey_production" @@ -6650,6 +6630,22 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"OK" = ( +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 4 + }, +/obj/machinery/stasis{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/white, +/area/ship/medical) "OS" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters{ @@ -6660,9 +6656,8 @@ /turf/open/floor/plating, /area/ship/medical) "OT" = ( -/obj/structure/table/wood, -/obj/machinery/bookbinder, -/turf/open/floor/wood, +/obj/structure/crate_shelf, +/turf/open/floor/wood/bamboo, /area/ship/cargo/office) "OV" = ( /obj/structure/disposalpipe/segment{ @@ -6715,6 +6710,27 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"Ph" = ( +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "medical doctor's locker" + }, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/messenger/med, +/obj/item/storage/backpack/medic, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/medical/doctor/skirt, +/obj/item/clothing/under/rank/medical/doctor, +/obj/item/clothing/suit/toggle/labcoat, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/pink{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Pj" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -6742,6 +6758,19 @@ "Po" = ( /turf/open/floor/plasteel/dark, /area/ship/science) +"Pp" = ( +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Pq" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 @@ -6753,16 +6782,7 @@ /obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Ps" = ( -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"PB" = ( +"PD" = ( /obj/machinery/sleeper, /obj/effect/turf_decal/corner/opaque/lime{ dir = 1 @@ -6932,6 +6952,27 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) +"Qz" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced/unanchored, +/obj/machinery/door/window{ + dir = 8; + icon_state = "right"; + name = "Medical Supplies"; + opacity = 1 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/radiation, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"QB" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/ship/cargo/office) "QD" = ( /obj/machinery/atmospherics/components/binary/volume_pump, /obj/effect/turf_decal/industrial/warning/corner{ @@ -6953,13 +6994,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"QH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "QI" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6997,11 +7031,19 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "QQ" = ( -/obj/machinery/computer/arcade/battle{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/wood, -/area/ship/cargo/office) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/transparent/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) "QW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -7027,6 +7069,11 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) +"Rm" = ( +/obj/structure/table/wood, +/obj/machinery/printer, +/turf/open/floor/wood, +/area/ship/cargo/office) "Ro" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) @@ -7100,6 +7147,18 @@ /obj/item/storage/box/stockparts/t3, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) +"RH" = ( +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "RI" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -7140,6 +7199,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/ship/cargo) +"RT" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "RU" = ( /obj/structure/table/wood, /obj/item/toy/plush/carpplushie, @@ -7179,8 +7243,9 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Se" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical) +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/ship/cargo/office) "Si" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -7192,22 +7257,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Sl" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/machinery/stasis{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Sm" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7230,15 +7279,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) -"So" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Su" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/airalarm/directional/west, @@ -7428,8 +7468,13 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "Ti" = ( -/turf/open/floor/plating, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) "Tn" = ( /obj/structure/cable{ icon_state = "0-8" @@ -7628,16 +7673,15 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "Uj" = ( -/obj/effect/turf_decal/corner/opaque/blue, /obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 + dir = 1 }, +/obj/effect/turf_decal/corner/opaque/blue, /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "Uo" = ( @@ -7656,14 +7700,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"Us" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) "UB" = ( /obj/effect/turf_decal/corner/opaque/lime{ dir = 1 @@ -7674,19 +7710,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) -"UF" = ( -/obj/machinery/door/window/brigdoor/westleft{ - dir = 4; - req_one_access_txt = "61" - }, -/obj/structure/AIcore, -/obj/item/circuitboard/aicore, -/obj/item/stack/sheet/rglass{ - amount = 5 - }, -/obj/item/malf_upgrade, -/turf/open/floor/circuit, -/area/ship/science/ai_chamber) "UG" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -7716,16 +7739,6 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/cryo) -"Vb" = ( -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/structure/window/plasma/reinforced/spawner/north, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/flora/junglebush, -/obj/machinery/light/floor, -/turf/open/floor/grass/ship, -/area/ship/medical) "Vf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -7865,6 +7878,9 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) +"VU" = ( +/turf/open/floor/wood, +/area/ship/cargo/office) "VV" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science/ai_chamber) @@ -7889,23 +7905,6 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Wd" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/unanchored, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/radiation, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Wf" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 @@ -7921,15 +7920,8 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Wj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/turf/open/floor/plating, +/area/ship/cargo) "Wk" = ( /obj/structure/sign/number/four{ color = "Black" @@ -7950,16 +7942,15 @@ }, /turf/template_noop, /area/template_noop) +"Wr" = ( +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Ws" = ( /obj/structure/chair/comfy/orange/directional/east, /obj/effect/landmark/start/head_of_personnel, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/blue, /area/ship/bridge) -"Wt" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, -/area/ship/cargo/office) "WE" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -8003,6 +7994,10 @@ "WU" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) +"WV" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "WZ" = ( /obj/machinery/door/airlock/public/glass{ name = "Canteen"; @@ -8161,6 +8156,19 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) +"XP" = ( +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/mauve{ + dir = 8 + }, +/obj/machinery/computer/mech_bay_power_console, +/turf/open/floor/plasteel/white, +/area/ship/science) "XR" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -8191,10 +8199,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/royalblue, /area/ship/bridge) -"XW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "XX" = ( /obj/effect/turf_decal/borderfloor{ dir = 8 @@ -8207,6 +8211,11 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) +"XY" = ( +/obj/structure/bookcase/random, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/bamboo, +/area/ship/cargo/office) "Yc" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel/patterned/grid, @@ -8237,6 +8246,10 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel, /area/ship/crew/cryo) +"Yz" = ( +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/ship/cargo/office) "YD" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/medical_doctor, @@ -8334,15 +8347,14 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"YS" = ( -/obj/structure/table/optable, +"YV" = ( /obj/effect/turf_decal/corner/opaque/pink{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/pink{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/pink{ +/obj/machinery/stasis{ dir = 4 }, /turf/open/floor/plasteel/white, @@ -8357,11 +8369,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) -"Zl" = ( -/obj/structure/bookcase/random, -/obj/machinery/light/floor, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "Zo" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 4 @@ -8375,11 +8382,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) -"Zq" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "Zr" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) @@ -8405,6 +8407,10 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) +"ZB" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) "ZC" = ( /obj/structure/cable{ icon_state = "0-4" @@ -8413,10 +8419,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) -"ZI" = ( -/obj/structure/stairs, -/turf/open/floor/wood, -/area/ship/cargo/office) "ZJ" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) @@ -8674,13 +8676,13 @@ MM ao kP uz -Cv -Cv -Cv -Cv -Cv -Cv -Cv +FN +FN +FN +FN +FN +FN +FN ao kP uz @@ -8705,21 +8707,21 @@ vx XK jn MT -Cv +FN Aj -Cv +FN HE -Cv -UF +FN +kU VV yP VV -kU -Cv +Bx +FN pe eZ ZX -Cv +FN RB qp HV @@ -9018,7 +9020,7 @@ Tq rJ bl yQ -eF +OE sJ gy yE @@ -9198,15 +9200,15 @@ bh Cn mg ak -Ps -Ps -Ps -Ps +Mp +Mp +Mp +Mp Ni -Ps -Ps -Ps -Ps +Mp +Mp +Mp +Mp in RW Cn @@ -9232,7 +9234,7 @@ Rq ZJ Es cY -fN +QQ Nd Si Nd @@ -9302,7 +9304,7 @@ li li li ZJ -nT +jh cq cq cq @@ -9312,7 +9314,7 @@ cq WZ zy cq -nT +jh ZJ li li @@ -9442,7 +9444,7 @@ li li li li -nT +jh lY rH gt @@ -9547,7 +9549,7 @@ li li li li -nT +jh DK tO qN @@ -9557,7 +9559,7 @@ DA yq tT DY -nT +jh iI iI iI @@ -9577,12 +9579,12 @@ li li li li -Se -Se -Se -Se -Se -Se +Cv +Cv +Cv +Cv +Cv +Cv Zr Zr Zr @@ -9592,11 +9594,11 @@ Zr ke xB Zr -Se -yH -ym -ym -yH +Cv +DC +OT +OT +DC iI iI iI @@ -9611,13 +9613,13 @@ li li li li -Se -Se -Sl -xC -xC -wt -ig +Cv +Cv +OK +YV +YV +Kh +Ph ux Xl KE @@ -9627,13 +9629,13 @@ Zr eP dN Ih -Se -gl -gl -gl -gl -ZI -aV +Cv +Wr +Wr +Wr +Wr +gL +qR iI li li @@ -9646,9 +9648,9 @@ li li li li -Se -YS -zq +Cv +tz +wa WN WN WN @@ -9661,14 +9663,14 @@ aW nL PV FP -HU -nG -gl -gl -gl -qQ -de -dB +fO +Uj +Wr +Wr +Wr +nT +bO +QB iI iI li @@ -9681,30 +9683,30 @@ li li li li -Se -pw -wi -jg +Cv +IC +FS +jV NH NH NH Dj NH -Us +Ti CQ Lc OS QE uE -Nt -Uj -XW -Ms -by -qQ -eK -sa -QQ +HU +qr +bS +XY +cU +nT +VU +Yz +rh iI li li @@ -9716,15 +9718,15 @@ li li li li -Se -PB -eo -eo -eo -uL -Vb -Aq -So +Cv +PD +JZ +JZ +JZ +cb +MH +RH +Cs aI un YD @@ -9733,13 +9735,13 @@ zQ vl jk Zr -gl -Zl -Zl -qQ -yt -sa -LZ +Wr +gz +gz +nT +GQ +Yz +io iI li li @@ -9751,29 +9753,29 @@ li li li li -Se -ex -Nh +Cv +ve +va gH it -QH -Wj +pf +nN UB it it -qf +ZB Hx oW Qm Ac -qA -jI -pG -Zq -vM -qQ -gR -Wt +wr +Pp +jR +RT +dF +nT +Rm +Se iI iI li @@ -9786,10 +9788,10 @@ li li li li -Se -Se -aH -Nh +Cv +Cv +MI +va WN WN WN @@ -9801,14 +9803,14 @@ yc Zr Sm il -wr -CI -gl -Hq -Hq -qQ -lc -dB +OF +pi +Wr +gk +gk +nT +vQ +QB iI li li @@ -9822,12 +9824,12 @@ li li li li -Se -Se -mv -Me -CF -Wd +Cv +Cv +nC +ya +rA +Qz wR JD gg @@ -9837,13 +9839,13 @@ Zr CH QK Sd -Se -tu -gl -pN -qQ -OT -Hp +Cv +CF +Wr +WV +nT +mE +Jk iI li li @@ -9858,13 +9860,13 @@ li li li li -cO +LA IL IL IL IL IL -Se +Cv cd cd dE @@ -9873,8 +9875,8 @@ xJ oX iI iI -ge -ge +uL +uL iI iI iI @@ -9894,7 +9896,7 @@ li li li hh -KB +XP YP my kL @@ -10182,7 +10184,7 @@ IL Hy yd IX -CA +qt Gk gw QJ @@ -10217,7 +10219,7 @@ IL sy yd nE -dv +CA IA gw xG @@ -10246,8 +10248,8 @@ li iw iw bT -Ti -Ti +Wj +Wj Wc yd yd From e7be343e27d41d36baedae06372b7c7946231f91 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sat, 3 Aug 2024 21:46:55 -0700 Subject: [PATCH 3/4] deletes one piece of garbage to update the pr --- _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index eca33ad2af8b..ccdf9ac04a7a 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -2686,13 +2686,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"qw" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/trash/can, -/turf/open/floor/wood, -/area/ship/crew/canteen) "qL" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -9485,7 +9478,7 @@ rH rH sl sC -qw +xb ly pK lh From 6bfdaab645e8f95cd35c98f3219a3faec2a38707 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sat, 3 Aug 2024 21:58:02 -0700 Subject: [PATCH 4/4] Update nanotrasen_osprey.dmm --- _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm | 2 -- 1 file changed, 2 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index ccdf9ac04a7a..3efabec5b3c3 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -8277,8 +8277,6 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, /obj/structure/table, /turf/open/floor/plasteel, /area/ship/cargo/office)