From eb1407dea3e0e51d514552d5dd05aac0cb033049 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Sun, 5 Jan 2025 03:18:20 +0500 Subject: [PATCH] Additional tweaks to NCT offices (#1730) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает 1. Заменил зону у офиса на Дельте, так как забыл реплейснуть при мерже апстрима. 2. Добавил реквест консоли в каждый офис. 3. Небольшие визуальные изменения. ## Changelog :cl: tweak: На всех наших картах добавил реквест консоль и факс в офис NCT, небольшие визуальные изменения и фикс зоны у офиса на Дельте. /:cl: ## Summary by Sourcery Add request consoles to all NCT offices and fix the zone near the Delta station office. Bug Fixes: - Fix the zone near the Delta station office. Enhancements: - Add request consoles to all NCT offices. --- _maps/map_files220/stations/boxstation.dmm | 36 ++- _maps/map_files220/stations/deltastation.dmm | 244 ++++++++++--------- _maps/map_files220/stations/metastation.dmm | 70 ++++-- 3 files changed, 202 insertions(+), 148 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 3a1cf144e846..d213cd603737 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -18216,6 +18216,7 @@ /obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{ dir = 4 }, +/obj/item/paicard, /turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "btH" = ( @@ -18414,6 +18415,7 @@ /area/station/public/dorms) "buX" = ( /obj/machinery/economy/vending/traindrobe, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "bva" = ( @@ -20083,6 +20085,7 @@ /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bDv" = ( @@ -49069,6 +49072,19 @@ /obj/machinery/light/small/directional/west, /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) +"fEW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/alarm/directional/south, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "fFz" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/light_switch/south, @@ -74659,16 +74675,14 @@ /area/station/maintenance/assembly_line) "pjR" = ( /obj/structure/table/wood, -/obj/item/poster/random_contraband{ - pixel_y = 2 - }, -/obj/item/poster/random_contraband{ - pixel_y = 10 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/machinery/alarm/directional/south, +/obj/item/poster/random_official, +/obj/item/poster/random_official{ + pixel_y = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "darkgreen" }, @@ -80257,10 +80271,12 @@ /area/station/science/xenobiology) "rjY" = ( /obj/structure/table/wood, -/obj/item/paicard, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Nanotrasen Career Trainer's Office" + }, /turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "rkb" = ( @@ -89121,11 +89137,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm/directional/south, /obj/machinery/light/directional/south, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/sign/nanotrasen{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "uDJ" = ( @@ -114116,7 +114134,7 @@ blh blh blh brp -boT +fEW bqr bqr bqr diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index d0e78d395687..26a81692625e 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -980,7 +980,7 @@ id = "NCT" }, /turf/simulated/floor/plasteel, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "ahz" = ( /obj/machinery/door/airlock/external{ id_tag = "ferry_home" @@ -1989,7 +1989,7 @@ /area/station/public/vacant_store) "aoo" = ( /turf/simulated/wall, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aop" = ( /turf/simulated/wall, /area/station/command/customs) @@ -2134,32 +2134,38 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "aoV" = ( /obj/machinery/photocopier, -/obj/machinery/light/small/directional/north, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "aoX" = ( /obj/structure/table/wood, /obj/item/storage/briefcase{ pixel_x = 4; pixel_y = 4 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light_switch/north, +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "aoY" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aoZ" = ( /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ @@ -2170,26 +2176,26 @@ "apa" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/light_switch/north, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "apb" = ( /obj/structure/table/wood, -/obj/item/taperecorder, -/obj/machinery/light/small/directional/north, /obj/machinery/status_display/directional/north, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "apc" = ( /obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/newscaster/directional/north, +/obj/machinery/requests_console/directional/north, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Nanotrasen Career Trainer's Office" + }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "ape" = ( /obj/structure/table/reinforced, /obj/item/storage/box/ids{ @@ -2410,14 +2416,22 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "apL" = ( -/obj/structure/chair/office/light{ +/obj/structure/chair/office/dark{ dir = 1 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkgreen" + }, +/area/station/procedure/trainer_office) "apM" = ( -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen" + }, +/area/station/procedure/trainer_office) "apP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2448,13 +2462,13 @@ dir = 8 }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "apS" = ( -/obj/structure/chair/office/light{ +/obj/structure/chair/office/dark{ dir = 8 }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "apT" = ( /obj/structure/filingcabinet, /obj/machinery/door_control/normal/east{ @@ -2468,7 +2482,7 @@ id = "NCT" }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "apV" = ( /obj/machinery/keycard_auth/west, /turf/simulated/floor/plasteel{ @@ -2725,21 +2739,26 @@ }, /area/station/maintenance/fore) "aqI" = ( -/obj/structure/chair/office/light, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/structure/chair/office/dark, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkgreen" + }, +/area/station/procedure/trainer_office) "aqJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen" }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aqN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "darkgreen" + icon_state = "darkgreencorners" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aqO" = ( /obj/machinery/door/window/classic/normal{ name = "Glass Door"; @@ -2749,11 +2768,11 @@ dir = 8 }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aqQ" = ( /obj/structure/closet, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "aqR" = ( /obj/machinery/ai_status_display/west, /obj/machinery/computer/crew{ @@ -2804,8 +2823,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster/directional/south, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "aqZ" = ( /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -2994,8 +3013,9 @@ dir = 1 }, /obj/item/radio/intercom/directional/south, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/item/taperecorder, +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "ary" = ( /obj/structure/computerframe{ dir = 8 @@ -3027,13 +3047,13 @@ /obj/structure/table/wood, /obj/item/phone, /obj/machinery/newscaster/directional/south, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "arC" = ( /obj/machinery/papershredder, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/machinery/light/directional/south, +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "arE" = ( /obj/structure/cable{ icon_state = "2-8" @@ -3045,19 +3065,19 @@ dir = 6; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "arF" = ( /obj/item/kirbyplants, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "arG" = ( -/obj/machinery/light/small/directional/south, /obj/machinery/economy/vending/traindrobe, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "arH" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, @@ -3297,7 +3317,7 @@ /area/station/maintenance/fore) "ast" = ( /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "asw" = ( /obj/machinery/status_display/directional/west, /obj/machinery/computer/med_data{ @@ -41053,7 +41073,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "dqC" = ( /obj/machinery/door/window/classic/reversed{ name = "Chemistry Delivery" @@ -56871,17 +56891,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gTa" = ( +/obj/structure/chair/office/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "4-8" +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen" }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "gTc" = ( /obj/structure/railing/corner{ dir = 8 @@ -57341,13 +57358,16 @@ }, /area/station/maintenance/electrical) "hbo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "hbq" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, /obj/machinery/atmospherics/pipe/simple/visible, @@ -61198,8 +61218,8 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "imx" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -69939,11 +69959,11 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "kWy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen"; + dir = 1 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "kWB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69977,7 +69997,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "kWO" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -74288,20 +74308,18 @@ }, /area/station/public/toilet) "mqF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "mqG" = ( /obj/structure/cable{ icon_state = "0-8" @@ -76076,14 +76094,14 @@ /turf/simulated/floor/wood/parquet/tile, /area/station/service/library) "mWg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-4" +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen"; + dir = 1 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "mWM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -78350,7 +78368,7 @@ dir = 10; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "nEn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -82951,11 +82969,13 @@ }, /area/station/hallway/primary/central/sw) "oYb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen" + }, +/area/station/procedure/trainer_office) "oYg" = ( /obj/structure/chair/light{ dir = 1 @@ -87174,7 +87194,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "qno" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -88993,17 +89013,14 @@ /turf/simulated/floor/carpet, /area/station/service/library) "qQa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen"; + dir = 1 }, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "qQx" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -89208,20 +89225,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "qSe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkgreen" + dir = 1; + icon_state = "darkgreencorners" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "qSh" = ( /obj/machinery/door/airlock/external{ hackProof = 1; @@ -92249,7 +92260,7 @@ "rQn" = ( /obj/machinery/status_display/directional/east, /turf/simulated/floor/carpet/black, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "rQp" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -96936,6 +96947,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/sign/nanotrasen{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -98908,11 +98922,14 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgreen" }, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "tVj" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -99015,7 +99032,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/procedure/trainer, /turf/simulated/floor/plating, -/area/station/public/vacant_office) +/area/station/procedure/trainer_office) "tWL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -104057,8 +104074,11 @@ /obj/structure/table/wood, /obj/item/stack/package_wrap, /obj/item/hand_labeler, -/turf/simulated/floor/plasteel/grimy, -/area/station/public/vacant_office) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/black, +/area/station/procedure/trainer_office) "vFu" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -144629,7 +144649,7 @@ ant anP kWK vET -gTa +qQa oYb aqY aoo @@ -144887,7 +144907,7 @@ rBP aoo aoX qQa -aqI +gTa arx aoo aVK diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 0e3af94fb22a..4e278980554b 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -14321,15 +14321,9 @@ /area/station/hallway/primary/central) "biY" = ( /obj/machinery/economy/vending/traindrobe, -/obj/effect/turf_decal/woodsiding{ - dir = 9 - }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "biZ" = ( -/obj/effect/turf_decal/woodsiding{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment/corner{ @@ -14338,20 +14332,17 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "bja" = ( /obj/item/kirbyplants, -/obj/effect/turf_decal/woodsiding{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "bjb" = ( /obj/structure/table/wood, @@ -14918,7 +14909,6 @@ /area/station/hallway/primary/central) "bkL" = ( /obj/structure/chair/comfy/black, -/obj/effect/turf_decal/woodsiding, /obj/effect/landmark/start/nanotrasen_career_trainer, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -14927,20 +14917,16 @@ dir = 9 }, /obj/machinery/hologram/holopad, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "bkM" = ( -/obj/effect/turf_decal/woodsiding{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "bkN" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15560,6 +15546,13 @@ /area/station/public/storage/emergency) "bmC" = ( /obj/structure/table/wood, +/obj/machinery/door/window/reinforced/normal{ + name = "NCT"; + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15584,6 +15577,10 @@ dir = 8; pixel_x = 6 }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15650,6 +15647,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkgreen" @@ -16164,7 +16165,11 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "bou" = ( -/obj/item/flag/nt, +/obj/machinery/requests_console/directional/south, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Nanotrasen Career Trainer's Office" + }, +/obj/structure/table/wood, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkgreen" @@ -16301,15 +16306,12 @@ /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "boN" = ( -/obj/effect/turf_decal/woodsiding{ - dir = 10 - }, /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/structure/closet, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/procedure/trainer_office) "boO" = ( /obj/structure/cable/yellow{ @@ -16682,9 +16684,12 @@ }, /area/station/supply/office) "bpQ" = ( -/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer, +/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{ + dir = 1 + }, /obj/machinery/door/window/reinforced/normal{ - name = "NCT" + name = "NCT"; + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -44548,6 +44553,17 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"eVv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central) "eVz" = ( /obj/structure/table, /obj/item/storage/fancy/rollingpapers, @@ -105594,7 +105610,7 @@ mXE lSa aFE bek -bfK +eVv vRi vRi vRi