From dbcf576c295e6e7dc28a34ef965d6da77aab410e Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:09:49 -0600 Subject: [PATCH] Paracelsus Changes (#4081) ## About The Pull Request Expands on changes made by @Ratvarr in https://github.com/shiptest-ss13/Shiptest/pull/3866 - Replaces all standard wood tiles with wood wallnut (looks better) - Moved a few things into engineering / gave the ship engineer a desk - Removed psych office entirely and moved the Overseer into it - Removed psych - Added a compact armoury - Expanded on the airlock (1x3 vertical is like. Its Bleak) - Minor decaling in certain areas - Moved weaponry out of the bridge - Overseer and Captain no longer Fucking - Gave the doctors anesthetic tanks (you are Directly Funded By The State) - Cargo area is smaller so you don't get stupid cargo drops, along with cleaning up a few other areas ![image](https://github.com/user-attachments/assets/f9dd0875-0cb8-443d-9059-5af135e6c14d) ![image](https://github.com/user-attachments/assets/d7a15626-989a-44d7-8740-7436503916c9) ## Why It's Good For The Game Changed a few things on the Paracelsus I felt could use some changes, along with expanding on Ratvar's changes. ## Changelog :cl: add: Decaling, different wood type, overseer's office, sonnensoldner's office, anesthetic, among other things to the Paracelsus along with expanded airlock del: Removed psychologist and patients from the Paracelsus /:cl: --------- Co-authored-by: github-actions --- _maps/configs/solgov_paracelsus.json | 10 +- _maps/shuttles/solgov/solgov_paracelsus.dmm | 2139 ++++++++++--------- 2 files changed, 1134 insertions(+), 1015 deletions(-) diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json index 0e9695952e16..599f50db4c19 100644 --- a/_maps/configs/solgov_paracelsus.json +++ b/_maps/configs/solgov_paracelsus.json @@ -33,8 +33,8 @@ "outfit": "/datum/outfit/job/solgov/engineer", "slots": 1 }, - "Psychologist": { - "outfit": "/datum/outfit/job/solgov/psychologist", + "Sonnensöldner": { + "outfit": "/datum/outfit/job/solgov/sonnensoldner", "slots": 1 }, "Field Engineer": { @@ -43,11 +43,7 @@ }, "Scribe": { "outfit": "/datum/outfit/job/solgov/assistant", - "slots" : 3 - }, - "Attentive Care Patient": { - "outfit": "/datum/outfit/job/solgov/patient", - "slots" : 3 + "slots" : 2 } }, diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index b14db845e33f..5685aec15b3c 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -1,25 +1,27 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/turf/open/floor/plasteel/stairs/wood, +/turf/open/floor/plasteel/stairs/wood{ + color = "#543C30" + }, /area/ship/bridge) "af" = ( /obj/effect/turf_decal/solgov/wood/bottom_right, /obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/bridge) "an" = ( -/obj/structure/chair/comfy/orange/directional/south, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 22 }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-4" }, -/obj/machinery/light/directional/west, +/obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "aD" = ( @@ -35,6 +37,7 @@ }, /obj/machinery/space_heater, /obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "aF" = ( @@ -50,12 +53,20 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19; + pixel_y = -5 + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "aG" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/solgov, +/obj/item/toy/cards/deck{ + pixel_x = 3 + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "aJ" = ( @@ -71,7 +82,7 @@ }, /obj/machinery/computer/helm/viewscreen/directional/east, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "be" = ( /obj/structure/closet/crate/wooden, /obj/item/mop, @@ -85,7 +96,7 @@ }, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "bf" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -97,7 +108,7 @@ "bi" = ( /obj/machinery/light/directional/south, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "bk" = ( /obj/structure/closet/secure_closet/chemical, /obj/item/stock_parts/capacitor, @@ -161,12 +172,22 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "bt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/wood{ - dir = 1 +/obj/structure/sign/solgov_flag{ + dir = 8; + pixel_x = 28 }, -/obj/machinery/computer/helm/viewscreen/directional/south, -/turf/open/floor/wood/ebony, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -21 + }, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ + dir = 6 + }, +/obj/structure/mopbucket, +/obj/item/mop, +/obj/item/mop, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "bD" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -192,15 +213,16 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "cf" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#332521"; - dir = 4 +/obj/machinery/light/directional/east, +/obj/machinery/photocopier, +/obj/machinery/button/door{ + pixel_y = 22; + id = "sg_par_psych"; + pixel_x = -10 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/ebony, +/turf/open/floor/carpet/royalblue, /area/ship/crew/office) "cg" = ( -/obj/structure/chair/sofa/brown/right/directional/north, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/carpet/royalblue, @@ -221,10 +243,13 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/toilet) "cr" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "cu" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ @@ -256,11 +281,8 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "cF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -270,10 +292,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "cH" = ( -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "cJ" = ( @@ -289,7 +314,7 @@ name = "Waiting Room" }, /turf/open/floor/plasteel/dark, -/area/ship/cargo) +/area/ship/storage/eva) "cL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -300,10 +325,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/area/ship/storage/eva) "cN" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -314,9 +337,13 @@ dir = 9 }, /obj/effect/turf_decal/siding/wood{ - dir = 1 + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "cO" = ( /obj/effect/turf_decal/siding/wideplating/dark, @@ -327,7 +354,7 @@ /area/ship/medical/surgery) "cW" = ( /turf/closed/wall/mineral/titanium, -/area/ship/crew) +/area/ship/crew/dorm/captain) "da" = ( /obj/machinery/atmospherics/components/unary/tank/air{ piping_layer = 2 @@ -335,18 +362,24 @@ /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "dh" = ( -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"dj" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{ +/obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, +/turf/open/floor/engine/hull, +/area/ship/crew/crewtwo) +"dj" = ( /obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "do" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/canteen) @@ -359,24 +392,22 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "dA" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "dK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/holopad/emergency/command, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "dR" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -450,6 +481,12 @@ /obj/machinery/door/poddoor/shutters, /turf/open/floor/plating, /area/ship/crew/crewtwo) +"ev" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/engine/hull, +/area/ship/crew/crewtwo) "eC" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ @@ -501,6 +538,39 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) +"fg" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6; + color = "#332521" + }, +/obj/structure/closet/secure_closet/security{ + anchored = 1; + name = "sonnensöldners's locker"; + populate = 0 + }, +/obj/item/storage/box/ammo/c556mm, +/obj/item/ammo_box/magazine/pistol556mm, +/obj/item/clothing/suit/armor/vest/solgov, +/obj/item/storage/backpack, +/obj/item/radio/headset/solgov/alt, +/obj/item/clothing/gloves/combat, +/obj/item/storage/belt/sabre/solgov, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/solgov, +/obj/item/clothing/under/solgov/dress, +/obj/item/radio{ + icon_state = "sec_radio" + }, +/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/head/solgov/sonnensoldner, +/obj/item/ammo_box/magazine/pistol556mm, +/obj/item/storage/box/ammo/c556mm, +/obj/item/ammo_box/amagpellet_claris, +/obj/item/ammo_box/amagpellet_claris, +/obj/item/storage/box/ammo/ferropellet, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet/royalblue, +/area/ship/security/armory) "fl" = ( /obj/structure/chair/wood{ dir = 8 @@ -517,7 +587,7 @@ pixel_y = 7 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "fr" = ( /obj/effect/turf_decal/techfloor{ dir = 1 @@ -528,6 +598,11 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/structure/rack, +/obj/item/stack/sheet/metal/five, +/obj/item/wrench, +/obj/item/stack/sheet/glass/five, +/obj/item/stack/sheet/mineral/uranium/twenty, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "ft" = ( @@ -536,14 +611,14 @@ dir = 1 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "fH" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "fV" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ @@ -569,7 +644,7 @@ pixel_y = 3 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "gl" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -592,9 +667,6 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "gw" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -605,12 +677,25 @@ /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "gK" = ( -/obj/structure/bed, -/obj/item/bedsheet/solgov, -/obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 10; + color = "#332521" + }, +/obj/structure/table/wood, +/obj/item/folder/solgov{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/paper_bin{ + pixel_x = 9; + pixel_y = 0 + }, +/obj/item/pen/solgov{ + pixel_x = 9; + pixel_y = 2 + }, /turf/open/floor/carpet/royalblue, -/area/ship/crew/office) +/area/ship/security/armory) "gQ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -647,29 +732,19 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "gV" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - dir = 8; - id = "sg_par_cargo3" - }, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "gX" = ( /obj/structure/dresser, /obj/item/toy/plush/blahaj, /obj/machinery/firealarm/directional/west, /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "hb" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "4-8" }, @@ -680,15 +755,16 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner{ - dir = 1 + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "hd" = ( /obj/structure/sink/kitchen{ dir = 8; - pixel_x = 12; - pixel_y = 8 + pixel_x = -1; + pixel_y = -2 }, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ @@ -719,15 +795,18 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "hh" = ( /obj/structure/closet/crate, @@ -745,7 +824,7 @@ /obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "hA" = ( /obj/effect/turf_decal/techfloor, /obj/machinery/light/directional/south, @@ -787,12 +866,9 @@ /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "if" = ( -/obj/structure/table/wood, /obj/machinery/light/directional/west, -/obj/machinery/computer/med_data/laptop{ - dir = 4; - pixel_x = -4; - pixel_y = 7 +/obj/effect/turf_decal/siding/wood{ + color = "#332521" }, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) @@ -824,19 +900,16 @@ /obj/effect/turf_decal/industrial/outline/red, /obj/item/clothing/glasses/meson/prescription, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "ip" = ( /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/closet/crate/freezer/surplus_limbs/organs, +/obj/machinery/autolathe, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "is" = ( -/obj/structure/chair/office{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -872,17 +945,27 @@ name = "Waiting Room" }, /turf/open/floor/plasteel/dark, -/area/ship/cargo) +/area/ship/storage/eva) "iW" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/wood, -/area/ship/crew/crewtwo) +/obj/machinery/door/firedoor/border_only, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/security{ + req_access_txt = "2"; + name = "Armory" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "iZ" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -940,13 +1023,21 @@ dir = 4 }, /obj/effect/turf_decal/siding/wood/corner{ - dir = 4 + dir = 4; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "jF" = ( /turf/closed/wall/mineral/titanium, /area/ship/bridge) +"jH" = ( +/obj/structure/sign/solgov_seal{ + pixel_x = 28; + pixel_y = 0 + }, +/turf/template_noop, +/area/template_noop) "jJ" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -957,7 +1048,7 @@ }, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "jK" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/dark, @@ -971,29 +1062,29 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "jV" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/door/airlock/external{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/poddoor{ + dir = 8; + id = "sg_par_cargo3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/ship/crew/crewtwo) +/turf/open/floor/plating, +/area/ship/storage/eva) "jW" = ( /obj/structure/fluff/hedge, /obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "jZ" = ( /obj/machinery/light/small/directional/south, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "kl" = ( @@ -1001,7 +1092,7 @@ dir = 4 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "ku" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ dir = 4 @@ -1016,14 +1107,8 @@ /obj/structure/sign/solgov_seal{ pixel_y = 0 }, -/obj/docking_port/mobile{ - dir = 4; - launch_status = 0; - port_direction = 2; - preferred_direction = 4 - }, /turf/closed/wall/mineral/titanium, -/area/ship/cargo) +/area/ship/storage/eva) "kC" = ( /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 9 @@ -1073,11 +1158,18 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/ship/crew) +/area/ship/crew/dorm/captain) "kM" = ( /obj/effect/turf_decal/solgov/all/center_left, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) +"kN" = ( +/obj/structure/sign/solgov_seal{ + pixel_x = 0; + pixel_y = -1 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/external/dark) "kO" = ( /obj/effect/turf_decal/techfloor/corner{ dir = 8 @@ -1099,16 +1191,22 @@ }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) -"kR" = ( -/turf/open/floor/plasteel/mono, -/area/ship/cargo) +"kU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/guncloset, +/obj/item/gun/ballistic/automatic/pistol/solgov, +/obj/item/gun/ballistic/automatic/powered/gauss/claris, +/turf/open/floor/wood/ebony, +/area/ship/security/armory) "kW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/solgov, /obj/item/tank/jetpack, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "lh" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1134,7 +1232,7 @@ "ll" = ( /obj/structure/fluff/hedge/opaque, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "ln" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -1144,14 +1242,8 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "lo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "lu" = ( /obj/docking_port/stationary{ dir = 2; @@ -1161,6 +1253,12 @@ }, /turf/template_noop, /area/template_noop) +"lv" = ( +/obj/structure/sign/solgov_seal{ + pixel_y = -27 + }, +/turf/template_noop, +/area/template_noop) "lD" = ( /obj/structure/closet/wall/directional/north, /obj/item/radio, @@ -1190,7 +1288,7 @@ dir = 1 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "lP" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -1224,22 +1322,31 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "mg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "ml" = ( /obj/structure/aquarium/prefilled, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "mn" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) -"mH" = ( +"mz" = ( +/obj/item/bedsheet/solgov, +/obj/structure/bed, +/obj/structure/curtain/cloth, +/turf/open/floor/carpet/royalblue, +/area/ship/crew/office) +"mH" = ( /obj/machinery/light/directional/east, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mug/coco{ @@ -1260,36 +1367,31 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/cargo) -"nb" = ( -/obj/effect/turf_decal/solgov/all/bottom_left, +/area/ship/storage/eva) +"mT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/ebony, +/area/ship/security/armory) +"nb" = ( +/obj/effect/turf_decal/solgov/all/bottom_left, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "nl" = ( /obj/effect/turf_decal/borderfloorblack{ dir = 4 }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo1" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "sg_par_holocargo1" - }, +/obj/effect/turf_decal/solgov/all/top_right, /turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) +/area/ship/cargo) "nq" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -1315,47 +1417,41 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/hallway/port) -"ny" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/cargo/office) "nF" = ( /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, /obj/effect/turf_decal/industrial/warning, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"nG" = ( +/obj/structure/filingcabinet/double{ + dir = 4; + pixel_x = -10; + pixel_y = 0 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/carpet/royalblue, +/area/ship/crew/office) +"nZ" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo2" - }, /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; id = "sg_par_holocargo2" }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) -"nG" = ( -/obj/machinery/button/door{ - dir = 1; - id = "sg_par_office"; - name = "shutter control"; - pixel_x = 7; - pixel_y = -22 - }, -/obj/structure/chair/sofa/brown/left/directional/north, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/office) -"nZ" = ( -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "sg_par_psych" +/obj/machinery/door/poddoor{ + id = "sg_par_cargo2" }, -/obj/structure/window/reinforced/fulltile/shuttle, -/turf/open/floor/plating, -/area/ship/crew/office) +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/crew/crewtwo) "oo" = ( /obj/machinery/smartfridge/organ, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1366,10 +1462,28 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#332521"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/wood/ebony, /area/ship/crew/office) "os" = ( -/obj/structure/closet/crate/bin, +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/solgov, +/obj/effect/turf_decal/siding/wood{ + color = "#332521" + }, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "ot" = ( @@ -1426,7 +1540,7 @@ dir = 8 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/area/ship/storage/eva) "oC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1474,24 +1588,29 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "oU" = ( -/obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) -"oZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "sg_par_holocargo1" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" + }, +/obj/machinery/door/poddoor{ + id = "sg_par_cargo1" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/cargo) +"oZ" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/ship/hallway/starboard) +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "pc" = ( /obj/structure/bed, /obj/item/bedsheet/solgov, @@ -1500,9 +1619,10 @@ /area/ship/crew/dorm) "pd" = ( /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 4; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "pe" = ( /obj/structure/grille, @@ -1517,29 +1637,36 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = -24 }, -/turf/closed/wall/mineral/titanium, -/area/ship/cargo/office) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo) "pn" = ( /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/machinery/space_heater, /obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/button/door{ + pixel_y = 20; + pixel_x = 8; + id = "engineexhaust" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "py" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/table/wood, +/obj/item/folder/solgov{ + pixel_x = -6; + pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/paper_bin{ + pixel_x = 9; + pixel_y = 0 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/item/pen/solgov{ + pixel_x = 9; + pixel_y = 2 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/ebony, +/turf/open/floor/carpet/royalblue, /area/ship/crew/office) "pA" = ( /obj/structure/fluff/hedge, @@ -1577,9 +1704,12 @@ /area/ship/maintenance/port) "pK" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" }, -/obj/effect/turf_decal/siding/wood, /obj/structure/cable{ icon_state = "4-8" }, @@ -1590,7 +1720,7 @@ dir = 4 }, /obj/machinery/light/directional/north, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/dorm) "qb" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -1602,7 +1732,7 @@ /obj/machinery/light/directional/east, /obj/structure/fluff/hedge, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "qe" = ( /obj/machinery/door/airlock/medical/glass{ dir = 4; @@ -1632,22 +1762,15 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) -"qf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/office) "qp" = ( /obj/structure/sign/solgov_seal{ pixel_y = 4 }, /turf/closed/wall/mineral/titanium, -/area/ship/cargo) +/area/ship/storage/eva) "qs" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, +/obj/machinery/vending/coffee, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "qw" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -1680,7 +1803,7 @@ /obj/effect/turf_decal/industrial/outline/red, /obj/item/clothing/glasses/meson/prescription, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "qH" = ( /obj/structure/table, /obj/item/storage/case/surgery{ @@ -1694,6 +1817,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical/surgery) +"qK" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/engine/hull, +/area/ship/crew/crewtwo) "qL" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/cryo) @@ -1720,7 +1852,7 @@ pixel_y = -2 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "qV" = ( /obj/structure/table/glass, /obj/structure/window/reinforced/spawner/west, @@ -1747,23 +1879,19 @@ icon_state = "2-8" }, /obj/machinery/airalarm/directional/north, -/obj/structure/closet/secure_closet{ - icon_state = "eng_secure"; - name = "engineer's locker"; - req_access = list(11) - }, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/hardhat/solgov, /obj/item/clothing/under/solgov/formal, -/obj/item/storage/toolbox/mechanical, /obj/item/clothing/accessory/armband/engine, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/hazardvest/solgov, /obj/item/clothing/shoes/workboots, -/obj/item/folder/solgov, -/obj/item/clipboard, -/obj/item/pen/solgov, -/obj/item/clothing/glasses/meson/prescription, +/obj/structure/closet/secure_closet{ + icon_state = "eng_secure"; + name = "engineer's locker"; + req_access = list(11) + }, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "re" = ( @@ -1813,30 +1941,27 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) +"rE" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/turf/open/floor/wood/ebony, +/area/ship/crew/crewtwo) "rK" = ( /obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo2" - }, -/turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/turf/open/floor/engine/hull, +/area/ship/external/dark) "rM" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/crewtwo) "rO" = ( /obj/effect/turf_decal/siding/wood/corner{ - dir = 1 + dir = 1; + color = "#543C30" }, /obj/effect/turf_decal/siding/wood/corner{ - dir = 4 + dir = 4; + color = "#543C30" }, /obj/structure/cable{ icon_state = "1-8" @@ -1844,19 +1969,20 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/dorm) "rT" = ( -/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/computer/helm/viewscreen/directional/south, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "rY" = ( @@ -1869,9 +1995,17 @@ /obj/structure/chair/sofa/brown/left/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "sk" = ( -/turf/open/floor/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "sl" = ( /obj/structure/railing/wood{ @@ -1912,21 +2046,20 @@ dir = 1; id = "sg_par_cargo1"; name = "cargo blast door control"; - pixel_x = -8; - pixel_y = -23 - }, -/obj/machinery/button/door{ - dir = 1; - id = "sg_par_cargo2"; - name = "cargo blast door control"; pixel_x = 6; pixel_y = -23 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/wood, -/area/ship/cargo/office) +/obj/machinery/button/shieldwallgen{ + dir = 1; + id = "sg_par_holocargo1"; + pixel_x = -5; + pixel_y = -21 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) "sF" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) @@ -1935,18 +2068,24 @@ icon_state = "1-4" }, /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "sS" = ( -/obj/structure/curtain/cloth, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/office) -"sW" = ( -/obj/structure/fireplace{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "2-8" }, +/obj/machinery/door/poddoor{ + id = "sg_par_cargo2" + }, +/turf/open/floor/plasteel/mono, +/area/ship/crew/crewtwo) +"sW" = ( +/obj/structure/chair/comfy/orange/directional/south{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "sZ" = ( @@ -1964,18 +2103,27 @@ pixel_y = -5 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "tf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/closed/wall/mineral/titanium, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "engineexhaust" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "tr" = ( /obj/structure/table/chem, -/obj/item/reagent_containers/glass/filter, /obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, /obj/machinery/light/directional/north, +/obj/item/reagent_containers/glass/filter{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/structure/sink/chem, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "tu" = ( @@ -1988,7 +2136,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/ship/crew/cryo) "tv" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ @@ -2001,22 +2149,25 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "tP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" }, /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "tW" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible/layer2{ @@ -2038,10 +2189,6 @@ color = "#792f27" }, /obj/machinery/light/directional/south, -/obj/machinery/telecomms/relay{ - autolinkers = list("SolHub"); - network = "SolNet" - }, /turf/open/floor/wood/mahogany, /area/ship/bridge) "uJ" = ( @@ -2055,7 +2202,7 @@ pixel_y = -5 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/area/ship/storage/eva) "uM" = ( /obj/structure/closet/crate/wooden, /obj/item/paper_bin/bundlenatural, @@ -2072,13 +2219,16 @@ /obj/item/folder/solgov, /obj/item/folder/solgov, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "uO" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/turf/closed/wall/mineral/titanium, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "va" = ( /obj/machinery/door/airlock{ name = "Cryogenic Storage" @@ -2099,19 +2249,18 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/machinery/power/port_gen/pacman, /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/power/port_gen/pacman/super, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "vh" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "vi" = ( /obj/effect/turf_decal/solgov/all/center_right, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2122,15 +2271,15 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "vj" = ( -/obj/structure/chair/office{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood{ color = "#792f27" }, /obj/item/radio/intercom/directional/south, +/obj/structure/chair/office{ + dir = 8 + }, /turf/open/floor/wood/mahogany, /area/ship/bridge) "vk" = ( @@ -2140,9 +2289,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 4; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "vl" = ( /obj/structure/sign/solgov_flag{ @@ -2150,7 +2300,7 @@ pixel_x = 4 }, /turf/closed/wall/mineral/titanium, -/area/ship/crew) +/area/ship/crew/dorm/captain) "vs" = ( /obj/structure/table/optable, /obj/machinery/defibrillator_mount{ @@ -2159,10 +2309,12 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical/surgery) "vv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = 5 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "vw" = ( /obj/structure/grille, @@ -2179,16 +2331,17 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) "vQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; pixel_y = -10 }, /obj/machinery/firealarm/directional/west, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30"; + dir = 8 + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "vR" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -2199,7 +2352,7 @@ dir = 8 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "vT" = ( /obj/structure/railing/wood{ dir = 9 @@ -2211,9 +2364,6 @@ }, /turf/open/floor/wood/mahogany, /area/ship/bridge) -"wb" = ( -/turf/closed/wall/mineral/titanium, -/area/ship/cargo/office) "wg" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/machinery/atmospherics/pipe/manifold{ @@ -2228,18 +2378,6 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "wi" = ( -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "sg_par_holocargo1"; - pixel_x = -5; - pixel_y = -21 - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "sg_par_holocargo2"; - pixel_x = 5; - pixel_y = -21 - }, /obj/structure/railing/wood{ dir = 4 }, @@ -2249,33 +2387,25 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/turf/open/floor/wood, -/area/ship/cargo/office) +/turf/open/floor/wood/walnut, +/area/ship/cargo) "wk" = ( -/obj/machinery/door/airlock/solgov{ - id_tag = "sg_par_psychlock"; - name = "Psychologist Office" - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "sg_par_psych" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/window/reinforced/fulltile/shuttle, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating, /area/ship/crew/office) "wm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "wp" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ @@ -2296,7 +2426,7 @@ name = "Offices" }, /turf/open/floor/plasteel/dark, -/area/ship/cargo/office) +/area/ship/cargo) "wr" = ( /turf/closed/wall/mineral/titanium, /area/ship/medical) @@ -2314,9 +2444,6 @@ /turf/closed/wall/mineral/titanium, /area/ship/medical) "wE" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -2326,7 +2453,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "wI" = ( /turf/template_noop, @@ -2355,7 +2486,7 @@ /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "wR" = ( /obj/item/clothing/gloves/color/latex/nitrile, /obj/structure/table/glass, @@ -2393,8 +2524,11 @@ /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "wZ" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/wood/ebony, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/turf_decal/solgov/bottom_left, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/crew/crewtwo) "xh" = ( /obj/structure/grille, @@ -2422,11 +2556,11 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "xz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2438,11 +2572,12 @@ /area/ship/maintenance/starboard) "xC" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/vending/coffee, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 4; + color = "#543C30" }, -/obj/machinery/vending/coffee, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "xU" = ( /obj/effect/turf_decal/techfloor, @@ -2467,28 +2602,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "ye" = ( -/obj/item/clothing/neck/cloak/overseer, -/obj/item/clothing/suit/armor/vest/solgov/overseer, -/obj/structure/closet/secure_closet/head_of_personnel{ - anchored = 1; - name = "\proper overseer's locker"; - populate = 0 - }, -/obj/item/clothing/gloves/combat, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/head/solgov, -/obj/item/storage/belt/sabre/solgov, -/obj/item/storage/backpack, -/obj/item/pen/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/stamp/solgov, -/obj/item/clothing/suit/armor/solgov_trenchcoat, /obj/effect/turf_decal/siding/wood{ color = "#792f27"; dir = 1 @@ -2514,7 +2638,7 @@ }, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "yw" = ( /obj/structure/table, /obj/item/storage/belt/medical{ @@ -2539,7 +2663,7 @@ pixel_x = 28 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/area/ship/storage/eva) "yN" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, @@ -2560,13 +2684,9 @@ /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "yX" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "2-4" }, @@ -2617,14 +2737,10 @@ pixel_y = 7 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "zh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, /obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "zs" = ( /obj/structure/cable{ @@ -2637,10 +2753,6 @@ /turf/open/floor/wood/ebony, /area/ship/hallway/starboard) "zt" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "4-8" }, @@ -2650,7 +2762,11 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "zu" = ( /obj/structure/grille, @@ -2678,7 +2794,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Ac" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ @@ -2717,7 +2833,7 @@ /obj/machinery/light/directional/north, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "As" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -2728,7 +2844,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Au" = ( /obj/structure/railing/wood{ dir = 8 @@ -2757,6 +2873,13 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "AX" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#332521" + }, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "AZ" = ( @@ -2776,12 +2899,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Bc" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Bg" = ( @@ -2818,11 +2935,12 @@ /area/ship/medical/surgery) "BH" = ( /obj/structure/fluff/hedge, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/siding/wood{ - dir = 6 + dir = 4; + color = "#543C30" }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "BJ" = ( /obj/machinery/cryopod{ @@ -2857,24 +2975,16 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/item/gun/ballistic/automatic/pistol/solgov, -/obj/item/gun/ballistic/automatic/pistol/solgov, -/obj/item/ammo_box/magazine/pistol556mm, -/obj/item/ammo_box/magazine/pistol556mm, -/obj/item/ammo_box/magazine/pistol556mm, -/obj/item/ammo_box/magazine/pistol556mm, -/obj/structure/closet/secure_closet/wall/directional/south{ - icon_state = "sec_wall"; - name = "firearms locker"; - req_access_txt = "19" - }, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "BU" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" }, -/obj/effect/turf_decal/siding/wood, /obj/structure/cable{ icon_state = "4-8" }, @@ -2885,8 +2995,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/dorm) "Ca" = ( /obj/structure/grille, @@ -2896,24 +3005,22 @@ id = "sg_par_captain" }, /turf/open/floor/plating, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Cd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/siding/wood/corner{ +/obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "Cf" = ( /obj/effect/turf_decal/siding/wood{ color = "#332521"; dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/siding/wood{ + color = "#332521"; dir = 4 }, /turf/open/floor/wood/ebony, @@ -2921,7 +3028,7 @@ "Cn" = ( /obj/effect/turf_decal/solgov/all/center, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "Co" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ @@ -2935,7 +3042,7 @@ name = "Offices" }, /turf/open/floor/plasteel/dark, -/area/ship/cargo/office) +/area/ship/cargo) "Cp" = ( /obj/effect/turf_decal/siding/wood{ color = "#E3994E"; @@ -2943,20 +3050,22 @@ }, /obj/structure/fluff/hedge/opaque, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Cv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "CX" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -2971,7 +3080,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "CZ" = ( /obj/structure/chair/office{ dir = 4 @@ -2980,25 +3089,14 @@ /turf/open/floor/carpet/royalblue, /area/ship/bridge) "Db" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/closed/wall/mineral/titanium, -/area/ship/cargo) +/area/ship/storage/eva) "Di" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/solgov/all/top_right, /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Dk" = ( /obj/effect/turf_decal/borderfloorblack{ dir = 1 @@ -3008,6 +3106,9 @@ }, /turf/open/floor/plasteel/white, /area/ship/hallway/port) +"Dr" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security/armory) "Du" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -3025,23 +3126,20 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Dv" = ( /obj/effect/turf_decal/solgov/all/bottom_center, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "Dz" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/solgov, -/obj/item/folder/solgov{ - pixel_x = -16 +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#332521" }, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) @@ -3053,12 +3151,12 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "DL" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/solgov/wood/top_right, /obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/bridge) "DO" = ( /obj/structure/cable{ @@ -3071,7 +3169,7 @@ dir = 4 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Ea" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -3090,6 +3188,7 @@ pixel_y = 7 }, /obj/structure/table/wood, +/obj/item/soap, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Eh" = ( @@ -3100,12 +3199,11 @@ dir = 1 }, /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Em" = ( -/obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "Er" = ( /obj/effect/turf_decal/techfloor, /obj/item/radio/intercom/directional/south, @@ -3168,63 +3266,54 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "EE" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo1" - }, +/obj/effect/turf_decal/solgov/all/top, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "EL" = ( -/obj/effect/turf_decal/siding/wood, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "EM" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24; - pixel_y = 5 - }, -/obj/machinery/photocopier, +/obj/structure/filingcabinet/double/grey, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "EQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 }, -/obj/structure/chair/wood, -/turf/open/floor/wood/ebony, +/obj/machinery/button/shieldwallgen{ + dir = 8; + id = "sg_par_holocargo2"; + pixel_x = 19; + pixel_y = -6 + }, +/obj/machinery/button/door{ + dir = 8; + id = "sg_par_cargo2"; + name = "shutter control"; + pixel_x = 20; + pixel_y = 7 + }, +/obj/effect/turf_decal/solgov/bottom_right, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/crew/crewtwo) "ER" = ( /obj/structure/table/wood, @@ -3232,13 +3321,14 @@ pixel_x = -6; pixel_y = 2 }, -/obj/item/toy/cards/deck{ - pixel_x = 3 +/obj/item/desk_flag/solgov{ + pixel_y = 3 }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "EV" = ( -/turf/open/floor/wood/ebony, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, /area/ship/crew/office) "Fe" = ( /obj/machinery/iv_drip, @@ -3269,18 +3359,13 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "Fx" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-8" - }, +/obj/structure/table/reinforced, +/obj/item/pen/solgov, +/obj/item/clipboard, +/obj/item/folder/solgov, /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "FD" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner, /obj/structure/cable{ icon_state = "4-8" }, @@ -3290,11 +3375,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "FE" = ( /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "FG" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/north, @@ -3316,16 +3405,17 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "FQ" = ( /obj/effect/decal/cleanable/dirt, @@ -3358,7 +3448,7 @@ dir = 4 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Gk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3366,10 +3456,10 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "GG" = ( /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Hf" = ( /obj/structure/bed, /obj/structure/curtain, @@ -3390,16 +3480,16 @@ /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "Ho" = ( -/obj/structure/chair/wood, -/turf/open/floor/wood/ebony, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/solgov/all/bottom_center, +/turf/open/floor/plasteel/mono, /area/ship/crew/crewtwo) "Ht" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ dir = 8 }, -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen/solgov, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "HD" = ( @@ -3426,9 +3516,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/sign/poster/solgov/random{ - pixel_y = 30 - }, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "HM" = ( @@ -3448,7 +3535,7 @@ dir = 8 }, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Ik" = ( /turf/closed/wall/mineral/titanium, @@ -3462,12 +3549,15 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "Ip" = ( +/obj/machinery/holopad/emergency/command, /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/holopad/emergency/command, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Iy" = ( /obj/effect/turf_decal/techfloor/corner{ @@ -3484,9 +3574,13 @@ dir = 4 }, /obj/machinery/light_switch{ - pixel_x = 8; + pixel_x = 11; pixel_y = 22 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "Iz" = ( @@ -3521,9 +3615,21 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/light/small/directional/east, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "sg_par_holocargo1" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + id = "sg_par_cargo1" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) +/area/ship/cargo) "IE" = ( /obj/effect/turf_decal/corner/opaque/black, /obj/structure/cable{ @@ -3557,22 +3663,18 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "IP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/structure/sign/solgov_flag{ + pixel_x = -1; + pixel_y = 0 }, -/turf/open/floor/wood, -/area/ship/crew/crewtwo) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security/armory) "IX" = ( /obj/item/clothing/head/solgov/captain, /obj/item/clothing/suit/armor/vest/solgov/captain, /obj/item/clothing/under/solgov/formal/captain, /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/combat, -/obj/item/door_remote/captain, /obj/item/storage/belt/sabre/solgov, /obj/item/clothing/under/solgov, /obj/item/clothing/under/solgov/dress, @@ -3592,12 +3694,15 @@ /obj/item/storage/guncase/pistol/modelh, /obj/item/storage/box/ammo/ferroslug, /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "IZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "Jn" = ( /obj/structure/railing/wood, @@ -3618,8 +3723,8 @@ pixel_x = -15 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/ship/cargo/office) +/turf/open/floor/wood/walnut, +/area/ship/cargo) "Jw" = ( /turf/open/floor/plating, /area/ship/external/dark) @@ -3643,7 +3748,11 @@ pixel_x = -24; pixel_y = -5 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30"; + dir = 8 + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "JR" = ( /obj/effect/turf_decal/industrial/warning{ @@ -3703,7 +3812,8 @@ /area/ship/bridge) "Kc" = ( /turf/open/floor/plasteel/stairs/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, /area/ship/bridge) "Kd" = ( @@ -3712,12 +3822,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Ke" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -3730,7 +3836,7 @@ dir = 4 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Kj" = ( /turf/open/floor/plasteel/white, /area/ship/hallway/port) @@ -3744,36 +3850,30 @@ /turf/open/floor/plasteel/white, /area/ship/bridge) "Ko" = ( -/obj/structure/chair/office, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/photocopier, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "Kt" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "Kw" = ( /obj/machinery/computer/operating/solgov, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical/surgery) "Kx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Ky" = ( /turf/closed/wall/mineral/titanium, @@ -3787,7 +3887,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "KI" = ( /obj/effect/decal/cleanable/glass, /obj/structure/cable{ @@ -3811,7 +3911,7 @@ /obj/item/pen/solgov, /obj/machinery/light/small/directional/east, /obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Lf" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -3824,10 +3924,13 @@ dir = 4 }, /obj/item/radio/intercom/directional/west, +/obj/structure/closet/body_bag, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "Lw" = ( -/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -3835,9 +3938,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Lx" = ( /obj/effect/turf_decal/solgov/all, @@ -3848,7 +3952,7 @@ dir = 8 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "LG" = ( /obj/effect/turf_decal/borderfloorwhite{ dir = 1 @@ -3865,16 +3969,12 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "LI" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "sg_par_office" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/ship/crew/crewtwo) +/turf/open/floor/plating, +/area/ship/crew/office) "LJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -3889,7 +3989,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "LK" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/machinery/button/door{ @@ -3908,11 +4008,9 @@ pixel_y = -6; specialfunctions = 4 }, -/obj/machinery/autolathe, /turf/open/floor/plasteel/white, /area/ship/medical) "LS" = ( -/obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 @@ -3927,8 +4025,19 @@ /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) +"Mg" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5; + color = "#332521" + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/carpet/royalblue, +/area/ship/security/armory) "Mi" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table/wood, @@ -3980,13 +4089,8 @@ dir = 6 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Mu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood/corner, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -3995,7 +4099,14 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Mx" = ( /obj/effect/decal/cleanable/dirt, @@ -4006,11 +4117,24 @@ /obj/structure/closet/crate, /obj/machinery/light/directional/north, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "MF" = ( -/obj/structure/chair/sofa/brown/right/directional/north, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/office) +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/docking_port/mobile{ + dir = 4; + launch_status = 0; + port_direction = 2; + preferred_direction = 4 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/poddoor{ + dir = 8; + id = "sg_par_cargo3" + }, +/turf/open/floor/plating, +/area/ship/storage/eva) "ML" = ( /obj/item/reagent_containers/condiment/flour, /obj/item/reagent_containers/condiment/flour, @@ -4046,7 +4170,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "MW" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -4077,7 +4201,7 @@ /obj/machinery/light/directional/south, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "NB" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ dir = 4 @@ -4085,8 +4209,27 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 0; + pixel_y = 4 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/port) +"NE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9; + color = "#332521" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19; + pixel_y = -11 + }, +/turf/open/floor/carpet/royalblue, +/area/ship/security/armory) "NW" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -4114,7 +4257,7 @@ name = "Starboard Hallway" }, /turf/open/floor/plasteel/dark, -/area/ship/cargo/office) +/area/ship/cargo) "NX" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ dir = 8 @@ -4132,18 +4275,12 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "NY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/sign/solgov_seal{ + pixel_x = -1; + pixel_y = -1 }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/turf/closed/wall/mineral/titanium, +/area/ship/external/dark) "Ol" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -4153,19 +4290,29 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 4; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "Op" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/toilet) "OC" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/machinery/door/poddoor{ + id = "sg_par_cargo1" }, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "OH" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ @@ -4176,9 +4323,10 @@ /area/ship/medical/surgery) "OK" = ( /obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/bridge) "OO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4189,8 +4337,8 @@ "OS" = ( /obj/structure/sink/kitchen{ dir = 4; - pixel_x = -12; - pixel_y = 8 + pixel_x = 1; + pixel_y = -2 }, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ @@ -4221,21 +4369,10 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo1" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "sg_par_holocargo1" - }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/solgov/all, /turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) +/area/ship/cargo) "OX" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/borderfloorblack{ @@ -4244,9 +4381,8 @@ /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "OZ" = ( -/obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 @@ -4258,10 +4394,12 @@ /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "Pc" = ( -/obj/effect/turf_decal/siding/wood, /obj/structure/cable{ icon_state = "4-8" }, @@ -4271,25 +4409,39 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "Pg" = ( /obj/effect/turf_decal/siding/wood{ color = "#332521"; dir = 8 }, -/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/wood{ + color = "#332521"; + dir = 4 + }, +/obj/machinery/button/door{ + dir = 1; + id = "sg_par_office"; + name = "shutter control"; + pixel_x = 7; + pixel_y = -22 + }, /turf/open/floor/wood/ebony, /area/ship/crew/office) "Pj" = ( /obj/effect/turf_decal/siding/wood/corner{ - dir = 8 + dir = 8; + color = "#543C30" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Pk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -4308,28 +4460,27 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Pp" = ( -/obj/structure/table/wood, -/obj/structure/closet/secure_closet/wall/directional/east, -/obj/item/clipboard, -/obj/item/paper_bin/carbon, -/obj/item/clothing/accessory/waistcoat/solgov, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/shoes/laceup, +/obj/structure/closet/secure_closet/head_of_personnel{ + anchored = 1; + name = "\proper overseer's locker"; + populate = 0 + }, +/obj/item/clothing/neck/cloak/overseer, +/obj/item/clothing/suit/armor/vest/solgov/overseer, +/obj/item/clothing/gloves/combat, /obj/item/folder/solgov, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/gloves/color/black, -/obj/item/pen/solgov, -/obj/item/clothing/glasses/regular, -/obj/item/toy/plush/blahaj, -/obj/item/lighter, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, /obj/item/folder/solgov, -/obj/item/clothing/head/fedora/solgov, +/obj/item/folder/documents/solgov, +/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/head/solgov, +/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/backpack, +/obj/item/pen/solgov, +/obj/item/clothing/under/solgov/dress, +/obj/item/stamp/solgov, +/obj/item/clothing/suit/armor/solgov_trenchcoat, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "Ps" = ( @@ -4342,7 +4493,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "Pu" = ( /obj/structure/window/reinforced{ dir = 8 @@ -4365,6 +4516,12 @@ }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) +"PJ" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/crewtwo) "PN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -4377,7 +4534,7 @@ dir = 4 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "PQ" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -4388,31 +4545,33 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/poddoor{ - dir = 8; - id = "sg_par_cargo3" - }, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "PX" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/structure/chair/wood{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/ship/bridge) -"Qc" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 6; + color = "#332521" }, -/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/ebony, +/area/ship/crew/crewtwo) +"Qc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Qk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4424,16 +4583,18 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/turf_decal/solgov/all/top, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "QB" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1 + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" }, -/obj/effect/turf_decal/siding/wood, /obj/item/radio/intercom/directional/north, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/dorm) "QI" = ( /obj/structure/table/glass, @@ -4501,7 +4662,7 @@ }, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Rf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/east, @@ -4570,18 +4731,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "RI" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/item/reagent_containers/food/drinks/mug/coco{ - pixel_x = -7; - pixel_y = -2 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) @@ -4593,18 +4750,8 @@ dir = 4 }, /obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor{ - id = "sg_par_cargo2" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "sg_par_holocargo2" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo/office) +/turf/open/floor/engine/hull, +/area/ship/external/dark) "RQ" = ( /obj/structure/railing/wood{ dir = 1 @@ -4618,7 +4765,7 @@ /obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/airalarm/directional/west, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "Sa" = ( /obj/structure/chair/sofa/brown/corner/directional/north, /obj/machinery/firealarm/directional/south, @@ -4626,15 +4773,15 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "Sb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30"; + dir = 8 + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Sg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -4682,8 +4829,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Sq" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, @@ -4691,9 +4836,13 @@ icon_state = "2-8" }, /obj/effect/turf_decal/siding/wood{ - dir = 1 + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "SG" = ( /obj/structure/cable{ @@ -4703,21 +4852,20 @@ /area/ship/crew/canteen) "SK" = ( /obj/effect/decal/cleanable/dirt/dust, -/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/siding/wood{ + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "SL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/siding/wood{ + color = "#543C30"; dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "SP" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -4738,15 +4886,8 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "Td" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/turf/closed/wall/mineral/titanium, +/area/ship/security/armory) "Tm" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -4755,12 +4896,11 @@ id = "sg_par_captain_window" }, /turf/open/floor/plating, -/area/ship/crew) +/area/ship/crew/dorm/captain) "To" = ( /obj/machinery/door/airlock/engineering{ dir = 4; - name = "Engineering"; - req_one_access = list(10,48) + name = "Engineering" }, /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -4796,17 +4936,18 @@ /area/ship/hallway/port) "TD" = ( /obj/item/radio/intercom/directional/south, -/obj/structure/chair/wood{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ + dir = 2 }, -/turf/open/floor/wood/ebony, +/obj/structure/bed/roller, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "TI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{ + dir = 9 + }, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "TJ" = ( /obj/structure/toilet{ @@ -4828,15 +4969,24 @@ /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "Uc" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#332521"; +/obj/effect/turf_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30" }, -/turf/open/floor/wood/ebony, -/area/ship/crew/office) +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "sg_par_holocargo2" + }, +/obj/machinery/door/poddoor{ + id = "sg_par_cargo2" + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/crew/crewtwo) "Ug" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/canteen) @@ -4844,7 +4994,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Up" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ dir = 8 @@ -4856,21 +5006,23 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "Uq" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/wood/ebony, +/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ + dir = 10 + }, +/obj/structure/bed/roller, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "Uu" = ( /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/effect/turf_decal/solgov/all, /obj/structure/sign/warning/incident{ pixel_x = -32 }, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "Uy" = ( -/obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/closet/crate/internals, /obj/item/tank/internals/emergency_oxygen/engi, @@ -4884,7 +5036,7 @@ /obj/item/clothing/suit/hazardvest/solgov, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "UE" = ( /obj/effect/turf_decal/solgov/all/top_right, /obj/structure/cable{ @@ -4897,7 +5049,7 @@ dir = 4 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "UJ" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/port) @@ -4919,24 +5071,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) -"UV" = ( -/obj/structure/curtain/cloth, -/obj/machinery/button/door{ - id = "sg_par_psychlock"; - name = "psychology office door bolt"; - normaldoorcontrol = 1; - pixel_x = -6; - pixel_y = 24; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "sg_par_psych"; - name = "psychology office privacy shutters"; - pixel_x = 6; - pixel_y = 24 - }, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/office) "Vq" = ( /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 9 @@ -4955,15 +5089,11 @@ /obj/item/radio/intercom/table{ dir = 1 }, -/turf/open/floor/wood, -/area/ship/cargo/office) +/turf/open/floor/wood/walnut, +/area/ship/cargo) "Vt" = ( -/obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/mineral/plasma/twenty, -/obj/item/wrench, -/obj/item/stack/sheet/metal/five, -/obj/item/stack/sheet/glass/five, +/obj/structure/chair/plastic, /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "Vw" = ( @@ -5000,7 +5130,29 @@ }, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) +"Wa" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/solgov{ + dir = 1; + id_tag = "sg_par_bolt"; + name = "Overseer's Quarters"; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office) "Wf" = ( /obj/effect/turf_decal/techfloor, /obj/structure/cable{ @@ -5040,37 +5192,22 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Wo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/light/directional/east, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{ + dir = 5 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "Ws" = ( -/obj/structure/table/wood, -/obj/item/desk_flag/solgov{ - pixel_y = 3 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/canteen) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/storage/eva) "Wt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) +/turf/closed/wall/mineral/titanium, +/area/ship/crew/crewtwo) "Wx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -5083,23 +5220,30 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "Wz" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, /obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "WB" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ @@ -5118,8 +5262,9 @@ pixel_y = 30 }, /obj/effect/turf_decal/industrial/outline/yellow, +/obj/structure/closet/crate/freezer/surplus_limbs/organs, /turf/open/floor/plasteel/mono, -/area/ship/cargo/office) +/area/ship/cargo) "WG" = ( /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ dir = 1 @@ -5162,30 +5307,19 @@ /obj/effect/turf_decal/techfloor{ dir = 10 }, -/obj/structure/table, -/obj/item/cigbutt{ - pixel_y = 5 - }, -/obj/item/cigbutt{ - pixel_y = 15 - }, -/obj/item/cigbutt{ - pixel_x = -11; - pixel_y = 9 - }, -/obj/item/clothing/mask/cigarette/robust{ - pixel_x = 8; - pixel_y = 10 +/obj/machinery/telecomms/relay{ + autolinkers = list("SolHub"); + network = "SolNet" }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Xe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/wood/ebony, +/obj/structure/table/wood, +/obj/machinery/fax/solgov, +/turf/open/floor/carpet/royalblue, /area/ship/crew/office) "Xt" = ( /obj/structure/table/optable, @@ -5200,9 +5334,6 @@ dir = 1 }, /obj/machinery/power/smes/engineering, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ icon_state = "0-2" }, @@ -5237,17 +5368,18 @@ pixel_y = 22 }, /turf/open/floor/carpet/royalblue, -/area/ship/crew) +/area/ship/crew/dorm/captain) "XM" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/bridge) "XO" = ( /obj/structure/table/chem, @@ -5270,12 +5402,9 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) "XQ" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -12 - }, /obj/structure/mirror{ - pixel_y = -32 + pixel_y = -25; + pixel_x = 0 }, /obj/structure/cable{ icon_state = "1-4" @@ -5286,25 +5415,26 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/sink/kitchen{ + dir = 1 + }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "XV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" }, -/turf/open/floor/wood, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "Yb" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -5318,7 +5448,7 @@ }, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/storage/eva) "Yi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5327,11 +5457,10 @@ dir = 8 }, /turf/open/floor/plasteel/mono, -/area/ship/cargo) +/area/ship/storage/eva) "Yl" = ( /obj/machinery/door/airlock/atmos{ - dir = 4; - req_one_access = list(10) + dir = 4 }, /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -5362,25 +5491,23 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "YA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, /area/ship/hallway/starboard) "YD" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = -25; - pixel_y = 2 - }, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/advanced_airlock_controller/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "YJ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -5402,10 +5529,8 @@ pixel_y = 7 }, /turf/open/floor/wood/yew, -/area/ship/crew) +/area/ship/crew/dorm/captain) "YU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood, /obj/structure/cable{ icon_state = "4-8" }, @@ -5413,7 +5538,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/ship/crew/crewtwo) "YY" = ( /obj/effect/turf_decal/borderfloor{ @@ -5428,19 +5556,14 @@ pixel_x = 11; pixel_y = -16 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Zl" = ( /obj/effect/turf_decal/corner/opaque/black{ dir = 4 }, -/obj/structure/window/reinforced, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Zn" = ( @@ -5502,7 +5625,7 @@ /obj/machinery/firealarm/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/cargo/office) +/area/ship/cargo) "ZY" = ( /obj/machinery/vending/medical, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ @@ -5589,11 +5712,11 @@ wI wI wI wI -wI -wI -wI -wI -wI +Db +MF +Db +jV +Db wI wI wI @@ -5623,7 +5746,7 @@ wI wI qp uO -ym +oZ gV kw wI @@ -5653,11 +5776,11 @@ wI wI wI wI -ym +Db dj YD Kt -ym +Db wI wI wI @@ -5684,13 +5807,13 @@ RL Jw iZ iZ -ym -MY +Db +Ws PQ -ym Db -MY -ym +Db +Ws +Db iZ iZ tv @@ -5716,13 +5839,13 @@ RL iZ iZ wI -ym +Db VW Yi fp -Yi +lo ys -ym +Db wI iZ iZ @@ -5748,13 +5871,13 @@ RL RL wI wI -ym +Db Ai vR -kR +lo lo Ni -ym +Db wI wI vB @@ -5764,8 +5887,8 @@ vB vB vB vB -wb -wb +ym +NY wI "} (9,1,1) = {" @@ -5779,17 +5902,17 @@ wE qs bD rM -ym -MY +Db +Ws jJ Lx kM nb wO +Ws +ym +ym MY -wb -wb -ny ip LJ OX @@ -5837,12 +5960,12 @@ wI wI wI et -AX +rE os Wx gR -LI -jV +gR +gR iO cL jP @@ -5857,7 +5980,7 @@ zG As Du vh -Td +vh Di nl ID @@ -5866,41 +5989,41 @@ wI "} (12,1,1) = {" wI -wI -wI -et -iW -IP +lv +Wt +rY +AX +PX FD pd BH bD -ym -MY +Db +Ws Ps io qb qw Yb +Ws +ym +MY MY -wb -ny -ny ME PN Em Vr sC ph -wb -wb +ym +kN wI "} (13,1,1) = {" wI wI -wI -et +dh +nZ wZ TI YU @@ -5916,8 +6039,8 @@ cW cW cW wI -wb -ny +ym +MY WE KF Uy @@ -5931,8 +6054,8 @@ wI (14,1,1) = {" wI wI -wI -et +ev +sS Ho cr Pc @@ -5949,7 +6072,7 @@ RS Tm wI wI -wb +ym ZU ma EA @@ -5962,9 +6085,9 @@ wI "} (15,1,1) = {" wI -wI -wI -rY +jH +qK +Uc EQ Wo EL @@ -5981,7 +6104,7 @@ zc Tm wI wI -wb +ym aW Gg be @@ -5994,10 +6117,10 @@ wI "} (16,1,1) = {" wI -jg -jg -jg -jg +rM +PJ +rM +rM jg JR jg @@ -6013,12 +6136,12 @@ ml cW wI wI -wb -wb +ym +ym NW -wb -wb -wb +ym +ym +ym Op Op Op @@ -6053,7 +6176,7 @@ gj an sW nG -gj +LI wI "} (18,1,1) = {" @@ -6083,8 +6206,8 @@ dq YA YJ RI -qf -MF +py +EV ou wI "} @@ -6113,11 +6236,11 @@ Jq Mi tP sk -YJ +Wa op Cf Pg -ou +gj wI "} (20,1,1) = {" @@ -6147,8 +6270,8 @@ XV SK wk Xe -py -EV +cH +Pp ou wI "} @@ -6169,7 +6292,7 @@ OK DL xX af -PX +OK vQ oz JJ @@ -6177,10 +6300,10 @@ Cd SL hb IZ -nZ -cf -Uc +gj cf +cH +mz ou wI "} @@ -6204,16 +6327,16 @@ XM XM Kx IB -oZ +vk vk Ol FL he -gj -UV -sS -sS -gj +Td +Td +Td +Td +Td wI "} (23,1,1) = {" @@ -6241,11 +6364,11 @@ Rf mH zs Wz -gj +iW +mT +NE gK -cH -Pp -gj +Td wI "} (24,1,1) = {" @@ -6273,11 +6396,11 @@ qL qL Ev gQ -vL -Ky -Ky -Ky -Ky +IP +kU +Mg +fg +Td wI "} (25,1,1) = {" @@ -6305,11 +6428,11 @@ Es BJ qL BU -vL -oF -pc -eH -Ky +Dr +Td +Td +Td +Dr wI "} (26,1,1) = {" @@ -6337,11 +6460,11 @@ tu YY qL pK -NY -dh -Wt -AZ -bf +vL +oF +pc +eH +Ky wI "} (27,1,1) = {" @@ -6531,7 +6654,7 @@ Sg ns Sq SG -Ws +SG cg do wI