From e41e261f1e8e3f5e861843f5480ffd06901682f4 Mon Sep 17 00:00:00 2001 From: Doctor-Derp <> Date: Mon, 12 Feb 2024 21:12:11 -0500 Subject: [PATCH] cargo beautification --- maps/intrepid/intrepid1.dmm | 1129 +++++++++++++++++----------- maps/intrepid/intrepid2.dmm | 853 +++++++++++++++------ maps/intrepid/intrepid_areas.dm | 9 +- maps/intrepid/intrepid_overmap.dm | 8 +- maps/intrepid/intrepid_shuttles.dm | 34 +- maps/intrepid/z2_transit.dmm | 112 +-- 6 files changed, 1396 insertions(+), 749 deletions(-) diff --git a/maps/intrepid/intrepid1.dmm b/maps/intrepid/intrepid1.dmm index 182a3c6b305..7dbcecd3485 100644 --- a/maps/intrepid/intrepid1.dmm +++ b/maps/intrepid/intrepid1.dmm @@ -62,7 +62,11 @@ dir = 4; pixel_x = 17 }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "aeD" = ( /turf/simulated/floor/tiled/white, @@ -81,8 +85,11 @@ /area/intrepid/department/command/bridgeofficer) "afX" = ( /obj/structure/table/standard, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/machinery/photocopier/faxmachine{ + department = "Supply Office" + }, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "ags" = ( /obj/structure/cable/green{ @@ -252,10 +259,10 @@ /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/misc/hallway/starboard) "anQ" = ( +/obj/effect/floor_decal/spline/fancy/black, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "aoi" = ( @@ -484,9 +491,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/cargo/cargostorage) "azz" = ( -/obj/structure/table/rack, -/obj/random_multi/single_item/boombox, -/turf/simulated/floor/tiled/monotile, +/obj/structure/table/standard, +/obj/item/deck/cards, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "azP" = ( /obj/machinery/power/breakerbox/activated{ @@ -641,6 +648,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/engineering/atmos) +"aHr" = ( +/obj/structure/table/rack, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/cargo/cargostorage) "aIe" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -1006,6 +1035,16 @@ /obj/item/clothing/suit/space/void/security/alt/prepared, /turf/simulated/floor/carpet/red, /area/intrepid/department/command/commandquarters/cos) +"aSx" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "aSz" = ( /obj/effect/floor_decal/corner/green{ dir = 4 @@ -1125,8 +1164,12 @@ /turf/simulated/floor/carpet/orange, /area/intrepid/department/command/commandquarters/ce) "aWq" = ( -/obj/structure/closet/crate/solar_assembly, -/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/table/rack, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool, +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/cargo/cargostorage) "aYb" = ( @@ -1176,6 +1219,8 @@ "aYo" = ( /obj/structure/closet/secure_closet/prospector, /obj/item/device/flashlight/lamp/floodlamp, +/obj/item/storage/belt/utility/full, +/obj/effect/floor_decal/corner/brown/mono, /obj/effect/floor_decal/industrial/bot/yellow, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) @@ -1411,6 +1456,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "bdA" = ( @@ -1434,15 +1482,6 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/treatment) "beG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -1453,6 +1492,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "beS" = ( @@ -1650,6 +1690,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "bne" = ( @@ -2248,9 +2291,13 @@ /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/misc/hallway/portside) "bMa" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "bMD" = ( @@ -2909,9 +2956,6 @@ /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/exploration/storage) "cgr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -2928,6 +2972,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "cgW" = ( @@ -3548,8 +3595,11 @@ /turf/simulated/floor, /area/intrepid/misc/maint/aft) "cDb" = ( -/obj/effect/floor_decal/industrial/loading, -/turf/simulated/floor/tiled, +/obj/machinery/computer/modular/preset/cardslot/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/bot/yellow, +/turf/simulated/floor/tiled/steel_grid, /area/intrepid/department/cargo/cargobay) "cDf" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3583,11 +3633,13 @@ /turf/simulated/floor/tiled, /area/intrepid/misc/hallway/portside) "cDD" = ( -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 1 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "cDL" = ( /obj/effect/wallframe_spawn/reinforced, @@ -3638,10 +3690,9 @@ /area/shuttle/research/fabricator) "cFz" = ( /obj/structure/table/standard, -/obj/machinery/photocopier/faxmachine{ - department = "Supply Office" - }, -/turf/simulated/floor/tiled, +/obj/machinery/cell_charger, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "cGM" = ( /obj/machinery/door/firedoor, @@ -4347,6 +4398,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "dju" = ( @@ -4737,8 +4791,16 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/bridge) "dyj" = ( -/obj/machinery/floodlight, -/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/table/rack, +/obj/item/stock_parts/keyboard, +/obj/item/stock_parts/keyboard, +/obj/item/stock_parts/keyboard, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/computer/tesla_link, +/obj/item/stock_parts/computer/tesla_link, +/obj/item/stock_parts/computer/tesla_link, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/cargo/cargostorage) "dyE" = ( @@ -4746,12 +4808,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 8 - }, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, +/obj/effect/floor_decal/corner/grey{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/misc/maint/aft) "dyG" = ( @@ -5912,16 +5974,10 @@ /turf/simulated/floor/airless, /area/space) "ejB" = ( -/obj/machinery/self_destruct, /obj/machinery/light/small/red{ dir = 4 }, -/obj/machinery/camera/motion{ - c_tag = "Nuclear Cylinder - Hatch Portside Aft"; - network = list("Command") - }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/aft) "ejP" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -5972,17 +6028,10 @@ /turf/simulated/floor, /area/intrepid/misc/maint/portside) "ekB" = ( -/obj/machinery/self_destruct, /obj/machinery/light/small/red{ dir = 8 }, -/obj/machinery/camera/motion{ - c_tag = "Nuclear Cylinder - Hatch Starboard Fore"; - dir = 1; - network = list("Command") - }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/starboard) "ekX" = ( /obj/machinery/firealarm{ @@ -6017,12 +6066,12 @@ d2 = 9; icon_state = "2-9" }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 10 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "emL" = ( @@ -6362,6 +6411,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/shuttle/research/xenoarchlab) +"eAZ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/corner/orange{ + dir = 8 + }, +/obj/machinery/computer/guestpass{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/exploration/storage) "eBc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6675,6 +6736,13 @@ /obj/item/gun/projectile/revolver/military, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/command/commandquarters/tgs) +"eNu" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/computer/guestpass{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/intrepid/misc/hallway/center) "eOb" = ( /obj/machinery/light{ dir = 4 @@ -6866,17 +6934,17 @@ /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/misc/hallway/portside) "eTI" = ( -/obj/machinery/self_destruct, -/obj/machinery/light/small/red{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/camera/motion{ - c_tag = "Nuclear Cylinder - Hatch Starboard Aft"; - network = list("Command") +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, -/area/intrepid/misc/maint/aft) +/turf/simulated/floor, +/area/intrepid/department/engineering/atmos) "eUp" = ( /turf/simulated/floor/tiled/white, /area/shuttle/research/xenobiolab) @@ -6921,6 +6989,12 @@ }, /turf/simulated/floor/tiled/white/monotile, /area/shuttle/research/xenobiolab) +"eVb" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "eVo" = ( /obj/effect/floor_decal/corner/red/border{ dir = 8 @@ -7010,13 +7084,11 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/civillian/hydroponics) "eYE" = ( -/obj/machinery/vending/tool{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/effect/floor_decal/corner/yellow, +/obj/machinery/constructable_frame/machine_frame, +/obj/effect/floor_decal/corner/grey, /turf/simulated/floor/tiled/techfloor, /area/intrepid/misc/maint/aft) "eZZ" = ( @@ -7245,7 +7317,8 @@ "fiH" = ( /obj/structure/table/standard, /obj/item/sticky_pad, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "fiR" = ( /obj/structure/lattice, @@ -7307,9 +7380,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/intrepid/misc/maint/aft) "flP" = ( -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/black{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "flW" = ( @@ -7439,7 +7518,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance, -/turf/simulated/floor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_grid, /area/intrepid/department/cargo/cargobay) "fpX" = ( /obj/effect/floor_decal/corner/research/bordercorner{ @@ -7462,6 +7542,10 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/research/hallway) +"fqx" = ( +/obj/effect/floor_decal/industrial/loadingarea_sharp/yellow, +/turf/simulated/floor/tiled/steel_ridged, +/area/intrepid/department/cargo/cargobay) "fqC" = ( /obj/machinery/light{ dir = 1 @@ -7605,6 +7689,18 @@ }, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/xo) +"fvL" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "fvN" = ( /obj/machinery/door/airlock/external/escapepod{ id_tag = "escape_pod_2_hatch"; @@ -7633,6 +7729,11 @@ /obj/effect/floor_decal/industrial/warning/fulltile, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/engineering/starboardthruster) +"fyb" = ( +/obj/structure/table/rack, +/obj/random_multi/single_item/boombox, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/cargo/cargostorage) "fzt" = ( /obj/structure/bed/chair{ dir = 4 @@ -7688,6 +7789,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue/border, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Reception Desk"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/treatment) "fAO" = ( @@ -8559,6 +8664,12 @@ }, /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/portside) +"gid" = ( +/obj/effect/floor_decal/spline/fancy/black{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "gim" = ( /obj/structure/cable/green{ d1 = 1; @@ -8759,15 +8870,8 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/rd) "gue" = ( -/obj/machinery/self_destruct, /obj/machinery/light/small/red, -/obj/machinery/camera/motion{ - c_tag = "Nuclear Cylinder - Hatch Portside"; - dir = 8; - network = list("Command") - }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/aft) "guu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8914,6 +9018,12 @@ /obj/structure/bed/chair/office/comfy, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/co) +"gzD" = ( +/obj/effect/floor_decal/corner/brown/mono, +/obj/structure/closet/secure_closet/deckofficer, +/obj/effect/floor_decal/industrial/bot/left/yellow, +/turf/simulated/floor/tiled/monotile, +/area/intrepid/department/cargo/cargobay) "gzV" = ( /obj/effect/floor_decal/spline/fancy/black{ dir = 10 @@ -9079,6 +9189,10 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/reinforced, /area/intrepid/department/engineering/assembly/chargebay) +"gFW" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/intrepid/department/cargo/cargobay) "gGG" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/blue/border{ @@ -9484,6 +9598,15 @@ /obj/machinery/light/dystopian, /turf/simulated/floor/tiled/monotile, /area/shuttle/research/xenofloralab) +"gWv" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/computer/guestpass{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/intrepid/misc/hallway/center) "gXM" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, /obj/structure/cable/orange{ @@ -9717,7 +9840,8 @@ /obj/machinery/computer/modular/preset/dock{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "hfn" = ( /turf/simulated/wall/r_wall/prepainted, @@ -9747,6 +9871,10 @@ /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "hgp" = ( +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9861,6 +9989,12 @@ }, /turf/simulated/floor/tiled/dark, /area/intrepid/department/security/wing) +"hiU" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "hjB" = ( /obj/effect/floor_decal/corner/blue{ dir = 1 @@ -10719,13 +10853,11 @@ /turf/simulated/floor, /area/intrepid/misc/maint/aft) "hSg" = ( -/obj/machinery/vending/engivend{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/corner/yellow{ +/obj/machinery/constructable_frame/machine_frame, +/obj/effect/floor_decal/corner/grey{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, @@ -10747,7 +10879,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/tiled/steel_grid, /area/intrepid/department/cargo/cargobay) "hUf" = ( /obj/structure/cable/green{ @@ -11088,6 +11220,20 @@ /obj/effect/floor_decal/corner/research/border, /turf/simulated/floor/tiled/white, /area/shuttle/research/xenobiolab) +"ife" = ( +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced, +/area/intrepid/department/cargo/cargobay) "ifi" = ( /obj/effect/catwalk_plated/dark, /obj/structure/disposalpipe/segment{ @@ -11138,6 +11284,9 @@ /obj/effect/floor_decal/corner/red{ dir = 4 }, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/starboard) "ihe" = ( @@ -11443,6 +11592,7 @@ name = "Atmospherics" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled/steel_ridged, /area/intrepid/department/engineering/atmos) "iuE" = ( @@ -12201,6 +12351,7 @@ dir = 4; pixel_x = 17 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "iWV" = ( @@ -12588,8 +12739,20 @@ /turf/simulated/floor, /area/intrepid/misc/maint/aft) "jqG" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/table/rack, +/obj/item/airalarm_electronics, +/obj/item/airalarm_electronics, +/obj/item/airalarm_electronics, +/obj/item/airlock_electronics, +/obj/item/airlock_electronics, +/obj/item/airlock_electronics, +/obj/item/firealarm_electronics, +/obj/item/firealarm_electronics, +/obj/item/firealarm_electronics, +/obj/item/tracker_electronics, +/obj/item/tracker_electronics, +/obj/item/tracker_electronics, +/obj/effect/floor_decal/industrial/box_corners/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/cargo/cargostorage) "jqH" = ( @@ -12695,12 +12858,12 @@ d2 = 10; icon_state = "1-10" }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 9 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "jwT" = ( @@ -12891,11 +13054,11 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/bridgeofficer) "jCB" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/bot/yellow, +/obj/machinery/constructable_frame/machine_frame, +/obj/effect/floor_decal/corner/brown/mono, +/obj/item/stack/cable_coil, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "jCR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13475,6 +13638,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "jYC" = ( @@ -13483,15 +13647,15 @@ /turf/simulated/floor/tiled/white/monotile, /area/shuttle/research/xenobiolab) "jYF" = ( -/obj/structure/closet/secure_closet/deckofficer, /obj/machinery/requests_console{ department = "Supply"; departmentType = 2; name = "Supply Requests Console"; pixel_y = -32 }, -/obj/effect/floor_decal/industrial/bot/left/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/machinery/photocopier, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "jZi" = ( /obj/structure/disposaloutlet, @@ -13596,6 +13760,17 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor, /area/intrepid/misc/maint/aft) +"keJ" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/intrepid/department/cargo/cargobay) "keT" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -13631,6 +13806,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "kgA" = ( @@ -13713,7 +13889,9 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "kiP" = ( /obj/effect/floor_decal/corner/green/full, @@ -13915,6 +14093,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/item/device/robotanalyzer, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/assembly/robotics) "krU" = ( @@ -14429,7 +14608,6 @@ /turf/simulated/floor/reinforced/phoron/fuel, /area/intrepid/department/engineering/portthruster) "kLs" = ( -/obj/item/airlock_brace, /obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/reinforced, /area/intrepid/misc/maint/starboard) @@ -15078,16 +15256,10 @@ /turf/simulated/floor/tiled/nullglass, /area/security/prison) "llt" = ( -/obj/structure/closet/crate, -/obj/item/stock_parts/smes_coil/super_io, -/obj/item/stock_parts/smes_coil/super_io, -/obj/item/stock_parts/smes_coil/super_capacity, -/obj/item/stock_parts/smes_coil/super_capacity, -/obj/item/stock_parts/smes_coil, -/obj/item/stock_parts/smes_coil, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/circuitboard/smes, -/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/cargo/cargostorage) "llv" = ( @@ -15543,17 +15715,9 @@ /turf/simulated/floor/tiled/monotile, /area/intrepid/misc/hallway/portside) "lwv" = ( -/obj/structure/table/rack, -/obj/item/stock_parts/keyboard, -/obj/item/stock_parts/keyboard, -/obj/item/stock_parts/keyboard, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/computer/tesla_link, -/obj/item/stock_parts/computer/tesla_link, -/obj/item/stock_parts/computer/tesla_link, -/turf/simulated/floor/tiled/monotile, +/obj/structure/table/standard, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "lwy" = ( /obj/structure/disposalpipe/segment, @@ -15690,9 +15854,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/intrepid/department/exploration/storage) "lAt" = ( -/obj/machinery/computer/shuttle_control/explore{ - dir = 1; - shuttle_tag = "Caduceus" +/obj/machinery/computer/shuttle_control/explore/ambulance_shuttle{ + dir = 1 }, /turf/simulated/floor/tiled/freezer, /area/shuttle/ambulance/home) @@ -15758,12 +15921,17 @@ /turf/simulated/floor/wood/walnut, /area/intrepid/department/medical/therapy) "lCn" = ( -/obj/structure/sign/warning/radioactive{ - dir = 4; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, /turf/simulated/floor, -/area/intrepid/misc/maint/starboard) +/area/intrepid/department/engineering/atmos) "lCT" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, /obj/structure/cable/orange{ @@ -15867,8 +16035,10 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/xo) "lIC" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/structure/closet/secure_closet/decktech, +/obj/effect/floor_decal/industrial/bot/right/yellow, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "lIZ" = ( /obj/effect/floor_decal/solarpanel, @@ -16216,12 +16386,15 @@ /turf/simulated/floor, /area/intrepid/misc/maint/portside) "lXK" = ( -/obj/structure/catwalk, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/department/engineering/atmos) "lXQ" = ( @@ -16628,11 +16801,10 @@ /turf/simulated/floor/tiled/freezer, /area/shuttle/ambulance/home) "mjm" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "mjO" = ( /obj/effect/floor_decal/corner/research/bordercorner{ @@ -16842,8 +17014,8 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/operatingroom) "mrB" = ( -/obj/machinery/computer/modular/preset/cardslot/supply{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/black{ + dir = 10 }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) @@ -17030,15 +17202,18 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/security/armory) "mwi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "mwJ" = ( @@ -17685,9 +17860,11 @@ }, /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/portside) -"mQn" = ( -/turf/simulated/floor/tiled/techfloor, -/area/intrepid/department/engineering/primarythruster) +"mQd" = ( +/obj/effect/paint_stripe/mauve, +/obj/machinery/computer/guestpass, +/turf/simulated/wall/prepainted, +/area/shuttle/research/hallway) "mQw" = ( /obj/machinery/light/small{ dir = 1 @@ -17847,14 +18024,12 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/security/locker) "mUl" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/spot{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "mVd" = ( /turf/simulated/wall/r_wall/prepainted, @@ -18054,6 +18229,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "mXM" = ( @@ -18173,10 +18349,6 @@ /turf/simulated/floor, /area/intrepid/misc/maint/portside) "neN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -18216,8 +18388,9 @@ /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "nfI" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "nfN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18631,6 +18804,18 @@ }, /turf/simulated/floor, /area/intrepid/misc/maint/internalportside) +"ntA" = ( +/obj/effect/floor_decal/spline/fancy/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "ntS" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/bot/yellow, @@ -18853,8 +19038,9 @@ /turf/simulated/floor/crystal, /area/intrepid/department/civillian/adherent) "nBA" = ( -/mob/living/exosuit/premade/powerloader/old, /obj/machinery/mech_recharger, +/mob/living/exosuit/premade/powerloader/old, +/obj/effect/floor_decal/corner/brown/mono, /turf/simulated/floor/reinforced, /area/intrepid/department/cargo/cargobay) "nCs" = ( @@ -18909,11 +19095,12 @@ /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "nEO" = ( -/obj/structure/table/rack, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 4 +/obj/structure/bed/chair/office, +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "nEQ" = ( /obj/effect/wallframe_spawn/reinforced, @@ -19050,18 +19237,20 @@ /turf/simulated/floor/airless, /area/space) "nJv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "nJz" = ( @@ -19116,8 +19305,7 @@ /area/intrepid/department/security/armory) "nKK" = ( /obj/machinery/door/airlock/highsecurity, -/obj/item/airlock_brace, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/portside) "nLp" = ( /obj/structure/table/standard, @@ -19131,6 +19319,13 @@ /obj/item/card/id/captains_spare, /turf/simulated/floor/carpet/blue, /area/intrepid/department/command/commandquarters/co) +"nMd" = ( +/obj/effect/floor_decal/spline/fancy/black{ + dir = 8 + }, +/obj/effect/floor_decal/corner_steel_grid, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "nMk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -19247,7 +19442,13 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, /area/intrepid/department/cargo/cargobay) "nRT" = ( /obj/structure/cable/green{ @@ -19409,14 +19610,9 @@ /turf/simulated/floor/tiled/monotile, /area/shuttle/research/xenofloralab) "nZi" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atm{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled, +/obj/structure/closet/crate, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "nZE" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ @@ -19432,10 +19628,8 @@ /turf/simulated/floor/tiled/white/monotile, /area/shuttle/research/xenobiolab) "oag" = ( -/obj/machinery/mining/brace{ - dir = 8 - }, /obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/ore_box, /turf/simulated/floor/tiled/techfloor/grid, /area/turbolift/intrepidcargo/lift) "oaI" = ( @@ -19545,7 +19739,11 @@ d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "oeL" = ( /obj/machinery/light/small, @@ -19707,8 +19905,10 @@ /turf/simulated/floor/tiled/freezer, /area/shuttle/ambulance/home) "ola" = ( -/obj/machinery/trade_beacon/receiving, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, /area/intrepid/department/cargo/cargobay) "olg" = ( /obj/effect/floor_decal/industrial/warning{ @@ -19911,6 +20111,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 + }, /turf/simulated/floor, /area/intrepid/department/engineering/atmos) "otn" = ( @@ -20092,7 +20295,7 @@ /obj/item/stack/material/phoron/ten, /obj/item/reagent_containers/glass/beaker/large, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - Chemistry"; + c_tag = "Medical - Reception Desk"; dir = 1 }, /obj/effect/floor_decal/corner/yellow/border, @@ -21003,6 +21206,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 + }, /turf/simulated/floor, /area/intrepid/department/engineering/atmos) "pdl" = ( @@ -21118,10 +21324,10 @@ /turf/simulated/floor/tiled, /area/intrepid/misc/hallway/starboard) "pif" = ( +/obj/effect/floor_decal/industrial/bot/yellow, /obj/machinery/mining/brace{ dir = 4 }, -/obj/effect/floor_decal/industrial/bot/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/turbolift/intrepidcargo/lift) "pij" = ( @@ -21163,15 +21369,6 @@ /turf/simulated/floor/airless, /area/space) "pjQ" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/power/apc{ dir = 1; pixel_y = 24 @@ -21180,7 +21377,8 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "plJ" = ( /obj/structure/cable/orange{ @@ -21491,7 +21689,6 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/cmo) "pAz" = ( -/obj/machinery/self_destruct, /obj/machinery/light/small/red{ dir = 1 }, @@ -21500,8 +21697,7 @@ dir = 4; network = list("Command") }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/aft) "pBu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -21822,6 +22018,7 @@ dir = 4; icon_state = "railing0-1" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "pJR" = ( @@ -23193,6 +23390,7 @@ dir = 8; pixel_x = 23 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "qDG" = ( @@ -23276,15 +23474,6 @@ /obj/structure/disposalpipe/segment/bent{ dir = 1 }, -/mob/living/simple_animal/familiar/pet/cat{ - desc = "A pitch black cat, a pet for the current Supply Chief!"; - dir = 8; - name = "Miranda" - }, -/obj/structure/dogbed{ - name = "catbed" - }, -/obj/item/toy/plushie/mouse, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -23455,21 +23644,16 @@ /turf/simulated/floor/carpet/brown, /area/intrepid/department/medical/therapy) "qMr" = ( -/obj/effect/shuttle_landmark/stardust/out, -/turf/space, -/area/space) +/obj/effect/floor_decal/industrial/loadingarea_sharp/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/intrepid/department/cargo/cargobay) "qMV" = ( -/obj/machinery/self_destruct, /obj/machinery/light/small/red{ dir = 8 }, -/obj/machinery/camera/motion{ - c_tag = "Nuclear Cylinder - Hatch Portside Fore"; - dir = 1; - network = list("Command") - }, -/obj/effect/floor_decal/industrial/delivery_sharp/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/portside) "qMW" = ( /obj/machinery/disposal, @@ -23725,7 +23909,8 @@ /obj/structure/table/standard, /obj/item/stamp/cargo, /obj/item/stamp/denied, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "qVN" = ( /obj/structure/table/standard, @@ -24071,11 +24256,13 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/civillian/hydroponics) "rjo" = ( -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/black{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "rkr" = ( /obj/machinery/drone_fabricator/intrepid/adv, @@ -24120,9 +24307,15 @@ /turf/simulated/floor, /area/intrepid/misc/maint/aft) "rma" = ( -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/box_corners/yellow, -/turf/simulated/floor/tiled/monotile, +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4; + icon_state = "stripe" + }, +/turf/simulated/floor/reinforced, /area/intrepid/department/cargo/cargobay) "rmu" = ( /turf/simulated/wall/ebony, @@ -24620,11 +24813,13 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/civillian/janitor) "rHX" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/camera/network/first_deck{ + c_tag = "Supply - Hangar"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/structure/closet/crate, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "rIb" = ( /obj/machinery/newscaster{ @@ -24980,12 +25175,9 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/civillian/galley) "rTd" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/corner_steel_grid{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "rTe" = ( @@ -25284,16 +25476,17 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/brigdoor/southleft, /obj/item/rig/industrial/equipped, /obj/item/gun/energy/plasmacutter, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/material, +/obj/machinery/door/window/brigdoor/southleft, /obj/effect/floor_decal/industrial/delivery_sharp/yellow, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/mono, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "sdT" = ( @@ -25456,17 +25649,24 @@ /turf/simulated/floor/tiled/white, /area/shuttle/research/hallway) "skG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/effect/floor_decal/spline/fancy/black/corner, +/obj/effect/floor_decal/spline/fancy/black/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "skQ" = ( @@ -26396,12 +26596,17 @@ /turf/simulated/floor/wood/walnut, /area/intrepid/department/civillian/mess) "sNN" = ( -/obj/machinery/papershredder, /obj/item/device/radio/intercom{ dir = 1; pixel_y = -30 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/box/yellow, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "sOh" = ( /obj/effect/floor_decal/corner/red{ @@ -27066,7 +27271,6 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/treatment) "tjE" = ( -/obj/item/airlock_brace, /obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/reinforced, /area/intrepid/misc/maint/aft) @@ -27271,8 +27475,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -27283,11 +27485,22 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "tqs" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "trm" = ( @@ -27338,6 +27551,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/stock_parts/circuitboard/teleporter, /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/department/command/teleporter) "tuk" = ( @@ -27421,14 +27635,9 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/security/wing) "twi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/spot{ dir = 4 }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 1 - }, /obj/machinery/alarm{ dir = 8; pixel_x = 23 @@ -27438,7 +27647,15 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "twN" = ( /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ @@ -27630,6 +27847,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "tEL" = ( @@ -27644,6 +27864,10 @@ /area/shuttle/research/xenofloralab) "tFd" = ( /obj/structure/bed/chair/office, +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -28116,13 +28340,10 @@ /turf/simulated/floor/tiled/white/monotile, /area/intrepid/misc/maint/aft) "tSf" = ( -/obj/structure/table/rack, -/obj/item/clothing/glasses/welding, -/obj/item/weldingtool, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 1 +/obj/structure/bed/chair{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "tSt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28288,8 +28509,15 @@ /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/assembly/robotics) "tXZ" = ( -/obj/structure/closet/crate, -/turf/simulated/floor/tiled/monotile, +/obj/structure/dogbed{ + name = "catbed" + }, +/mob/living/simple_animal/familiar/pet/cat{ + desc = "A pitch black cat, a pet for the current Supply Chief! It looks kind of brainless."; + dir = 8; + name = "Miranda" + }, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "tYb" = ( /turf/simulated/floor, @@ -28332,12 +28560,16 @@ /turf/simulated/floor/tiled/white, /area/intrepid/misc/hallway/portside) "tZi" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/railing/mapped{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced, /area/intrepid/department/cargo/cargobay) "uaj" = ( /obj/effect/floor_decal/corner/red{ @@ -28492,6 +28724,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/floor/tiled, /area/intrepid/department/engineering/atmos) "ufs" = ( @@ -28776,17 +29009,25 @@ /turf/simulated/floor/carpet/blue3, /area/intrepid/department/command/commandquarters/cmo) "uqS" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 9 - }, -/obj/structure/catwalk, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel, +/obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/department/engineering/atmos) +"uqY" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/intrepid/department/cargo/cargobay) "urT" = ( /obj/effect/floor_decal/corner/brown{ dir = 8 @@ -28962,6 +29203,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/primarythruster) "uvA" = ( @@ -29053,15 +29297,9 @@ /turf/simulated/floor/tiled/monotile, /area/shuttle/research/xenofloralab) "uyJ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/camera/network/first_deck{ - c_tag = "Supply - Hangar"; - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "uzc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29119,9 +29357,9 @@ /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/department/command/commandquarters/co) "uCN" = ( -/obj/structure/closet/secure_closet/decktech, -/obj/effect/floor_decal/industrial/bot/right/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/mono, +/obj/machinery/papershredder, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "uCO" = ( /obj/structure/cable/green{ @@ -29933,21 +30171,10 @@ /turf/simulated/floor, /area/intrepid/department/civillian/janitor) "vhJ" = ( -/obj/structure/table/rack, -/obj/item/airalarm_electronics, -/obj/item/airalarm_electronics, -/obj/item/airalarm_electronics, -/obj/item/airlock_electronics, -/obj/item/airlock_electronics, -/obj/item/airlock_electronics, -/obj/item/firealarm_electronics, -/obj/item/firealarm_electronics, -/obj/item/firealarm_electronics, -/obj/item/tracker_electronics, -/obj/item/tracker_electronics, -/obj/item/tracker_electronics, -/obj/effect/floor_decal/industrial/box_corners/yellow, -/turf/simulated/floor/tiled/monotile, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "viW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30072,6 +30299,10 @@ }, /turf/simulated/floor/tiled/white/monotile, /area/shuttle/research/xenobiolab) +"vnC" = ( +/obj/machinery/trade_beacon/receiving, +/turf/simulated/floor/reinforced, +/area/intrepid/department/cargo/cargobay) "voe" = ( /obj/effect/floor_decal/corner/red/border{ dir = 8 @@ -30133,19 +30364,10 @@ /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/command/commandquarters/squadleader) "vrc" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, +/obj/structure/table/standard, +/obj/item/device/scanner/price, +/obj/effect/floor_decal/corner/brown/mono, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "vrh" = ( /obj/structure/table/standard, @@ -30255,26 +30477,23 @@ /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "vuf" = ( -/obj/structure/table/rack, -/obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/manipulator, -/obj/item/stock_parts/manipulator, -/obj/item/stock_parts/manipulator, -/obj/item/stock_parts/capacitor, -/obj/item/stock_parts/capacitor, -/obj/item/stock_parts/capacitor, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "vuF" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -30449,7 +30668,9 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "vze" = ( /obj/effect/floor_decal/corner/purple{ @@ -30507,14 +30728,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/reinforced, /area/intrepid/department/cargo/cargobay) "vBk" = ( /obj/structure/cable/green{ @@ -30703,12 +30920,12 @@ /turf/simulated/floor/tiled/white, /area/shuttle/research/xenobiolab) "vIy" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/spline/fancy/black{ dir = 8 }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "vIF" = ( @@ -30982,6 +31199,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/starboardthruster) +"vOH" = ( +/obj/effect/paint/silver, +/obj/machinery/computer/guestpass, +/turf/simulated/wall/prepainted, +/area/intrepid/department/medical/treatment) "vOK" = ( /obj/machinery/disposal, /obj/effect/floor_decal/industrial/outline/yellow, @@ -30998,15 +31220,13 @@ "vQu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_ridged, /area/intrepid/department/cargo/cargobay) "vQH" = ( /obj/structure/table/standard, @@ -31203,7 +31423,13 @@ /turf/simulated/floor/carpet/brown, /area/crew_quarters/sleep/bunk) "vZD" = ( -/turf/simulated/floor, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 8 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "vZU" = ( /obj/structure/disposalpipe/segment, @@ -31357,7 +31583,19 @@ /obj/machinery/light/spot{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/black, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor, /area/intrepid/department/cargo/cargobay) "wgr" = ( /obj/structure/cable/green{ @@ -31698,8 +31936,7 @@ /area/intrepid/misc/hallway/portside) "wuw" = ( /obj/machinery/door/airlock/highsecurity, -/obj/item/airlock_brace, -/turf/simulated/floor/reinforced, +/turf/simulated/floor, /area/intrepid/misc/maint/aft) "wuB" = ( /obj/machinery/computer/modular/preset/security{ @@ -31983,11 +32220,8 @@ /turf/simulated/floor, /area/intrepid/misc/maint/internalportside) "wGD" = ( -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/box_corners/yellow{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, +/obj/item/toy/plushie/mouse, +/turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) "wGX" = ( /obj/effect/paint/sun, @@ -32074,6 +32308,15 @@ }, /turf/simulated/floor/carpet/orange, /area/intrepid/department/command/commandquarters/ce) +"wJr" = ( +/obj/effect/floor_decal/spline/fancy/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "wJt" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor{ @@ -32202,12 +32445,6 @@ /turf/simulated/floor/tiled, /area/intrepid/misc/hallway/portside) "wLH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -32509,6 +32746,15 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/research/xenoarchlab) +"wWA" = ( +/obj/effect/floor_decal/corner/green{ + dir = 4 + }, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/intrepid/misc/hallway/starboard) "wWY" = ( /obj/machinery/door/firedoor{ dir = 4 @@ -32730,11 +32976,13 @@ /turf/simulated/floor, /area/intrepid/department/medical/treatment) "xeu" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atm{ + pixel_x = -32 }, -/turf/simulated/floor/tiled, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/brown/mono, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled/monotile, /area/intrepid/department/cargo/cargobay) "xeR" = ( /obj/machinery/door/firedoor, @@ -33315,14 +33563,12 @@ /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "xup" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 }, -/obj/machinery/light/spot{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled, /area/intrepid/department/cargo/cargobay) @@ -33373,6 +33619,19 @@ /obj/structure/stairs/south, /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/treatment) +"xwa" = ( +/obj/effect/floor_decal/spline/fancy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/intrepid/department/cargo/cargobay) "xwe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -46305,7 +46564,7 @@ cpl rsa rsa rsa -lCn +rsa rsa uHa uHa @@ -48131,7 +48390,7 @@ vGe wVK wVK wVK -lXj +wWA oWx myX oTl @@ -50248,7 +50507,7 @@ cjD cjD cjD cjD -qMr +cjD cjD cjD cjD @@ -52825,7 +53084,7 @@ uUj cLI lwf srm -uUj +mQd wCC khB bNg @@ -54789,10 +55048,10 @@ xeu uyJ mUl rHX -rHX nZi -xup -tZi +nZi +mUl +uyJ cFz sOj snP @@ -54988,13 +55247,13 @@ dTB pKO sOj mjm -vZD -vZD +gid +nMd vZD vZD vZD vIy -hgp +mrB fiH sVM smv @@ -55190,13 +55449,13 @@ btm eBc sOj lIC -vZD -vZD -vZD -vZD -vZD +rjo +xup +tZi +vBd +uqY bMa -tFd +nEO heW sVM smv @@ -55391,13 +55650,13 @@ cpl cpl eBc sOj -lIC -vZD -vZD +vrc +wJr +qMr ola -vZD -vZD -bMa +vnC +gFW +fqx anQ qVF sVM @@ -55593,15 +55852,15 @@ kKr cpl jtX sOj -lIC -vZD -vZD -vZD -vZD -vZD -bMa +gzD +ntA +fvL +ife +rma +keJ +aSx tFd -mrB +heW sVM smv aQC @@ -55796,11 +56055,11 @@ cpl opB sOj jCB -vZD -vZD -vZD -vZD -vZD +flP +hiU +eVb +cDb +eVb rTd hgp afX @@ -56002,8 +56261,8 @@ nJv neN neN beG -vBd -vrc +neN +neN mwi nfI sVM @@ -56200,13 +56459,13 @@ cpl mCt sOj nBA -cDb +flP +tSf tSf -vuf -wLH cDD +tVk wGD -wLH +vuf sNN sOj vdv @@ -56221,7 +56480,7 @@ sBz dnj dnj cML -xwe +eNu dLV stl uoT @@ -56243,7 +56502,7 @@ fpc jic jRD dLV -sBz +gWv cML wjY rJU @@ -56407,7 +56666,7 @@ azz lwv wLH tXZ -tXZ +tVk skG nRf hTN @@ -56605,12 +56864,12 @@ mXl sOj sdI flP -nEO +vhJ vhJ wLH -rjo -rma tVk +tVk +xwa uCN sOj uaj @@ -57068,7 +57327,7 @@ pNw fDx oJO inQ -bcY +vOH ncK nVv wXE @@ -57414,10 +57673,10 @@ eRv wKy ccy pif -cAI +pif iee aWq -dyj +aHr otn jWP eRv @@ -57618,7 +57877,7 @@ eDz lop cAI umU -aWq +fyb dyj otn wKG @@ -62090,7 +62349,7 @@ qLO rGG qma qkQ -bWI +lCn qkQ awW rGG @@ -62494,7 +62753,7 @@ mDn rGG xcs qkQ -lXK +eTI qkQ qla rGG @@ -62516,7 +62775,7 @@ cql dtE sPq rJE -tbV +eAZ yfM xfk vaq @@ -63093,7 +63352,7 @@ maP rkF qzA tFq -mQn +lFW pJm iuw iVp @@ -63107,7 +63366,7 @@ uff iVp iuw pJm -mQn +iPx uIc ioC dWc @@ -64297,7 +64556,7 @@ tNm aTL tYb qng -tjE +wuw qng wws cjD @@ -64327,7 +64586,7 @@ cjD cjD wws qng -tjE +wuw qng tYb dVD @@ -64499,7 +64758,7 @@ azP dVD tYb qng -eTI +ejB qng wws cjD diff --git a/maps/intrepid/intrepid2.dmm b/maps/intrepid/intrepid2.dmm index 08a19c8dc66..8998c5b4c1b 100644 --- a/maps/intrepid/intrepid2.dmm +++ b/maps/intrepid/intrepid2.dmm @@ -167,7 +167,7 @@ /obj/effect/floor_decal/industrial/radiation/corner{ dir = 1 }, -/obj/structure/table/standard, +/obj/structure/dispenser/phoron, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/engine_room) "ax" = ( @@ -230,10 +230,6 @@ /area/intrepid/department/security/firing_range) "aF" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/suit_storage_unit/mining/alt{ - req_access = list() - }, -/obj/effect/floor_decal/industrial/delivery_sharp/yellow, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) "aJ" = ( @@ -283,6 +279,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/pandora/cockpit) +"aP" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/upper/starboard) "aQ" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, @@ -749,6 +749,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat) +"bT" = ( +/obj/machinery/computer/cryopod/robot{ + pixel_y = 32 + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "bU" = ( /obj/machinery/door/blast/regular/open{ dir = 4; @@ -1259,6 +1272,10 @@ /obj/item/cell/high, /turf/simulated/floor/tiled/techmaint, /area/shuttle/pandora/cockpit) +"di" = ( +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/upper/starboard) "dj" = ( /obj/effect/wingrille_spawn/reinforced/full, /obj/machinery/door/blast/regular{ @@ -1437,8 +1454,7 @@ dir = 8; pixel_x = -17 }, -/obj/effect/floor_decal/industrial/bot/yellow, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) "dG" = ( /obj/structure/table/standard, @@ -1784,6 +1800,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/civillian/dockbayfour) +"eE" = ( +/obj/effect/wallframe_spawn/reinforced, +/obj/effect/paint_stripe/brown, +/turf/simulated/floor, +/area/intrepid/department/exploration/hangar/pithos) "eF" = ( /obj/machinery/body_scanconsole{ dir = 4 @@ -2268,6 +2289,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/computer/guestpass{ + pixel_x = 32 + }, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) "fL" = ( @@ -2527,7 +2551,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "gq" = ( @@ -2939,6 +2963,12 @@ }, /turf/simulated/floor, /area/intrepid/misc/maint/upper/portside) +"hm" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/upper/starboard) "hn" = ( /obj/effect/floor_decal/industrial/outline, /obj/machinery/suit_storage_unit/medical, @@ -3072,9 +3102,7 @@ /obj/machinery/computer/cryopod/robot{ pixel_x = 32 }, -/turf/simulated/floor/tiled/techfloor{ - initial_gas = null - }, +/turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/command/AI/AIFoyer) "hC" = ( /obj/structure/sign/terragov, @@ -3244,6 +3272,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"hS" = ( +/obj/machinery/door/airlock/multi_tile/glass/research{ + name = "Robotics Control" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/command/robocontrol) "hT" = ( /obj/effect/wallframe_spawn/reinforced_phoron/hull, /turf/simulated/floor, @@ -3337,6 +3377,7 @@ /area/intrepid/misc/maint/upper/central) "id" = ( /obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/closet/crate/solar_assembly, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "ie" = ( @@ -3574,7 +3615,6 @@ /turf/simulated/open, /area/intrepid/misc/hallway/portside) "iO" = ( -/obj/machinery/computer/modular, /turf/simulated/floor/tiled/techfloor/grid{ initial_gas = null }, @@ -3625,6 +3665,14 @@ }, /turf/simulated/floor, /area/intrepid/department/engineering/bluespacedrive) +"iU" = ( +/obj/machinery/door/blast/shutters/open{ + dir = 2; + icon_state = "shutter0"; + id_tag = "medshutter" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/command/robocontrol) "iW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -3662,6 +3710,15 @@ /obj/effect/paint_stripe/blue, /turf/simulated/wall/r_wall/prepainted, /area/tcommsat) +"ja" = ( +/obj/effect/floor_decal/industrial/box/arrows/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/misc/maint/upper/starboard) "jf" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -4147,14 +4204,10 @@ /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) "kj" = ( -/obj/machinery/button/blast_door{ - id_tag = "supplyhangarmaintshaft2"; - name = "Hangar Superstructure Maintaince Shaft Blast Door button"; - req_access = list("ACCESS_CONSTRUCTION") - }, -/obj/effect/paint_stripe/brown, -/turf/simulated/wall/prepainted, -/area/intrepid/department/exploration/hangar/pithos) +/obj/effect/wallframe_spawn/reinforced, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/intrepid/department/command/robocontrol) "kk" = ( /obj/machinery/computer/power_monitor{ dir = 1 @@ -4319,15 +4372,12 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/computer/modular/preset/aislot/sysadmin{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/delivery_sharp/yellow, /obj/machinery/camera/motion{ c_tag = "AI Chamber - Core Antechamber"; dir = 1; network = list("Command") }, +/obj/structure/table/reinforced, /turf/simulated/floor/bluegrid/airless, /area/intrepid/department/command/AI/AIFoyer) "kK" = ( @@ -4639,6 +4689,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/lounge) +"lu" = ( +/obj/machinery/power/smes/batteryrack, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "lv" = ( /obj/structure/cable/green{ d1 = 1; @@ -5172,8 +5229,8 @@ /turf/simulated/wall/r_titanium, /area/shuttle/pandora/cargo) "mx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/industrial/bot/yellow, +/obj/machinery/floodlight, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "my" = ( @@ -5710,6 +5767,16 @@ /obj/structure/sign/terragov, /turf/simulated/wall/r_wall/hull, /area/intrepid/department/civillian/dockbayfour) +"nM" = ( +/obj/machinery/recharge_station, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/command/robocontrol) +"nN" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/intrepid/department/command/robocontrol) "nP" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -5806,6 +5873,20 @@ initial_gas = null }, /area/intrepid/department/command/AI/AIFoyer) +"ob" = ( +/obj/structure/railing/mapped, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 9; + icon_state = "4-9" + }, +/turf/simulated/floor, +/area/intrepid/misc/maint/upper/central) "oc" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Upper Starboard Fuel Nacelle Access Shaft"; @@ -5813,6 +5894,14 @@ }, /turf/simulated/floor/shuttle/black, /area/intrepid/department/engineering/starboardthruster) +"od" = ( +/obj/machinery/recharge_station, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/command/robocontrol) "oe" = ( /obj/machinery/door/firedoor, /obj/effect/wallframe_spawn/reinforced, @@ -5913,6 +6002,24 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) +"ov" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 8; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/flora/pottedplant/minitree{ + pixel_y = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/command/robocontrol) "ow" = ( /obj/structure/cable/green{ d1 = 1; @@ -6196,6 +6303,11 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/starboardthruster) +"pg" = ( +/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/cargo/cargostorage) "pi" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/cable/orange{ @@ -7133,6 +7245,12 @@ /obj/item/ammo_magazine/smg_top/practice, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/security/firing_range) +"rt" = ( +/obj/machinery/computer/robotics{ + dir = 8 + }, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "ru" = ( /obj/machinery/light{ dir = 4 @@ -7211,6 +7329,14 @@ }, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"rC" = ( +/obj/structure/table/standard, +/obj/item/storage/toolbox/electrical, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "rD" = ( /obj/effect/floor_decal/solarpanel, /obj/structure/cable{ @@ -7336,8 +7462,8 @@ /turf/simulated/floor, /area/intrepid/misc/maint/upper/starboard) "rS" = ( -/obj/machinery/the_singularitygen, /obj/effect/floor_decal/industrial/delivery_sharp/red, +/obj/machinery/the_singularitygen, /turf/simulated/floor/reinforced, /area/intrepid/department/engineering/engine_room) "rU" = ( @@ -7357,7 +7483,7 @@ name = "Supply Warehouse Shutters button"; pixel_x = 25 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "rW" = ( /obj/effect/floor_decal/spline/fancy/black{ @@ -7493,11 +7619,14 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/morgue) "sk" = ( -/obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 1; pixel_y = -24 }, +/obj/machinery/computer/rdservercontrol{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/delivery_sharp/yellow, /turf/simulated/floor/bluegrid/airless, /area/intrepid/department/command/AI/AIFoyer) "sl" = ( @@ -7641,7 +7770,7 @@ pixel_y = 32 }, /obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "sB" = ( /obj/structure/cable/orange{ @@ -7767,6 +7896,10 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"sO" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/command/robocontrol) "sP" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible/fuel{ @@ -8384,7 +8517,12 @@ /turf/simulated/floor/tiled/white/monotile, /area/intrepid/department/civillian/safe_room/starboard) "ui" = ( -/obj/structure/dispenser/phoron, +/obj/structure/largecrate, +/obj/item/stack/material/plasteel/ten, +/obj/item/stack/material/phoron/ten, +/obj/item/stack/material/ocp/ten, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/glass/fifty, /turf/simulated/floor, /area/intrepid/department/engineering/engine_room) "uj" = ( @@ -8588,6 +8726,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/civillian/dockbayone) +"uL" = ( +/obj/effect/wallframe_spawn/reinforced, +/turf/simulated/floor, +/area/intrepid/misc/maint/upper/starboard) "uM" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/handrail{ @@ -8712,10 +8854,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/suit_storage_unit/mining/alt{ - req_access = list() - }, -/obj/effect/floor_decal/industrial/delivery_sharp/yellow, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) "vc" = ( @@ -9216,7 +9354,9 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Bluespace Drive Access" + name = "Bluespace Drive Access"; + req_access = list("ACCESS_ENGINE_EQUIP"); + autoset_access = 0 }, /obj/structure/cable/green{ d1 = 4; @@ -9241,8 +9381,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/bot/yellow, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) "wi" = ( /obj/structure/closet/radiation, @@ -9441,10 +9580,26 @@ "wD" = ( /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/security/portdockingbaysecurity) +"wE" = ( +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 23 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/camera/network/command{ + c_tag = "Command - Robotics Control" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "wF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/engineering{ - name = "Engineering Lounge" + name = "Engineering Lounge"; + autoset_access = 0; + req_access = list("ACCESS_ENGINE_EQUIP") }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9648,6 +9803,13 @@ "xc" = ( /turf/simulated/wall/r_wall/hull, /area/intrepid/department/civillian/safe_room/starboard) +"xd" = ( +/obj/machinery/cryopod/robot, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "xe" = ( /obj/machinery/alarm{ dir = 8; @@ -9903,6 +10065,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/civillian/dockbayfour) +"xN" = ( +/obj/machinery/cryopod/robot, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/machinery/camera/network/command{ + c_tag = "Command - Robotics Control Storage" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "xP" = ( /obj/effect/landmark/map_data{ height = 2 @@ -9929,6 +10101,24 @@ }, /turf/simulated/floor/tiled/monotile, /area/intrepid/department/civillian/dockbayfour) +"xS" = ( +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 8; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped, +/obj/structure/flora/pottedplant/minitree{ + pixel_y = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/department/command/robocontrol) "xT" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -10559,7 +10749,7 @@ dir = 4 }, /obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "zy" = ( /obj/structure/table/standard, @@ -10639,7 +10829,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Engineering Equipment" + name = "Engineering Equipment"; + req_access = list("ACCESS_ENGINE_EQUIP"); + autoset_access = 0 }, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/engineering/lockerroom) @@ -10693,6 +10885,14 @@ /obj/effect/floor_decal/industrial/bot/yellow, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/engine_room/aux) +"zO" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/bot/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/misc/maint/upper/starboard) "zQ" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -10914,6 +11114,9 @@ /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white/monotile, /area/intrepid/department/security/detectives_office) +"Ar" = ( +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "As" = ( /obj/structure/cable{ d1 = 2; @@ -11072,6 +11275,15 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"AK" = ( +/obj/machinery/button/blast_door{ + pixel_y = -22; + dir = 1; + id_tag = "cargoexport"; + name = "Cargo Exports Beacon access button" + }, +/turf/simulated/floor, +/area/intrepid/misc/maint/upper/starboard) "AL" = ( /obj/machinery/button/blast_door{ id_tag = "supplyhangarmaintshaftsouth"; @@ -11268,7 +11480,7 @@ "Bh" = ( /obj/structure/table/standard, /obj/item/hand_labeler, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "Bi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11327,6 +11539,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/intrepid/department/civillian/archive) +"Bp" = ( +/obj/machinery/button/blast_door{ + id_tag = "robocontrol"; + name = "Robotics Control Storage Room button" + }, +/turf/simulated/wall/prepainted, +/area/intrepid/department/command/robocontrol) "Bq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4; @@ -11412,6 +11631,10 @@ }, /turf/simulated/floor, /area/intrepid/misc/maint/upper/portside) +"Bw" = ( +/obj/structure/table/standard, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "Bx" = ( /obj/structure/cable/orange{ d1 = 1; @@ -11902,7 +12125,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Lounge" + name = "Engineering Lounge"; + autoset_access = 0; + req_access = list("ACCESS_ENGINE_EQUIP") }, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/engineering/monitoring) @@ -12165,6 +12390,10 @@ /obj/machinery/meter, /turf/simulated/floor, /area/intrepid/department/engineering/portthruster) +"Dj" = ( +/obj/machinery/trade_beacon/sending, +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "Dk" = ( /obj/effect/floor_decal/corner/white/mono, /obj/machinery/atmospherics/binary/pump/high_power{ @@ -12340,6 +12569,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/item/airlock_brace{ + req_access = list("ACCESS_VAULT") + }, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/selfdestruct) "DM" = ( @@ -12391,7 +12623,7 @@ /area/intrepid/department/command/AI/AICore) "DS" = ( /obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "DT" = ( /obj/effect/paint/red, @@ -12524,6 +12756,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/engineering/engine_room) +"Ei" = ( +/obj/structure/closet/crate/plastic, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/bot/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/misc/maint/upper/starboard) "Ej" = ( /obj/effect/floor_decal/industrial/radiation{ dir = 1 @@ -12915,6 +13155,9 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"Fm" = ( +/turf/simulated/wall/prepainted, +/area/intrepid/department/command/robocontrol) "Fo" = ( /obj/effect/wallframe_spawn/reinforced/hull, /obj/machinery/door/firedoor, @@ -12933,6 +13176,14 @@ initial_gas = null }, /area/intrepid/department/command/AI/AIFoyer) +"Fq" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "Fr" = ( /obj/structure/cable/green{ d1 = 1; @@ -13055,6 +13306,8 @@ dir = 8; pixel_x = 37 }, +/obj/machinery/self_destruct, +/obj/effect/floor_decal/industrial/delivery_sharp/red, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/selfdestruct) "FF" = ( @@ -13155,6 +13408,13 @@ initial_gas = null }, /area/intrepid/department/command/AI/AIFoyer) +"FR" = ( +/obj/machinery/power/emitter{ + dir = 1 + }, +/obj/machinery/light/small/yellowish, +/turf/simulated/floor, +/area/intrepid/department/engineering/engine_room) "FT" = ( /turf/simulated/floor/tiled/techfloor, /area/intrepid/misc/maint/superstructure) @@ -13838,8 +14098,7 @@ dir = 4; pixel_x = -23 }, -/obj/effect/floor_decal/industrial/bot/yellow, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/intrepid/department/cargo/cargostorage) "HG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14212,6 +14471,19 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/engineering/engine_room/aux) +"ID" = ( +/obj/structure/table/standard, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/obj/item/cell/standard, +/obj/item/cell/standard{ + pixel_y = 9; + pixel_x = -3 + }, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "IF" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15139,6 +15411,11 @@ /obj/machinery/door/airlock/glass/security, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/security/firing_range) +"La" = ( +/obj/effect/floor_decal/industrial/bot/yellow, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/cargo/cargostorage) "Lb" = ( /obj/structure/girder, /turf/simulated/floor/reinforced, @@ -15249,6 +15526,12 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"Lp" = ( +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "Lq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -15634,6 +15917,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/starboardthruster) +"Mo" = ( +/obj/effect/floor_decal/industrial/box_corners/yellow, +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "Mq" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -15689,6 +15976,14 @@ /obj/machinery/newscaster, /turf/simulated/wall/r_wall/prepainted, /area/intrepid/department/civillian/dockbayfive) +"Mz" = ( +/obj/structure/closet/crate, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/bot/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/misc/maint/upper/starboard) "MA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15898,12 +16193,15 @@ /turf/simulated/floor/tiled/white/monotile, /area/intrepid/department/security/detectives_office) "MX" = ( -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/box/yellow, /obj/machinery/light, -/turf/simulated/floor/tiled/techfloor{ - initial_gas = null +/obj/machinery/drone_fabricator/intrepid, +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 8 }, +/turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/command/AI/AIFoyer) "MZ" = ( /obj/machinery/door/blast/regular/open{ @@ -16293,7 +16591,7 @@ "NP" = ( /obj/structure/table/standard, /obj/item/stack/package_wrap/twenty_five, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/intrepid/department/cargo/cargostorage) "NQ" = ( /obj/structure/cable/orange{ @@ -16423,13 +16721,12 @@ /turf/simulated/floor/tiled/monotile, /area/intrepid/department/civillian/dockbaysix) "Oh" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id_tag = "supplyhangarmaintshaft2"; - name = "Supply Hangar Superstructure Maintaince Shaft Blast Door" +/obj/effect/wallframe_spawn/reinforced, +/obj/machinery/door/firedoor{ + dir = 4 }, /turf/simulated/floor, -/area/intrepid/department/exploration/hangar/pithos) +/area/intrepid/department/command/robocontrol) "Oi" = ( /obj/structure/cable/orange{ d1 = 1; @@ -16474,6 +16771,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) +"Ol" = ( +/obj/effect/floor_decal/industrial/box/arrows/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/black{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/misc/maint/upper/starboard) "Om" = ( /obj/effect/floor_decal/corner/brown/half, /obj/machinery/light, @@ -16603,6 +16912,13 @@ "Ox" = ( /turf/simulated/wall/r_wall/prepainted, /area/intrepid/department/engineering/portthruster) +"Oy" = ( +/obj/machinery/suit_storage_unit/mining/alt{ + req_access = list() + }, +/obj/effect/floor_decal/industrial/delivery_sharp/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/cargo/cargostorage) "Oz" = ( /obj/effect/floor_decal/spline/fancy/black{ dir = 4 @@ -16720,6 +17036,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/pandora/cockpit) +"OM" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "OO" = ( /obj/structure/bed/chair{ dir = 4 @@ -16730,12 +17054,13 @@ /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/civillian/dockbayfour) "OP" = ( -/obj/machinery/door/airlock/highsecurity/bolted, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/airlock/highsecurity, +/obj/effect/mapping_helpers/airlock/locked, /turf/simulated/floor/tiled/techfloor/grid{ initial_gas = null }, @@ -16791,7 +17116,9 @@ icon_state = "6-10" }, /obj/machinery/door/airlock/glass/engineering{ - name = "Shield Control Access" + name = "Shield Control Access"; + req_access = list("ACCESS_ENGINE_EQUIP"); + autoset_access = 0 }, /turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/engineering/shieldcontrol) @@ -16832,6 +17159,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/civillian/dockbayfour) +"Pd" = ( +/obj/structure/table/standard, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/clothing/head/cardborg, +/turf/simulated/floor/bluegrid, +/area/intrepid/department/command/robocontrol) "Pe" = ( /obj/machinery/door/airlock/multi_tile/glass/research{ name = "Archive" @@ -17312,7 +17645,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/table/standard, +/obj/structure/dispenser/phoron, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/engine_room) "Qm" = ( @@ -17461,6 +17794,11 @@ dir = 1 }, /obj/structure/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) "QE" = ( @@ -17487,6 +17825,13 @@ }, /turf/simulated/floor, /area/shuttle/pithos/cockpit) +"QH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/upper/starboard) "QI" = ( /obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/light/small{ @@ -17511,7 +17856,9 @@ /area/space) "QM" = ( /obj/effect/paint_stripe/blue, -/obj/machinery/turretid/lethal, +/obj/machinery/turretid/lethal{ + req_access = list("ACCESS_VAULT") + }, /turf/simulated/wall/r_wall/prepainted, /area/intrepid/department/command/selfdestruct) "QO" = ( @@ -18726,16 +19073,16 @@ /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/security/portdockingbaysecurity) "TF" = ( -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/box/yellow, /obj/machinery/power/apc/high{ dir = 4; pixel_x = 23 }, /obj/structure/cable/orange, -/turf/simulated/floor/tiled/techfloor{ - initial_gas = null +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 4 }, +/obj/effect/floor_decal/industrial/box_corners/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/intrepid/department/command/AI/AIFoyer) "TG" = ( /obj/machinery/vending/wallmed1{ @@ -19013,6 +19360,15 @@ }, /turf/simulated/floor/reinforced, /area/intrepid/department/command/selfdestruct) +"Uv" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/command/robocontrol) "Uw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -19175,15 +19531,11 @@ /turf/simulated/floor/tiled/white/monotile, /area/intrepid/department/medical/morgue) "UP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 8 }, -/obj/effect/floor_decal/industrial/bot/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/intrepid/department/cargo/cargostorage) +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "US" = ( /obj/structure/cable/orange{ d1 = 2; @@ -19607,6 +19959,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/intrepid/department/engineering/engine_room) +"VN" = ( +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/command/robocontrol) "VO" = ( /obj/structure/catwalk, /obj/structure/table/steel, @@ -19658,6 +20013,14 @@ }, /turf/simulated/floor/tiled/white, /area/intrepid/department/security/detectives_office) +"VT" = ( +/obj/machinery/door/blast/shutters/open{ + dir = 2; + icon_state = "shutter0"; + id_tag = "robocontrol" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/department/command/robocontrol) "VU" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/industrial/bot/right/yellow, @@ -19877,16 +20240,18 @@ /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) "Wx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/button/blast_door{ + dir = 8; + pixel_x = 22; + id_tag = "cargoexport"; + name = "Cargo Exports Beacon access button" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/computer/modular/preset/cardslot/supply{ + dir = 8 }, -/obj/machinery/trade_beacon/sending, -/obj/effect/floor_decal/industrial/bot/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/intrepid/department/cargo/cargostorage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/upper/starboard) "Wy" = ( /obj/machinery/door/blast/regular/open{ icon_state = "pdoor0"; @@ -20117,6 +20482,8 @@ c_tag = "Command - Self Destruct Entrance"; network = list("Command") }, +/obj/machinery/self_destruct, +/obj/effect/floor_decal/industrial/delivery_sharp/red, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/selfdestruct) "Xa" = ( @@ -20348,6 +20715,8 @@ /turf/simulated/floor/tiled, /area/intrepid/department/civillian/safe_room/starboard) "XD" = ( +/obj/machinery/self_destruct, +/obj/effect/floor_decal/industrial/delivery_sharp/red, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/selfdestruct) "XE" = ( @@ -20460,6 +20829,26 @@ }, /turf/simulated/floor/tiled/dark, /area/intrepid/department/exploration/hangar/pithos) +"XR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 6; + icon_state = "1-6" + }, +/turf/simulated/floor, +/area/intrepid/misc/maint/upper/central) "XS" = ( /obj/structure/railing/mapped{ dir = 1; @@ -20634,13 +21023,13 @@ /turf/simulated/floor, /area/intrepid/misc/maint/upper/central) "Ym" = ( -/obj/machinery/button/blast_door{ - id_tag = "topdeckmaintshaft"; - name = "Top Deck Superstructure Maintaince Shaft Blast Door button"; - req_access = list("ACCESS_CONSTRUCTION") +/obj/machinery/door/blast/shutters/open{ + dir = 2; + icon_state = "shutter0"; + id_tag = "cargoexport" }, -/turf/simulated/wall/prepainted, -/area/intrepid/misc/maint/superstructure) +/turf/simulated/floor/tiled/techfloor, +/area/intrepid/misc/maint/upper/starboard) "Yo" = ( /obj/effect/shuttle_landmark/lift/port_top, /obj/machinery/computer/shuttle_control/lift/port{ @@ -20740,12 +21129,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/eva) "YA" = ( -/obj/machinery/door/blast/regular{ - id_tag = "topdeckmaintshaft"; - name = "Top Deck Superstructure Maintaince Shaft Blast Door" - }, -/turf/simulated/floor, -/area/intrepid/misc/maint/superstructure) +/obj/structure/closet/crate, +/obj/item/stock_parts/smes_coil/super_io, +/obj/item/stock_parts/smes_coil/super_io, +/obj/item/stock_parts/smes_coil/super_capacity, +/obj/item/stock_parts/smes_coil/super_capacity, +/obj/item/stock_parts/smes_coil, +/obj/item/stock_parts/smes_coil, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/circuitboard/smes, +/obj/effect/floor_decal/industrial/bot/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/intrepid/department/cargo/cargostorage) "YB" = ( /turf/simulated/wall/r_wall/hull, /area/intrepid/department/medical/morgue) @@ -20919,11 +21314,14 @@ /turf/simulated/floor/reinforced, /area/intrepid/department/command/AI/AIFoyer) "YW" = ( -/obj/structure/table/reinforced, /obj/item/device/radio/intercom/locked/ai_private{ dir = 1; pixel_y = -24 }, +/obj/machinery/computer/modular/preset/aislot/sysadmin{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/delivery_sharp/yellow, /turf/simulated/floor/bluegrid/airless, /area/intrepid/department/command/AI/AIFoyer) "YX" = ( @@ -21167,7 +21565,8 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/engineering{ - name = "Engineering Auxiliary Storage" + name = "Engineering Auxiliary Storage"; + req_access = list("ACCESS_ENGINE_EQUIP") }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21258,6 +21657,12 @@ }, /turf/simulated/floor/tiled/white/monotile, /area/intrepid/department/civillian/safe_room/port) +"ZH" = ( +/obj/effect/floor_decal/industrial/box_corners/yellow{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/intrepid/misc/maint/upper/starboard) "ZI" = ( /obj/effect/wallframe_spawn/reinforced, /turf/simulated/floor, @@ -36893,7 +37298,7 @@ me fI Au Gh -oQ +FR ZT qT Cr @@ -37701,7 +38106,7 @@ Oz eS Au Gh -oQ +FR ZT qT Cr @@ -42903,11 +43308,11 @@ XD te XD vS -tV -Nx -Nx -Nx -Nx +nN +Fm +Fm +Fm +Fm tQ Pj jQ @@ -43105,11 +43510,11 @@ Pb Mg WF vS -tV -ml -ml -ml -Nx +nN +lu +ID +Pd +kj lX lm rZ @@ -43307,11 +43712,11 @@ XD Zl XD vS -tV -ml -ml -ml -Nx +nN +bT +OM +OM +hS QC Pj GT @@ -43509,12 +43914,12 @@ Qb wr ss vS -tV -Lb -Lb -Lb -Nx -gH +nN +wE +Fq +Fq +Uv +XR eH Qx HJ @@ -43698,26 +44103,26 @@ ld Na ai ck -Nx -ml -Lb -ml -ml -Lb -ml -tV +uL +QH +ja +Mz +Ei +zO +Ol +vM vS WZ FO FE vS -tV -ml -ml -ml -Nx +nN +rC +rt +Bw +kj gH -eH +ob bR HJ Ct @@ -43900,24 +44305,24 @@ Na Na ai ck -Nx -ml -Lb -ml -ml -Lb -ml -tV +uL +di +Lp +Ar +Ar +Ar +UP +vM vS vS ke vS vS -tV -ml -ml -ml -Nx +nN +Oh +Oh +Oh +Fm kY eH Qx @@ -44092,7 +44497,7 @@ Cr pB Bh gp -mx +Tq HD dF wh @@ -44101,25 +44506,25 @@ tM Dp ax it -ck -YA -ml -Lb -ml -ml -Lb -ml -tV +mi +Ym +hm +Ar +Ar +Ar +Ar +Ar +vM vS FC ZJ Uu vS -tV -Lb -Lb -Lb -Nx +nN +ov +sO +sO +Fm GM eH Qx @@ -44293,35 +44698,35 @@ UU Cr iD NP -id -id -UP -id +kv +kv +vy +mx id kv kv RU mi rR -ck +mi Ym -ml -Lb -ml -ml -Lb -ml -tV +Xw +Ar +Ar +Dj +Ar +Ar +vM vS Vu KF xV vS -tV -ml -ml -ml -Nx +nN +xd +VN +VN +iU gH eH Qx @@ -44495,35 +44900,35 @@ UU Cr iD DS -id -id -Wx -id +kv +Oy +vy +mx id ou EF uQ uQ -ai -Qh -Nx -ml -Lb -ml -ml -Lb -ml -tV +yQ +mi +Ym +aP +Ar +Ar +Ar +Ar +Ar +vM vS vS vS vS vS -tV -ml -ml -ml -Nx +nN +xN +VN +VN +VT gH eH Qx @@ -44697,35 +45102,35 @@ vw Cr iD DS -id -id -UP -id -id +kv +Oy +vy +YA +La dV pq pq ZI ai ck -Nx -ml -Lb -ml -ml -Lb -ml -tV +uL +Wx +ZH +Ar +Ar +Ar +Mo +vM eq tB eq tB eq -tV -Lb -Lb -Lb -Nx +nN +xS +nM +od +Bp gH eH bR @@ -44899,23 +45304,23 @@ vw Cr iD DS -id -id -UP -id -id +kv +kv +vy +La +pg dV Fd pq ZI ai -ck +AK At yk -yk -yk -yk -yk +eE +eE +eE +eE yk oB oB @@ -44924,8 +45329,8 @@ oB oB oB oB -kj -Oh +yk +yk yk yk gH diff --git a/maps/intrepid/intrepid_areas.dm b/maps/intrepid/intrepid_areas.dm index 0f9ea99b723..f69344d6a59 100644 --- a/maps/intrepid/intrepid_areas.dm +++ b/maps/intrepid/intrepid_areas.dm @@ -242,6 +242,11 @@ icon_state = "intrepid_teleporter" name = "improper Teleporter Room" +/area/intrepid/department/command/robocontrol + icon_state = "robotics" + name = "improper Robotics Control Room" + req_access = list(access_rd) + // Engineering /area/intrepid/department/engineering holomap_color = HOLOMAP_AREACOLOR_ENGINEERING @@ -302,13 +307,13 @@ req_access = list(access_atmospherics) /area/intrepid/department/engineering/engine_room - name = "\improper Engine Room" + name = "\improper Primary Engine Room" icon_state = "engine" sound_env = LARGE_ENCLOSED req_access = list(access_engine, access_engine_equip) /area/intrepid/department/engineering/engine_room/aux - name = "\improper Auxilary Engine Room" + name = "\improper Auxiliary Engine Room" /area/intrepid/department/engineering/storage/primary name = "Primary Tool Storage" diff --git a/maps/intrepid/intrepid_overmap.dm b/maps/intrepid/intrepid_overmap.dm index 56932258478..7b054eb4196 100644 --- a/maps/intrepid/intrepid_overmap.dm +++ b/maps/intrepid/intrepid_overmap.dm @@ -8,6 +8,8 @@ initial_restricted_waypoints = list( "Pandora" = list("nav_hangar_pandora"), + "Pithos" = list("nav_hangar_pithos"), + "Caduceus" = list("nav_hangar_ambulance"), "Cyclopes" = list("nav_merc_dock"), "Independent Light Corvette" = list("nav_obs_deck1"), ) @@ -60,7 +62,7 @@ max_speed = 1/(2 SECONDS) burn_delay = 1 SECONDS vessel_mass = 3000 - fore_dir = NORTH + fore_dir = WEST skill_needed = SKILL_BASIC vessel_size = SHIP_SIZE_SMALL @@ -68,3 +70,7 @@ name = "shuttle control console" shuttle_tag = "Pithos" req_access = list(access_expedition_shuttle_helm) + +/obj/machinery/computer/shuttle_control/explore/ambulance_shuttle + name = "shuttle control console" + shuttle_tag = "Caduceus" diff --git a/maps/intrepid/intrepid_shuttles.dm b/maps/intrepid/intrepid_shuttles.dm index 7ad034f350b..59a026d0b1a 100644 --- a/maps/intrepid/intrepid_shuttles.dm +++ b/maps/intrepid/intrepid_shuttles.dm @@ -62,36 +62,6 @@ INTREPID_ESCAPE_POD(3) waypoint_station = "nav_example_station" waypoint_offsite = "nav_example_offsite" -// Stardust -/datum/shuttle/autodock/ferry/stardust - name = "Stardust" - warmup_time = 10 - dock_target = "stardust_shuttle_airlock" - waypoint_station = "nav_stardust_start" - waypoint_offsite = "nav_stardust_out" - logging_home_tag = "nav_stardust_start" - logging_access = access_stardust_helm - ceiling_type = /turf/simulated/floor/shuttle_ceiling - -/datum/shuttle/autodock/ferry/stardust/New(_name, var/obj/effect/shuttle_landmark/initial_location) - shuttle_area = subtypesof(/area/shuttle/research) - ..() - -/obj/effect/shuttle_landmark/stardust/start - name = "First Deck" - landmark_tag = "nav_stardust_start" - docking_controller = "stardust_shuttle_dock_airlock" - base_area = /area/intrepid/misc/maint/portside - base_turf = /turf/simulated/floor/plating - -/obj/effect/shuttle_landmark/stardust/out - name = "Space near the ship" - landmark_tag = "nav_stardust_out" - -/obj/machinery/computer/shuttle_control/research - name = "research shuttle control console" - shuttle_tag = "Stardust" - // Pandora /datum/shuttle/autodock/overmap/exploration_shuttle name = "Pandora" @@ -144,8 +114,10 @@ INTREPID_ESCAPE_POD(3) /datum/shuttle/autodock/ferry/ambulance name = "Caduceus" shuttle_area = /area/shuttle/ambulance/home + logging_home_tag = "nav_hangar_ambulance" + ceiling_type = /turf/simulated/floor/shuttle_ceiling current_location = "nav_hangar_ambulance" - move_time = 60 + move_time = 30 dock_target = "ambulance_shuttle_dock" /obj/effect/shuttle_landmark/intrepid/hangar/ambulance_shuttle diff --git a/maps/intrepid/z2_transit.dmm b/maps/intrepid/z2_transit.dmm index 693fc06e655..65f2408a595 100644 --- a/maps/intrepid/z2_transit.dmm +++ b/maps/intrepid/z2_transit.dmm @@ -29426,7 +29426,7 @@ KK KK KK KK -Ik +KK KK KK KK @@ -30032,7 +30032,7 @@ KK KK KK KK -KK +Ik KK KK KK @@ -31037,18 +31037,18 @@ XQ DN XQ DN -DN -DN -DN -DN -DN -DN -DN -DN -DN -DN -DN -DN +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK DN XQ XQ @@ -31238,20 +31238,20 @@ XQ XQ DN XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ +DN +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +DN XQ XQ XQ @@ -31440,20 +31440,20 @@ XQ XQ DN XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ +DN +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +KK +DN XQ XQ XQ @@ -31642,20 +31642,20 @@ XQ XQ DN XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN XQ XQ XQ