diff --git a/code/game/machinery/portable_turret_vr.dm b/code/game/machinery/portable_turret_vr.dm new file mode 100644 index 0000000000..c313ad27aa --- /dev/null +++ b/code/game/machinery/portable_turret_vr.dm @@ -0,0 +1,12 @@ +/obj/machinery/porta_turret/industrial/military + name = "military CIWS turret" + desc = "A ship-grade weapons turret designed for anti-fighter defense." + req_one_access = list(access_cent_general) + installation = /obj/item/weapon/gun/energy/lasercannon + health = 500 + maxhealth = 500 + enabled = TRUE + lethal = TRUE + check_weapons = TRUE + auto_repair = TRUE + can_salvage = FALSE diff --git a/maps/tether/submaps/admin_use/cruiser.dm b/maps/tether/submaps/admin_use/cruiser.dm deleted file mode 100644 index 427d1e1508..0000000000 --- a/maps/tether/submaps/admin_use/cruiser.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/effect/overmap/visitable/ship/cruiser - name = "NT Cruiser" - desc = "A small cruiser pinging NT IFF." - color = "#00aaff" //Bluey - vessel_mass = 12000 - vessel_size = SHIP_SIZE_LARGE - initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard") diff --git a/maps/tether/submaps/om_ships/cruiser.dm b/maps/tether/submaps/om_ships/cruiser.dm index baea2ae18f..0307dc85fe 100644 --- a/maps/tether/submaps/om_ships/cruiser.dm +++ b/maps/tether/submaps/om_ships/cruiser.dm @@ -3,15 +3,129 @@ #include "cruiser.dmm" #endif +//////// Mothership areas //////// +/area/mothership + requires_power = 1 + flags = RAD_SHIELDED + base_turf = /turf/space + icon_state = "blue-red2" + +/area/mothership/breakroom + name = "Warship - Breakroom" + +/area/mothership/hydroponics + name = "Warship - Hydroponics" + +/area/mothership/kitchen + name = "Warship - Kitchen" + +/area/mothership/eva + name = "Warship - EVA" + +/area/mothership/bathroom1 + name = "Warship - Bathroom 1" + +/area/mothership/bathroom2 + name = "Warship - Bathroom 2" + +/area/mothership/dorm1 + name = "Warship - Dorm 1" + +/area/mothership/dorm2 + name = "Warship - Dorm 2" + +/area/mothership/dorm3 + name = "Warship - Dorm 3" + +/area/mothership/dorm4 + name = "Warship - Dorm 4" + +/area/mothership/dorm5 + name = "Warship - Dorm 5" + +/area/mothership/dorm6 + name = "Warship - Dorm 6" + +/area/mothership/chemistry + name = "Warship - Chemistry" + +/area/mothership/surgery + name = "Warship - Surgery" + +/area/mothership/vault + name = "Warship - Vault" + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/mothership/teleporter + name = "Warship - Teleporter Room" + +/area/mothership/security + name = "Warship - Security Equipment" + +/area/mothership/treatment + name = "Warship - Treatment Center" + +/area/mothership/medical + name = "Warship - Medical Equipment" + +/area/mothership/resleeving + name = "Warship - Resleeving" + +/area/mothership/morgue + name = "Warship - Morgue" + +/area/mothership/rnd + name = "Warship - Research" + +/area/mothership/robotics + name = "Warship - Robotics" + +/area/mothership/sechallway + name = "Warship - Security Hallway" + +/area/mothership/processing + name = "Warship - Processing" + +/area/mothership/warden + name = "Warship - Warden" + +/area/mothership/armory + name = "Warship - Armory" + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/mothership/bridge + name = "Warship - Bridge" + +/area/mothership/holodeck + name = "Warship - Holodeck Controls" +/area/mothership/holodeck/holo + name = "Warship - Holodeck" + icon_state = "dk_yellow" + +/area/mothership/cryotube + name = "Warship - Cryo chamber" + +/area/mothership/engineering + name = "Warship - Engineering" + +/area/mothership/hallway + name = "Warship - Main Hallway" + +/area/mothership/telecomms1 + name = "Warship - Telecommunications Main" + +/area/mothership/telecomms2 + name = "Warship - Telecommunications Relay" + /datum/map_template/om_ships/cruiser - name = "OM Ship - NT Cruiser (New Z)" + name = "OM Ship - NDV Tabiranth (New Z)" desc = "A large NT cruiser." mappath = 'cruiser.dmm' /obj/effect/overmap/visitable/ship/cruiser - name = "NT Cruiser" - desc = "A small cruiser pinging NT IFF." + name = "NDV Tabiranth" + desc = "A large military cruiser pinging NT IFF. An automated message warns unauthorized vessels from getting close." color = "#00aaff" //Bluey - vessel_mass = 12000 + vessel_mass = 15000 vessel_size = SHIP_SIZE_LARGE - initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "cruiser_port_dock", "cruiser_starboard_dock") + initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "ws_port_dock_1", "ws_port_dock_2", "ws_starboard_dock_1", "ws_starboard_dock_2") diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index d9afa310c1..a2765963e5 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -25,14 +25,26 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/breakroom) "ad" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/doors/Doorext.dmi'; - icon_state = "door_locked"; - name = "Sealed Door" +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_8_outer"; + req_one_access = list(101) }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_8"; + name = "exterior access button"; + pixel_x = -26; + pixel_y = 5; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/breakroom) "ae" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -63,18 +75,34 @@ /turf/simulated/shuttle/plating/airless/carry, /area/mothership/breakroom) "ah" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/breakroom) "ai" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = -32 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "ws_dock_8_pump" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/light/small{ dir = 4; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_8"; + pixel_x = -32; + req_one_access = list(101); + tag_airpump = "ws_dock_8_pump"; + tag_chamber_sensor = "ws_dock_8_sensor"; + tag_exterior_door = "ws_dock_8_outer"; + tag_interior_door = "ws_dock_8_inner" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_8_sensor"; + pixel_x = 25; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/breakroom) "aj" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -82,36 +110,57 @@ dir = 8; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/breakroom) "ak" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/breakroom) "al" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/breakroom) "am" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 32 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "ws_dock_1_pump" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/light/small{ dir = 8; pixel_x = 0 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_1_sensor"; + pixel_x = -25; + pixel_y = 0 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_1"; + pixel_x = 32; + req_one_access = list(101); + tag_airpump = "ws_dock_1_pump"; + tag_chamber_sensor = "ws_dock_1_sensor"; + tag_exterior_door = "ws_dock_1_outer"; + tag_interior_door = "ws_dock_1_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/breakroom) "an" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_8_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/breakroom) "ao" = ( /turf/simulated/floor/wood, @@ -163,6 +212,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/breakroom) "av" = ( @@ -232,6 +282,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/breakroom) "aD" = ( @@ -239,6 +290,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aE" = ( @@ -252,6 +307,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aG" = ( @@ -275,6 +333,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aJ" = ( @@ -286,6 +345,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aK" = ( @@ -358,6 +418,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aT" = ( @@ -379,6 +440,7 @@ "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/carpet/blue, /area/mothership/breakroom) "aW" = ( @@ -409,7 +471,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "bc" = ( -/obj/machinery/porta_turret, +/obj/machinery/porta_turret/industrial/military, /turf/simulated/floor/reinforced/airless{ name = "outer hull" }, @@ -441,7 +503,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/hydroponics) "bg" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -451,7 +514,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/hydroponics) "bh" = ( /obj/structure/sign/department/bar, @@ -487,7 +551,7 @@ /area/mothership/kitchen) "bl" = ( /obj/machinery/biogenerator, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bm" = ( /obj/item/weapon/reagent_containers/glass/bucket, @@ -508,7 +572,7 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bn" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -518,18 +582,18 @@ pixel_x = 4; pixel_y = 26 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bo" = ( /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bp" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bq" = ( /obj/structure/sink/kitchen, @@ -552,7 +616,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -561,7 +629,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1; + icon_state = "map" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -570,7 +642,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -580,7 +655,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bv" = ( /obj/structure/sink/kitchen, @@ -669,17 +748,18 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/hydroponics) "bD" = ( /obj/machinery/seed_storage/xenobotany, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bF" = ( /obj/structure/cable/cyan{ @@ -690,7 +770,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bG" = ( /obj/structure/cable/cyan{ @@ -701,7 +781,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bH" = ( /obj/structure/cable/cyan{ @@ -713,7 +793,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/hydroponics) "bI" = ( /obj/structure/cable/cyan{ @@ -729,7 +809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bJ" = ( /obj/structure/cable/cyan{ @@ -739,7 +819,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bK" = ( /obj/structure/cable/cyan{ @@ -750,20 +831,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/kitchen) "bN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -800,23 +881,24 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/kitchen) "bR" = ( /obj/machinery/vending/hydronutrients, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bU" = ( /obj/machinery/door/airlock/multi_tile/metal{ @@ -826,12 +908,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/hydroponics) "bV" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bW" = ( /obj/structure/cable/cyan{ @@ -847,7 +930,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bX" = ( /obj/structure/cable/cyan{ @@ -858,7 +941,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bY" = ( /obj/machinery/door/airlock/multi_tile/metal{ @@ -873,7 +956,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/kitchen) "bZ" = ( /obj/structure/cable/cyan{ @@ -904,7 +987,7 @@ /area/mothership/kitchen) "cd" = ( /obj/machinery/seed_extractor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "ce" = ( /obj/structure/reagent_dispensers/watertank, @@ -920,7 +1003,7 @@ pixel_x = 20; pixel_y = -28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "cf" = ( /obj/machinery/alarm{ @@ -932,7 +1015,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "cg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -941,7 +1024,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "ch" = ( /obj/structure/cable/cyan{ @@ -953,7 +1037,7 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "ci" = ( /obj/machinery/light, @@ -965,7 +1049,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "cj" = ( /obj/machinery/smartfridge, @@ -1040,22 +1124,6 @@ stripe_color = "#45b3d8" }, /area/mothership/eva) -"ct" = ( -/obj/machinery/door/airlock/multi_tile/metal, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/eva) -"cu" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/eva) "cv" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; @@ -1076,7 +1144,7 @@ pixel_y = 22 }, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cx" = ( /obj/item/clothing/suit/space/void/atmos, @@ -1085,7 +1153,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cy" = ( /obj/item/clothing/suit/space/void/medical/alt, @@ -1094,11 +1162,11 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cz" = ( /obj/machinery/suit_cycler, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cA" = ( /obj/structure/table/steel_reinforced, @@ -1107,7 +1175,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cB" = ( /obj/structure/table/steel_reinforced, @@ -1117,7 +1185,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cC" = ( /obj/machinery/status_display{ @@ -1126,14 +1194,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cE" = ( /obj/structure/cable/cyan{ @@ -1141,13 +1210,13 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cF" = ( /obj/machinery/status_display{ pixel_y = 29 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cG" = ( /obj/structure/table/steel_reinforced, @@ -1164,41 +1233,91 @@ pixel_x = 4; pixel_y = 26 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cH" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/doors/Doorext.dmi'; - icon_state = "door_locked"; - name = "Sealed Door" +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_7_outer"; + req_one_access = list(101) }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_7"; + name = "exterior access button"; + pixel_x = -5; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/eva) "cI" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 + dir = 4; + frequency = 1380; + id_tag = "ws_dock_7_pump" }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_7_sensor"; + pixel_x = 0; + pixel_y = -25 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_7"; + pixel_y = 32; + req_one_access = list(101); + tag_airpump = "ws_dock_7_pump"; + tag_chamber_sensor = "ws_dock_7_sensor"; + tag_exterior_door = "ws_dock_7_outer"; + tag_interior_door = "ws_dock_7_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/eva) "cJ" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_7_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/eva) "cK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_7"; + name = "interior access button"; + pixel_x = -28; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1207,7 +1326,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cN" = ( /obj/machinery/door/firedoor/glass, @@ -1218,7 +1340,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/eva) "cO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1227,12 +1352,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cP" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cQ" = ( /obj/structure/cable/cyan{ @@ -1246,7 +1375,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cR" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1255,24 +1387,56 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_2"; + name = "interior access button"; + pixel_x = 28; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cT" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 + dir = 8; + frequency = 1380; + id_tag = "ws_dock_2_pump" }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_2"; + pixel_y = 32; + req_one_access = list(101); + tag_airpump = "ws_dock_2_pump"; + tag_chamber_sensor = "ws_dock_2_sensor"; + tag_exterior_door = "ws_dock_2_outer"; + tag_interior_door = "ws_dock_2_inner" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_2_sensor"; + pixel_x = 0; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/eva) "cU" = ( /obj/item/clothing/suit/space/void/security/alt, @@ -1281,7 +1445,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cV" = ( /obj/item/clothing/suit/space/void/engineering/salvage, @@ -1291,7 +1455,7 @@ /obj/item/clothing/mask/breath, /obj/machinery/light, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cW" = ( /obj/item/clothing/suit/space/void/exploration, @@ -1305,37 +1469,38 @@ pixel_y = -25 }, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cX" = ( /obj/structure/dispenser/oxygen{ oxygentanks = 40 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cY" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cZ" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/storage/briefcase/inflatable, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "da" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "db" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "dc" = ( /obj/structure/cable/cyan{ @@ -1348,7 +1513,7 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "dd" = ( /obj/machinery/power/apc{ @@ -1362,7 +1527,7 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "de" = ( /obj/structure/sign/department/eva, @@ -1383,7 +1548,7 @@ /area/mothership/bathroom1) "dg" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "dh" = ( /obj/structure/sink{ @@ -1406,7 +1571,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "di" = ( /obj/machinery/door/airlock/voidcraft/vertical{ @@ -1425,7 +1590,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bathroom1) "dj" = ( /obj/structure/cable/cyan{ @@ -1458,6 +1623,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dl" = ( @@ -1473,6 +1641,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dm" = ( @@ -1488,6 +1659,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dn" = ( @@ -1507,6 +1679,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "do" = ( @@ -1526,7 +1701,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bathroom2) "dp" = ( /obj/structure/sink{ @@ -1549,11 +1724,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dq" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dr" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -1592,7 +1767,7 @@ pixel_y = -22 }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "dv" = ( /obj/structure/toilet{ @@ -1609,7 +1784,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "dw" = ( /obj/machinery/status_display{ @@ -1626,6 +1801,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/porta_turret/industrial/teleport_defense{ + auto_repair = 1; + check_access = 0; + check_weapons = 1; + name = "anti-boarding turret"; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dy" = ( @@ -1690,7 +1873,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dH" = ( /obj/machinery/alarm{ @@ -1701,7 +1884,7 @@ pixel_y = -22 }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dI" = ( /obj/machinery/door/window/survival_pod{ @@ -1742,6 +1925,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/surgery) "dL" = ( @@ -1788,12 +1972,12 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/teleporter) "dR" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/teleporter) "dS" = ( /obj/structure/cable/cyan{ @@ -1804,6 +1988,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dT" = ( @@ -1953,11 +2138,11 @@ dir = 8; pixel_x = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "em" = ( /obj/machinery/vending/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "en" = ( /obj/item/clothing/head/helmet/solgov, @@ -1969,7 +2154,7 @@ pixel_y = 0 }, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "eo" = ( /obj/structure/closet/crate/medical, @@ -2091,7 +2276,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm1) "ev" = ( /obj/structure/cable/cyan{ @@ -2110,6 +2295,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ew" = ( @@ -2167,6 +2353,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "eC" = ( @@ -2187,7 +2374,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm2) "eD" = ( /obj/machinery/power/apc{ @@ -2265,7 +2452,7 @@ /obj/item/clothing/accessory/storage/pouches/large/blue, /obj/item/clothing/accessory/storage/pouches/large/blue, /obj/item/clothing/accessory/storage/pouches/large/blue, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "eH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2274,7 +2461,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "eI" = ( /obj/item/clothing/suit/armor/pcarrier/blue/sol, @@ -2289,14 +2476,14 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "eJ" = ( /obj/machinery/door/airlock/medical, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/surgery) "eK" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -2329,6 +2516,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "eN" = ( @@ -2386,7 +2574,7 @@ /obj/machinery/door/airlock/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/security) "eV" = ( /obj/machinery/oxygen_pump/anesthetic, @@ -2452,6 +2640,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fd" = ( @@ -2472,6 +2661,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ff" = ( @@ -2508,7 +2698,7 @@ /obj/item/clothing/glasses/hud/security, /obj/item/clothing/glasses/hud/security, /obj/item/clothing/glasses/hud/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fh" = ( /obj/item/clothing/accessory/storage/black_vest, @@ -2524,13 +2714,13 @@ /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fi" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fj" = ( /obj/structure/window/reinforced{ @@ -2540,7 +2730,7 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fk" = ( /obj/structure/window/reinforced{ @@ -2550,12 +2740,12 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fm" = ( /obj/item/device/holowarrant, @@ -2564,7 +2754,7 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fn" = ( /obj/machinery/power/emitter/gyrotron/anchored{ @@ -2718,36 +2908,36 @@ icon_state = "tube1"; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fw" = ( /obj/machinery/syndicate_beacon/virgo{ charges = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fx" = ( /obj/machinery/mineral/equipment_vendor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fy" = ( -/obj/machinery/power/smes/buildable{ - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 1e+006; - output_level = 1e+006; - RCon = 0 - }, /obj/structure/cable/cyan{ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/power/smes/buildable/hybrid{ + charge = 1e+007; + cur_coils = 4; + input_attempt = 1; + input_level = 1e+006; + output_level = 2e+006; + RCon = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fz" = ( /obj/structure/prop/blackbox, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fA" = ( /obj/structure/closet/crate/secure/weapon{ @@ -2776,7 +2966,7 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fB" = ( /obj/structure/cable/cyan{ @@ -2791,6 +2981,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fC" = ( @@ -2801,13 +2992,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fE" = ( /obj/structure/window/reinforced{ @@ -2820,7 +3011,7 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fF" = ( /obj/structure/window/reinforced{ @@ -2833,12 +3024,12 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fG" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fH" = ( /obj/item/device/holowarrant, @@ -2846,7 +3037,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fI" = ( /obj/machinery/power/emitter/gyrotron/anchored{ @@ -2889,6 +3080,8 @@ icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/biochemistry/full, /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "fN" = ( @@ -2903,7 +3096,7 @@ /obj/machinery/door/window/westleft, /obj/machinery/door/window/eastright, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/chemistry) "fQ" = ( /obj/structure/cable/cyan{ @@ -2918,6 +3111,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fR" = ( @@ -2936,7 +3130,7 @@ id = "ship-vault"; name = "Vault" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/vault) "fS" = ( /obj/structure/cable/cyan{ @@ -2944,7 +3138,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fT" = ( /obj/machinery/power/terminal{ @@ -2966,7 +3160,7 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fU" = ( /obj/structure/cable/cyan{ @@ -2979,7 +3173,7 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fV" = ( /obj/structure/cable/cyan{ @@ -2994,6 +3188,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fW" = ( @@ -3008,26 +3203,26 @@ pixel_x = -23; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fX" = ( /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fY" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "fZ" = ( /obj/structure/table/bench/steel, /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "ga" = ( /obj/item/device/holowarrant, /obj/structure/closet/secure_closet/nanotrasen_security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gb" = ( /obj/structure/table/steel_reinforced, @@ -3155,7 +3350,7 @@ /obj/item/slime_extract/pink, /obj/item/weapon/deadringer, /obj/item/weapon/deadringer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gi" = ( /obj/structure/closet/crate/secure/weapon{ @@ -3171,16 +3366,16 @@ pixel_x = 0; pixel_y = -25 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gj" = ( /obj/machinery/mineral/equipment_vendor/survey, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gk" = ( /obj/machinery/power/fractal_reactor/fluff/converter, /obj/structure/cable, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gl" = ( /obj/structure/closet/crate/secure/gear{ @@ -3199,7 +3394,7 @@ dir = 1; pixel_y = -22 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gm" = ( /obj/structure/closet/crate/secure/gear{ @@ -3245,16 +3440,16 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gn" = ( /obj/structure/closet/secure_closet/explorer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "go" = ( /obj/structure/closet/secure_closet/nanotrasen_commander, /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gp" = ( /obj/structure/grille, @@ -3275,6 +3470,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/security) "gq" = ( @@ -3302,7 +3498,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/surgery) "gt" = ( /obj/machinery/smartfridge, @@ -3318,7 +3514,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/chemistry) "gv" = ( /obj/structure/sign/department/medbay, @@ -3358,7 +3554,7 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3367,13 +3563,13 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gC" = ( /obj/machinery/recharger, @@ -3381,7 +3577,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gD" = ( /obj/structure/table/steel_reinforced, @@ -3389,19 +3585,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gF" = ( /obj/structure/closet/secure_closet/detective, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gG" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -3502,7 +3698,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/treatment) "gP" = ( /obj/structure/cable/cyan{ @@ -3525,6 +3721,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/porta_turret/industrial/teleport_defense{ + auto_repair = 1; + check_access = 0; + check_weapons = 1; + name = "anti-boarding turret"; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "gR" = ( @@ -3533,13 +3737,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"gS" = ( -/obj/structure/ladder, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/hallway) "gT" = ( /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/security) "gU" = ( /obj/structure/grille, @@ -3560,6 +3760,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/treatment) "gV" = ( @@ -3610,7 +3811,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/treatment) "hb" = ( /obj/machinery/status_display{ @@ -3632,6 +3833,10 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "hd" = ( @@ -3656,6 +3861,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1; + icon_state = "map" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "he" = ( @@ -3707,7 +3916,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/security) "hh" = ( /obj/structure/cable/cyan{ @@ -3726,7 +3935,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hi" = ( /obj/structure/cable/cyan{ @@ -3747,7 +3956,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/pathfinder, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hj" = ( /obj/structure/closet/bombcloset/double, @@ -3762,7 +3971,7 @@ pixel_x = 3; pixel_y = -29 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hk" = ( /obj/structure/closet/wardrobe/red, @@ -3776,7 +3985,7 @@ pixel_x = 3; pixel_y = -29 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -3785,7 +3994,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hm" = ( /obj/structure/table/steel_reinforced, @@ -3801,7 +4010,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hn" = ( /obj/structure/table/steel_reinforced, @@ -3822,7 +4031,7 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "ho" = ( /obj/structure/filingcabinet/chestdrawer{ @@ -3911,7 +4120,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/sechallway) "hB" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -3932,7 +4141,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/processing) "hE" = ( /obj/structure/table/steel_reinforced, @@ -4021,7 +4230,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm3) "hL" = ( /obj/structure/cable/cyan{ @@ -4041,6 +4250,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "hM" = ( @@ -4061,7 +4271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm4) "hN" = ( /obj/structure/cable/cyan{ @@ -4114,7 +4324,7 @@ /turf/simulated/floor/wood, /area/mothership/dorm4) "hQ" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "hR" = ( /obj/structure/cable/cyan{ @@ -4124,11 +4334,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "hS" = ( /obj/structure/closet/crate/bin, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "hT" = ( /obj/structure/table/steel_reinforced, @@ -4137,14 +4347,14 @@ pixel_y = 4 }, /obj/item/weapon/folder/red, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "hU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "hV" = ( /obj/structure/table/steel_reinforced, @@ -4155,11 +4365,11 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "hW" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "hX" = ( /obj/structure/table/steel_reinforced, @@ -4270,7 +4480,7 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "il" = ( /obj/structure/sign/department/interrogation, @@ -4283,22 +4493,22 @@ /obj/structure/table/steel_reinforced, /obj/item/device/camera, /obj/item/device/retail_scanner/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "in" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "io" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "ip" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 26 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iq" = ( /obj/structure/closet/crate/bin, @@ -4352,7 +4562,7 @@ id = "Cell M1"; pixel_x = -32 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "iy" = ( /obj/structure/cable/cyan{ @@ -4371,7 +4581,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "iz" = ( /obj/machinery/door/airlock/security, @@ -4387,7 +4597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/processing) "iA" = ( /obj/structure/cable/cyan{ @@ -4401,7 +4611,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4410,7 +4620,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4419,12 +4629,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iD" = ( /obj/structure/table/steel_reinforced, /obj/item/device/flashlight/lamp, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iE" = ( /obj/machinery/alarm{ @@ -4436,7 +4646,7 @@ pixel_y = 0; report_danger_level = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iF" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -4451,7 +4661,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/treatment) "iH" = ( /obj/structure/cable/cyan{ @@ -4462,7 +4672,7 @@ /obj/machinery/door/airlock/medical, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/treatment) "iI" = ( /obj/structure/table/steel_reinforced, @@ -4471,19 +4681,19 @@ pixel_x = 2; pixel_y = 2 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "iJ" = ( /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "iK" = ( /obj/structure/morgue{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "iL" = ( /obj/machinery/alarm{ @@ -4578,7 +4788,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "iQ" = ( /obj/structure/cable/cyan{ @@ -4593,7 +4803,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "iR" = ( /obj/structure/bed/chair{ @@ -4607,7 +4817,7 @@ pixel_x = -28 }, /obj/structure/cable/cyan, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iS" = ( /obj/structure/bed/chair{ @@ -4617,20 +4827,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iT" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iU" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iV" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -4715,16 +4925,16 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jg" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jh" = ( /obj/machinery/camera/network/ert{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "ji" = ( /obj/machinery/door/firedoor/glass, @@ -4762,17 +4972,17 @@ report_danger_level = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jk" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "jl" = ( /obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "jm" = ( /obj/structure/table/steel_reinforced, @@ -4781,13 +4991,13 @@ pixel_y = 7 }, /obj/item/weapon/pen, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "jn" = ( /obj/machinery/computer/secure_data{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "jo" = ( /obj/machinery/power/emitter/gyrotron/anchored{ @@ -4903,7 +5113,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/morgue) "jy" = ( /obj/structure/cable/cyan{ @@ -4918,7 +5128,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jz" = ( /obj/structure/closet/walllocker{ @@ -4951,7 +5161,7 @@ icon_state = "tube1"; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jB" = ( /obj/machinery/power/apc{ @@ -4967,7 +5177,7 @@ /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jC" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -4988,7 +5198,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/warden) "jF" = ( /obj/effect/shuttle_landmark{ @@ -5051,7 +5261,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jN" = ( /obj/machinery/alarm{ @@ -5157,11 +5367,11 @@ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jS" = ( /obj/machinery/photocopier, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jT" = ( /obj/machinery/firealarm{ @@ -5170,14 +5380,14 @@ pixel_x = 4; pixel_y = 26 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jV" = ( /obj/structure/table/steel_reinforced, @@ -5190,7 +5400,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jW" = ( /obj/structure/closet/crate/bin, @@ -5215,7 +5425,7 @@ name = "Blast Doors Controls"; pixel_y = 28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jX" = ( /obj/machinery/organ_printer/flesh, @@ -5298,11 +5508,11 @@ /area/mothership/morgue) "ke" = ( /obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "kf" = ( /obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "kg" = ( /obj/machinery/door/firedoor/glass, @@ -5325,15 +5535,15 @@ /area/mothership/sechallway) "kh" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "ki" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kk" = ( /obj/structure/grille, @@ -5354,6 +5564,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/warden) "kl" = ( @@ -5367,7 +5578,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/medical) "kn" = ( /obj/structure/cable/cyan{ @@ -5378,7 +5589,7 @@ /obj/machinery/door/airlock/medical, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/medical) "ko" = ( /obj/structure/cable/cyan{ @@ -5397,7 +5608,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "kp" = ( /obj/machinery/door/airlock/security, @@ -5413,7 +5624,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/warden) "kq" = ( /obj/structure/cable/cyan{ @@ -5427,7 +5638,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5436,7 +5647,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "ks" = ( /obj/structure/bed/chair{ @@ -5449,7 +5660,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kt" = ( /obj/structure/table/steel_reinforced, @@ -5457,13 +5668,13 @@ /obj/item/weapon/stamp/denied{ pixel_x = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "ku" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kv" = ( /obj/machinery/vending/medical, @@ -5600,13 +5811,13 @@ pixel_x = -28 }, /obj/structure/cable/cyan, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kN" = ( /obj/structure/table/steel_reinforced, @@ -5625,7 +5836,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kO" = ( /obj/structure/grille, @@ -5646,6 +5857,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/medical) "kP" = ( @@ -5754,7 +5966,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm5) "kY" = ( /obj/structure/cable/cyan{ @@ -5774,6 +5986,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "kZ" = ( @@ -5794,7 +6007,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/dorm6) "la" = ( /obj/structure/cable/cyan{ @@ -5850,24 +6063,24 @@ "ld" = ( /obj/structure/table/steel_reinforced, /obj/item/device/retail_scanner/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "le" = ( /obj/structure/table/steel_reinforced, /obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "lf" = ( /obj/machinery/computer/secure_data{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "lg" = ( /obj/machinery/computer/prisoner{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "lh" = ( /obj/structure/closet/secure_closet/CMO, @@ -5951,7 +6164,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "lq" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -5972,7 +6185,7 @@ req_one_access = list(103) }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "lt" = ( /obj/structure/closet/secure_closet/sar, @@ -6051,6 +6264,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "lA" = ( @@ -6070,6 +6286,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "lB" = ( @@ -6084,7 +6304,7 @@ id = "ship-armory"; name = "Armory" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "lC" = ( /obj/structure/cable/cyan{ @@ -6099,7 +6319,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lD" = ( /obj/item/ammo_magazine/m9mm/large/preban, @@ -6120,7 +6340,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lE" = ( /obj/item/ammo_magazine/m9mm/compact, @@ -6144,7 +6364,7 @@ /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lF" = ( /obj/item/weapon/gun/energy/frontier/locked/carbine, @@ -6158,10 +6378,10 @@ /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lG" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lH" = ( /obj/machinery/vending/nifsoft_shop{ @@ -6170,7 +6390,7 @@ name = "Hacked NIFSoft Shop"; prices = list() }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lI" = ( /obj/structure/table/steel_reinforced, @@ -6183,7 +6403,7 @@ /obj/item/weapon/cell/hyper, /obj/item/weapon/cell/hyper, /obj/item/weapon/cell/hyper, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lJ" = ( /obj/machinery/disposal, @@ -6263,6 +6483,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/porta_turret/industrial/teleport_defense{ + auto_repair = 1; + check_access = 0; + check_weapons = 1; + name = "anti-boarding turret"; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "lR" = ( @@ -6297,7 +6525,7 @@ pixel_x = 0; pixel_y = -28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "lT" = ( /obj/structure/cable/cyan{ @@ -6307,7 +6535,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lU" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6316,19 +6544,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lX" = ( /obj/structure/table/steel_reinforced, @@ -6339,14 +6567,14 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "lY" = ( /obj/machinery/door/airlock/research, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/medical) "lZ" = ( /obj/machinery/door/airlock/research, @@ -6356,7 +6584,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/medical) "ma" = ( /obj/structure/sign/department/medbay, @@ -6406,7 +6634,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "me" = ( /obj/item/weapon/melee/baton/loaded, @@ -6435,7 +6663,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/holster/machete, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mf" = ( /obj/structure/closet/crate/secure/weapon{ @@ -6453,19 +6681,19 @@ /obj/item/weapon/storage/box/flashbangs, /obj/item/weapon/gun/launcher/grenade, /obj/item/weapon/gun/launcher/grenade, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mg" = ( /obj/item/rig_module/grenade_launcher/smoke, /obj/item/rig_module/cleaner_launcher, /obj/item/rig_module/grenade_launcher, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mh" = ( /obj/item/rig_module/vision/multi, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mi" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -6475,20 +6703,20 @@ /area/mothership/rnd) "mj" = ( /obj/machinery/r_n_d/destructive_analyzer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mk" = ( /obj/machinery/computer/rdconsole/core, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "ml" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mm" = ( /obj/machinery/pros_fabricator, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mn" = ( /obj/machinery/autolathe{ @@ -6496,11 +6724,11 @@ hacked = 1; name = "Centcom Autolathe" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mo" = ( /obj/machinery/mecha_part_fabricator, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mp" = ( /obj/machinery/power/apc{ @@ -6510,27 +6738,24 @@ pixel_x = 24 }, /obj/structure/cable/cyan, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mq" = ( /obj/machinery/status_display{ pixel_y = 29 }, -/obj/item/modular_computer/console/preset/mercenary, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/computer/shuttle_control/explore/aroboat, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "mr" = ( -/obj/structure/prop/alien/computer{ - icon_state = "console-c"; +/obj/structure/prop/alien/computer/hybrid{ dir = 1 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "ms" = ( -/obj/item/modular_computer/telescreen/preset/generic{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/computer/ship/helm, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "mt" = ( /obj/structure/sign/department/armory, @@ -6568,14 +6793,14 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mv" = ( /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, /obj/item/weapon/storage/backpack/ert/commander, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mw" = ( /obj/structure/closet/crate/secure/weapon{ @@ -6593,13 +6818,13 @@ /obj/item/weapon/storage/box/syndie_kit/combat_armor, /obj/item/weapon/storage/box/syndie_kit/combat_armor, /obj/item/weapon/storage/box/syndie_kit/combat_armor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mx" = ( /obj/item/rig_module/mounted, /obj/item/rig_module/mounted, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "my" = ( /obj/structure/table/rack/steel, @@ -6611,7 +6836,7 @@ dir = 1 }, /obj/item/weapon/rig/ert, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mz" = ( /obj/structure/reagent_dispensers/acid{ @@ -6619,23 +6844,23 @@ pixel_x = -30; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mA" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mC" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mD" = ( /obj/structure/table/steel_reinforced, @@ -6693,7 +6918,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mJ" = ( /obj/item/clothing/suit/armor/vest/ert/security, @@ -6706,7 +6931,7 @@ /obj/item/weapon/storage/backpack/ert/security, /obj/item/weapon/storage/backpack/ert/security, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mK" = ( /obj/structure/closet/crate/secure/weapon{ @@ -6724,7 +6949,7 @@ /obj/item/ammo_magazine/m545saw/ap, /obj/item/ammo_magazine/m545saw/ap, /obj/item/ammo_magazine/m545saw/ap, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mL" = ( /obj/item/rig_module/mounted/egun, @@ -6732,7 +6957,7 @@ /obj/item/rig_module/mounted/egun, /obj/item/rig_module/mounted/egun, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mM" = ( /obj/structure/table/rack/steel, @@ -6744,7 +6969,7 @@ /obj/item/weapon/rig/ert/security, /obj/item/weapon/rig/ert/security, /obj/item/weapon/rig/ert/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mN" = ( /obj/machinery/power/emitter/gyrotron/anchored{ @@ -6759,21 +6984,21 @@ "mO" = ( /obj/machinery/r_n_d/circuit_imprinter, /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mP" = ( /obj/machinery/r_n_d/protolathe, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mQ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mR" = ( /obj/structure/table/steel_reinforced, /obj/machinery/recharger, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mS" = ( /obj/structure/closet{ @@ -6798,7 +7023,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mT" = ( /obj/structure/sign/department/rnd, @@ -6821,6 +7046,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "mV" = ( @@ -6878,7 +7104,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "na" = ( /obj/item/clothing/suit/armor/vest/ert/engineer, @@ -6888,7 +7114,7 @@ /obj/item/weapon/storage/backpack/ert/engineer, /obj/item/weapon/storage/backpack/ert/engineer, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nb" = ( /obj/structure/closet/crate/secure/weapon{ @@ -6908,7 +7134,7 @@ /obj/item/weapon/cell/device/weapon, /obj/item/weapon/gun/energy/protector, /obj/item/weapon/gun/energy/protector, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nc" = ( /obj/item/rig_module/device/anomaly_scanner, @@ -6916,7 +7142,7 @@ /obj/item/rig_module/device/rcd, /obj/item/rig_module/device/rcd, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nd" = ( /obj/structure/table/rack/steel, @@ -6926,7 +7152,7 @@ }, /obj/item/weapon/rig/ert/engineer, /obj/item/weapon/rig/ert/engineer, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "ne" = ( /obj/machinery/power/emitter/gyrotron/anchored{ @@ -6940,19 +7166,19 @@ /area/mothership/warden) "nf" = ( /obj/machinery/vending/robotics, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "ng" = ( /obj/machinery/vending/cart, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nh" = ( /obj/structure/closet/secure_closet/RD, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "ni" = ( /obj/structure/closet/secure_closet/scientist, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nj" = ( /obj/structure/closet{ @@ -7024,7 +7250,7 @@ pixel_x = 5; pixel_y = -5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nk" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -7044,6 +7270,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "nm" = ( @@ -7063,7 +7290,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "no" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/bed/chair/bay/shuttle{ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, @@ -7072,16 +7299,16 @@ /obj/item/modular_computer/console/preset/ert{ dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nq" = ( /obj/item/modular_computer/console/preset/ert{ dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nr" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/bed/chair/bay/shuttle{ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, @@ -7124,6 +7351,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "nv" = ( @@ -7139,7 +7367,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nw" = ( /obj/item/clothing/suit/armor/vest/ert/medical, @@ -7149,7 +7377,7 @@ /obj/item/weapon/storage/backpack/ert/medical, /obj/item/weapon/storage/backpack/ert/medical, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nx" = ( /obj/structure/closet/crate/secure/weapon{ @@ -7172,7 +7400,7 @@ /obj/item/ammo_magazine/m762/ap, /obj/item/weapon/storage/box/sniperammo, /obj/item/weapon/storage/box/sniperammo, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "ny" = ( /obj/item/rig_module/device/healthscanner, @@ -7182,7 +7410,7 @@ /obj/item/rig_module/sprinter, /obj/item/rig_module/sprinter, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nz" = ( /obj/structure/table/rack/steel, @@ -7193,20 +7421,20 @@ /obj/structure/window/reinforced/survival_pod, /obj/item/weapon/rig/ert/medical, /obj/item/weapon/rig/ert/medical, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nA" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7215,7 +7443,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nD" = ( /obj/machinery/door/airlock/research, @@ -7226,7 +7454,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/rnd) "nE" = ( /obj/structure/cable/cyan{ @@ -7240,6 +7468,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "nF" = ( @@ -7255,13 +7484,13 @@ /obj/machinery/computer/communications{ dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nH" = ( /obj/machinery/computer/message_monitor{ dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nI" = ( /obj/item/weapon/gun/energy/gun, @@ -7284,7 +7513,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nJ" = ( /obj/item/clothing/glasses/graviton, @@ -7309,7 +7538,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nK" = ( /obj/structure/closet/crate/secure/weapon{ @@ -7328,7 +7557,7 @@ /obj/item/weapon/gun/energy/gun/burst, /obj/item/weapon/gun/energy/sniperrifle, /obj/item/weapon/gun/energy/sniperrifle, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nL" = ( /obj/item/rig_module/rescue_pharm, @@ -7338,7 +7567,7 @@ /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/chem_dispenser/combat, /obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nM" = ( /obj/item/rig_module/device/drill, @@ -7352,11 +7581,11 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nN" = ( /obj/structure/closet/crate/bin, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nO" = ( /obj/item/device/defib_kit/jumper_kit, @@ -7367,21 +7596,21 @@ dir = 1; pixel_y = -22 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nP" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nQ" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nR" = ( /obj/structure/closet/wardrobe/science_white, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nS" = ( /obj/structure/closet/wardrobe/robotics_black, @@ -7390,19 +7619,19 @@ pixel_x = 0; pixel_y = -25 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "nT" = ( /obj/machinery/computer/supplycomp{ dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nU" = ( /obj/machinery/computer/robotics{ dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) "nV" = ( /obj/structure/cable/cyan{ @@ -7421,6 +7650,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "nW" = ( @@ -7439,7 +7669,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "nX" = ( /obj/structure/cable/cyan{ @@ -7458,7 +7688,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nY" = ( /obj/structure/cable/cyan{ @@ -7473,7 +7703,7 @@ dir = 4 }, /obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "nZ" = ( /obj/structure/cable/cyan{ @@ -7489,7 +7719,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "oa" = ( /obj/machinery/power/apc{ @@ -7506,7 +7736,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "ob" = ( /obj/machinery/alarm{ @@ -7516,18 +7746,18 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "oc" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 0; pixel_y = -30 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "od" = ( /obj/machinery/vending/security, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "oe" = ( /obj/machinery/door/blast/regular{ @@ -7538,7 +7768,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/rnd) "of" = ( /obj/machinery/door/blast/regular{ @@ -7547,7 +7777,7 @@ name = "Mech Bay" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/rnd) "og" = ( /obj/machinery/door/blast/regular{ @@ -7561,33 +7791,41 @@ name = "Mech Bay Controls"; pixel_x = 28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/rnd) "oh" = ( /obj/structure/fireaxecabinet{ pixel_y = -32 }, +/obj/machinery/turretid/stun{ + check_access = 0; + check_weapons = 1; + control_area = /area/mothership/hallway; + name = "anti-boarding turret controls"; + pixel_x = -32; + req_access = list(101) + }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "oi" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_x = 0; pixel_y = -25 }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "oj" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "ok" = ( @@ -7599,6 +7837,15 @@ req_one_access = list(108); specialfunctions = 4 }, +/obj/machinery/turretid/lethal{ + ailock = 1; + check_synth = 0; + check_weapons = 1; + control_area = /area/mothership/bridge; + name = "defense turret controls"; + pixel_x = 32; + req_access = list(101) + }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "ol" = ( @@ -7617,11 +7864,11 @@ /area/mothership/robotics) "on" = ( /obj/structure/closet/toolcloset, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oo" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "op" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7632,7 +7879,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oq" = ( /obj/machinery/mech_recharger, @@ -7660,7 +7907,7 @@ icon_state = "warning"; dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "ou" = ( /obj/machinery/door/blast/regular{ @@ -7674,7 +7921,7 @@ pixel_x = 0; pixel_y = 28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/robotics) "ov" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7696,7 +7943,7 @@ pixel_y = 0 }, /obj/structure/closet/crate/bin, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "oy" = ( /obj/effect/floor_decal/spline/plain{ @@ -7709,7 +7956,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "oz" = ( /turf/simulated/floor/reinforced{ @@ -7735,6 +7982,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/fans/hardlight, /turf/simulated/floor/plating, /area/mothership/holodeck) "oB" = ( @@ -7743,14 +7991,14 @@ dir = 8; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oC" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oE" = ( /turf/simulated/floor/bluegrid, @@ -7760,7 +8008,7 @@ icon_state = "warning"; dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oG" = ( /obj/machinery/door/blast/regular{ @@ -7768,7 +8016,7 @@ name = "Mech Bay" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/robotics) "oH" = ( /obj/structure/cable/cyan{ @@ -7787,6 +8035,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8; + icon_state = "map" + }, +/obj/machinery/porta_turret/industrial/teleport_defense{ + auto_repair = 1; + check_access = 0; + check_weapons = 1; + name = "anti-boarding turret"; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "oI" = ( @@ -7806,6 +8065,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/obj/machinery/porta_turret/industrial/teleport_defense{ + auto_repair = 1; + check_access = 0; + check_weapons = 1; + name = "anti-boarding turret"; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "oJ" = ( @@ -7824,22 +8094,22 @@ pixel_y = 6 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "oK" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "oL" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oM" = ( /obj/machinery/cryopod/robot, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oN" = ( /obj/machinery/computer/cryopod/robot{ @@ -7849,7 +8119,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oO" = ( /obj/machinery/mech_recharger, @@ -7888,7 +8158,7 @@ icon_state = "warning"; dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oS" = ( /obj/machinery/door/blast/regular{ @@ -7901,7 +8171,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/robotics) "oT" = ( /obj/structure/cable/cyan{ @@ -7928,6 +8198,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "oV" = ( @@ -7971,6 +8242,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "pb" = ( @@ -7990,7 +8262,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/holodeck) "pc" = ( /obj/machinery/power/apc{ @@ -8011,7 +8283,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "pd" = ( /obj/effect/floor_decal/spline/plain{ @@ -8027,7 +8299,7 @@ dir = 9 }, /obj/item/weapon/storage/box/survival/space, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "pe" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -8035,65 +8307,7 @@ stripe_color = "#45b3d8" }, /area/mothership/telecomms1) -"pf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms1) -"pg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms1) -"ph" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms1) -"pi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/hallway) -"pj" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/hallway) "pk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /turf/simulated/shuttle/wall/voidcraft/blue{ hard_corner = 1; icon_state = "void-hc"; @@ -8101,65 +8315,6 @@ stripe_color = "#45b3d8" }, /area/mothership/cryotube) -"pl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/cryotube) -"pm" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/hallway) -"pn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms2) -"po" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms2) -"pp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms2) "pq" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ name = "small craft wall"; @@ -8167,30 +8322,65 @@ }, /area/mothership/telecomms2) "pr" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/doors/Doorext.dmi'; - icon_state = "door_locked"; - name = "Sealed Door" +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_6_outer"; + req_one_access = list(101) }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_6"; + name = "exterior access button"; + pixel_x = -5; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms1) "ps" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 + dir = 4; + frequency = 1380; + id_tag = "ws_dock_6_pump" }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_6_sensor"; + pixel_x = 0; + pixel_y = 25 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_6"; + pixel_y = -32; + req_one_access = list(101); + tag_airpump = "ws_dock_6_pump"; + tag_chamber_sensor = "ws_dock_6_sensor"; + tag_exterior_door = "ws_dock_6_outer"; + tag_interior_door = "ws_dock_6_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms1) "pt" = ( -/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9; icon_state = "intact" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_6_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms1) "pu" = ( /obj/machinery/firealarm{ @@ -8199,19 +8389,35 @@ pixel_x = 4; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_6"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pv" = ( /obj/machinery/telecomms/receiver/preset_cent, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "pw" = ( /obj/machinery/ntnet_relay, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "px" = ( /obj/machinery/telecomms/broadcaster/preset_cent, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "py" = ( /obj/machinery/power/apc{ @@ -8229,6 +8435,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pz" = ( @@ -8246,6 +8455,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pA" = ( @@ -8260,6 +8472,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pB" = ( @@ -8278,8 +8493,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/telecomms1) "pC" = ( /obj/structure/cable/cyan{ @@ -8299,6 +8516,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "pD" = ( @@ -8309,27 +8530,27 @@ /area/mothership/cryotube) "pE" = ( /obj/machinery/vending/loadout/accessory, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pF" = ( /obj/machinery/vending/loadout/clothing, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pG" = ( /obj/machinery/vending/loadout/overwear, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pH" = ( /obj/machinery/vending/loadout/uniform, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pI" = ( /obj/machinery/vending/loadout/costume, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pJ" = ( /obj/machinery/vending/loadout/loadout_misc, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "pK" = ( /obj/structure/cable/cyan{ @@ -8347,8 +8568,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/telecomms2) "pL" = ( /obj/structure/cable/cyan{ @@ -8362,6 +8585,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pM" = ( @@ -8379,6 +8605,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pN" = ( @@ -8396,21 +8625,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pO" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "pP" = ( /obj/machinery/account_database{ name = "CentComm Accounts database" }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "pQ" = ( /obj/machinery/telecomms/relay/preset/centcom/underdark, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "pR" = ( /obj/machinery/firealarm{ @@ -8419,33 +8652,79 @@ pixel_x = 4; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_3"; + name = "interior access button"; + pixel_x = 28; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pS" = ( -/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_3_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms2) "pT" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 + dir = 8; + frequency = 1380; + id_tag = "ws_dock_3_pump" }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_3_sensor"; + pixel_x = 0; + pixel_y = 25 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_3"; + pixel_y = -32; + req_one_access = list(101); + tag_airpump = "ws_dock_3_pump"; + tag_chamber_sensor = "ws_dock_3_sensor"; + tag_exterior_door = "ws_dock_3_outer"; + tag_interior_door = "ws_dock_3_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms2) "pU" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/doors/Doorext.dmi'; - icon_state = "door_locked"; - name = "Sealed Door" +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_3_outer"; + req_one_access = list(101) }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_3"; + name = "exterior access button"; + pixel_x = 5; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms2) "pV" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -8466,20 +8745,31 @@ icon_state = "tube1"; pixel_y = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pZ" = ( /obj/machinery/telecomms/hub/preset_cent, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qa" = ( /obj/machinery/computer/rdservercontrol{ @@ -8487,10 +8777,9 @@ dir = 1; name = "Master RnD Server Controller" }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/sign/department/telecoms, /turf/simulated/shuttle/wall/voidcraft/blue{ name = "small craft wall"; @@ -8524,7 +8813,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/cryotube) "qf" = ( /obj/structure/cable/cyan{ @@ -8535,7 +8824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qg" = ( /obj/structure/cable/cyan{ @@ -8546,22 +8835,22 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qh" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qk" = ( /obj/machinery/door/airlock/voidcraft/vertical, @@ -8569,7 +8858,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/cryotube) "ql" = ( /obj/structure/cable/cyan{ @@ -8581,10 +8870,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "qm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/sign/department/telecoms, /turf/simulated/shuttle/wall/voidcraft/blue{ name = "small craft wall"; @@ -8593,19 +8882,26 @@ /area/mothership/telecomms2) "qn" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/station_low, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qo" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/base_low, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "qq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "qr" = ( @@ -8622,6 +8918,10 @@ dir = 4; icon_state = "tube1" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "qs" = ( @@ -8634,52 +8934,24 @@ /area/mothership/telecomms2) "qt" = ( /obj/machinery/telecomms/bus/preset_cent, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qu" = ( /obj/machinery/r_n_d/server/centcom, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qv" = ( /obj/machinery/telecomms/processor/preset_cent, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qw" = ( /obj/machinery/telecomms/server/presets/centcomm, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) "qx" = ( /obj/machinery/telecomms/relay/preset/centcom, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms1) -"qy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) -"qz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) -"qA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) "qB" = ( /obj/structure/sign/department/eng, /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -8692,7 +8964,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/engineering) "qD" = ( /obj/structure/undies_wardrobe, @@ -8701,7 +8973,7 @@ icon_state = "tube1"; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qE" = ( /obj/effect/floor_decal/techfloor{ @@ -8733,7 +9005,7 @@ dir = 4; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qI" = ( /obj/machinery/door/airlock/engineeringatmos, @@ -8745,7 +9017,8 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, /area/mothership/engineering) "qJ" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -8753,45 +9026,25 @@ stripe_color = "#45b3d8" }, /area/mothership/engineering) -"qK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) -"qL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" - }, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) "qM" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/station_mid, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qN" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/station_high, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qO" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/midpoint, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qP" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/base_high, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qQ" = ( /obj/machinery/telecomms/relay/preset/centcom/tether/base_mid, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/greengrid, /area/mothership/telecomms2) "qR" = ( /obj/structure/particle_accelerator/end_cap{ @@ -8799,32 +9052,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) -"qS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) "qT" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "qU" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/machinery/power/thermoregulator, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "qV" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/machinery/meter, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "qW" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -8838,11 +9084,11 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "qX" = ( /obj/machinery/gear_painter, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "qY" = ( /obj/effect/floor_decal/techfloor{ @@ -8888,7 +9134,7 @@ /area/mothership/cryotube) "rc" = ( /obj/machinery/vending/loadout, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/cryotube) "rd" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -8907,7 +9153,8 @@ dir = 8; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "re" = ( /obj/structure/table/steel_reinforced, @@ -8923,16 +9170,16 @@ pixel_x = 0; pixel_y = 24 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rf" = ( /obj/structure/table/steel_reinforced, /obj/machinery/computer/skills, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rg" = ( /obj/structure/closet/crate/bin, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rh" = ( /obj/structure/particle_accelerator/end_cap{ @@ -8969,7 +9216,7 @@ /obj/item/weapon/storage/box/survival/space, /obj/item/weapon/storage/box/syndie_kit/space, /obj/item/weapon/storage/box/syndie_kit/space, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rl" = ( /obj/machinery/atmospherics/binary/passive_gate{ @@ -8977,19 +9224,20 @@ icon_state = "on"; unlocked = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rm" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rn" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "ro" = ( /obj/structure/table/steel_reinforced, @@ -9006,7 +9254,7 @@ dir = 8; icon_state = "computer" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rr" = ( /obj/structure/particle_accelerator/fuel_chamber{ @@ -9033,20 +9281,20 @@ "ru" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, /obj/machinery/meter, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rv" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rw" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rx" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9054,7 +9302,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/powered/pump/filled, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "ry" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9062,7 +9310,7 @@ dir = 4 }, /obj/machinery/space_heater, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rz" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9070,7 +9318,7 @@ dir = 4 }, /obj/machinery/pipedispenser/disposal/orderable, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rA" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9078,7 +9326,7 @@ dir = 4 }, /obj/machinery/pipedispenser/orderable, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rB" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9086,7 +9334,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rC" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -9094,7 +9342,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/engineering_personal, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rD" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply{ @@ -9102,14 +9350,15 @@ dir = 1 }, /obj/structure/closet/secure_closet/engineering_personal, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rE" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rF" = ( /obj/structure/table/steel_reinforced, @@ -9128,7 +9377,7 @@ /obj/item/modular_computer/console/preset/mercenary{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rI" = ( /obj/structure/particle_accelerator/power_box{ @@ -9138,7 +9387,7 @@ /area/mothership/telecomms2) "rJ" = ( /obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ +/obj/structure/window/phoronreinforced{ dir = 1 }, /turf/simulated/floor/reinforced/airless, @@ -9148,7 +9397,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/empty/nitrogen, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rL" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -9158,13 +9407,13 @@ /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rN" = ( /obj/machinery/atmospherics/omni/atmos_filter{ @@ -9173,14 +9422,14 @@ tag_south = 3; tag_west = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rO" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8; name = "Filter Bypass" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rP" = ( /obj/machinery/atmospherics/trinary/atmos_filter{ @@ -9188,7 +9437,7 @@ filter_type = 0; filtered_out = list("phoron") }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rQ" = ( /obj/machinery/atmospherics/trinary/atmos_filter{ @@ -9196,7 +9445,7 @@ filter_type = 3; filtered_out = list("carbon_dioxide") }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rR" = ( /obj/machinery/atmospherics/trinary/atmos_filter{ @@ -9204,42 +9453,46 @@ filter_type = 4; filtered_out = list("sleeping_agent") }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rS" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rT" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ icon_state = "map"; dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rV" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rW" = ( /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rX" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rY" = ( /obj/structure/closet/secure_closet/engineering_chief, @@ -9253,11 +9506,15 @@ /obj/item/weapon/rcd_ammo, /obj/item/weapon/rcd_ammo, /obj/item/weapon/rig/ce/equipped, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rZ" = ( /obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ +/obj/structure/window/phoronreinforced{ dir = 1 }, /turf/simulated/floor/reinforced/airless, @@ -9271,13 +9528,13 @@ dir = 8; icon_state = "tube1" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sc" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sd" = ( /obj/machinery/atmospherics/trinary/mixer{ @@ -9285,12 +9542,12 @@ node1_concentration = 0.21; node2_concentration = 0.79 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "se" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /obj/machinery/meter, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sf" = ( /obj/machinery/atmospherics/portables_connector{ @@ -9300,7 +9557,7 @@ dir = 5 }, /obj/machinery/portable_atmospherics/canister/empty/oxygen, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sg" = ( /obj/machinery/atmospherics/portables_connector{ @@ -9310,7 +9567,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sh" = ( /obj/machinery/atmospherics/portables_connector{ @@ -9320,7 +9577,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "si" = ( /obj/machinery/atmospherics/portables_connector{ @@ -9330,7 +9587,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/empty/sleeping_agent, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -9338,7 +9595,7 @@ dir = 4 }, /obj/machinery/meter, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sk" = ( /obj/machinery/atmospherics/unary/freezer{ @@ -9346,7 +9603,7 @@ icon_state = "freezer"; use_power = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sl" = ( /obj/machinery/atmospherics/unary/heater{ @@ -9354,31 +9611,32 @@ icon_state = "heater"; use_power = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sm" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/structure/closet/secure_closet/engineering_electrical, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/structure/closet/secure_closet/engineering_welding, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "so" = ( /obj/structure/closet/radiation, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sp" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sq" = ( /obj/structure/shuttle/engine/propulsion, @@ -9397,16 +9655,25 @@ /obj/item/weapon/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/weapon/storage/toolbox/emergency, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "ss" = ( /obj/machinery/vending/assist, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "st" = ( /obj/structure/particle_accelerator/end_cap{ anchored = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/mothership/engineering) "su" = ( @@ -9479,22 +9746,33 @@ pixel_x = 3; pixel_y = 3 }, -/obj/structure/table/steel_reinforced, /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/stack/material/glass/phoronglass, /obj/item/stack/material/glass/phoronglass, /obj/item/stack/rods, /obj/item/stack/rods, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/closet{ + name = "materials" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sv" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sw" = ( /obj/machinery/vending/engivend, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sx" = ( /obj/structure/closet/hydrant{ @@ -9509,11 +9787,15 @@ /obj/item/weapon/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/weapon/storage/toolbox/emergency, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sy" = ( /obj/machinery/vending/engineering, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sz" = ( /obj/structure/particle_accelerator/fuel_chamber{ @@ -9525,7 +9807,7 @@ /obj/structure/bed/pod, /obj/item/weapon/bedsheet/ce, /obj/structure/curtain/open/bed, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sB" = ( /obj/machinery/atmospherics/binary/pump/on{ @@ -9533,19 +9815,20 @@ target_pressure = 200 }, /obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sC" = ( /obj/machinery/vending/tool, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "sD" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_5_inner"; + req_one_access = list(101) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sE" = ( /obj/structure/particle_accelerator/power_box{ @@ -9561,28 +9844,45 @@ }, /area/mothership/engineering) "sG" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_4_inner"; + req_one_access = list(101) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sH" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = -32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1 + dir = 1; + frequency = 1380; + id_tag = "ws_dock_5_pump" }, /obj/machinery/light/small{ dir = 4; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_5_sensor"; + pixel_x = 25; + pixel_y = 0 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_5"; + pixel_x = -32; + req_one_access = list(101); + tag_airpump = "ws_dock_5_pump"; + tag_chamber_sensor = "ws_dock_5_sensor"; + tag_exterior_door = "ws_dock_5_outer"; + tag_interior_door = "ws_dock_5_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sI" = ( /obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ +/obj/structure/window/phoronreinforced{ dir = 1 }, /turf/simulated/floor/reinforced/airless, @@ -9598,24 +9898,50 @@ /turf/simulated/shuttle/plating/airless/carry, /area/mothership/armory) "sK" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - pixel_x = 32 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1 + dir = 1; + frequency = 1380; + id_tag = "ws_dock_4_pump" }, /obj/machinery/light/small{ dir = 8; pixel_x = 0 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ws_dock_4_sensor"; + pixel_x = -25; + pixel_y = 0 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ws_dock_4"; + pixel_x = 32; + req_one_access = list(101); + tag_airpump = "ws_dock_4_pump"; + tag_chamber_sensor = "ws_dock_4_sensor"; + tag_exterior_door = "ws_dock_4_outer"; + tag_interior_door = "ws_dock_4_inner" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sL" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/doors/Doorext.dmi'; - icon_state = "door_locked"; - name = "Sealed Door" +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_5_outer"; + req_one_access = list(101) }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_5"; + name = "exterior access button"; + pixel_x = -26; + pixel_y = -5; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sM" = ( /obj/structure/shuttle/engine/propulsion, @@ -9625,8 +9951,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - landmark_tag = "cruiser_port_dock"; - name = "Vessel port dock" + docking_controller = "ws_dock_6"; + landmark_tag = "ws_port_dock_2"; + name = "Cruiser Dock P2" }, /turf/space, /area/space) @@ -9634,8 +9961,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - landmark_tag = "cruiser_dock_starboard"; - name = "Vessel starboard dock" + docking_controller = "ws_dock_3"; + landmark_tag = "ws_starboard_dock_2"; + name = "Cruiser Dock S2" }, /turf/space, /area/space) @@ -9677,10 +10005,360 @@ /turf/space, /turf/simulated/shuttle/plating/airless/carry, /area/mothership/telecomms2) +"tK" = ( +/obj/item/modular_computer/console/preset/mercenary{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/bridge) +"tZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/wood, +/area/mothership/breakroom) +"uI" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/mothership/bridge) +"uS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_2_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/eva) +"wT" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/bridge) +"xn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/mothership/engineering) +"yi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_1_inner"; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/breakroom) +"zE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_4"; + name = "interior access button"; + pixel_x = -28; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/mothership/engineering) +"Am" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_5"; + name = "interior access button"; + pixel_x = 28; + pixel_y = -26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/mothership/engineering) +"Ct" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/eva) +"Do" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/mothership/breakroom) +"EG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, +/turf/simulated/floor/wood, +/area/mothership/breakroom) +"EK" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/mothership/hallway) "EP" = ( /obj/effect/overmap/visitable/ship/cruiser, /turf/space, /area/space) +"FC" = ( +/obj/machinery/ion_engine, +/turf/space, +/area/mothership/engineering) +"FW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, +/area/mothership/breakroom) +"FY" = ( +/obj/machinery/door/airlock/multi_tile/metal, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/eva) +"Gi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_8"; + name = "interior access button"; + pixel_x = 28; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/wood, +/area/mothership/breakroom) +"Kr" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/techmaint, +/area/mothership/hallway) +"PC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ws_dock_1"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/wood, +/area/mothership/breakroom) +"PT" = ( +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_4_outer"; + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_4"; + name = "exterior access button"; + pixel_x = 26; + pixel_y = -5; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/engineering) +"QI" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "ws_dock_2"; + landmark_tag = "ws_starboard_dock_1"; + name = "Cruiser Dock S1" + }, +/turf/space, +/area/space) +"QU" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "ws_dock_7"; + landmark_tag = "ws_port_dock_1"; + name = "Cruiser Dock P1" + }, +/turf/space, +/area/space) +"Su" = ( +/obj/machinery/shipsensors{ + health = 1000; + heat_reduction = 4.5; + max_health = 1000; + name = "military sensors suite" + }, +/turf/simulated/floor/reinforced/airless{ + name = "outer hull" + }, +/area/mothership/hydroponics) +"SE" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8; + icon_state = "map" + }, +/turf/simulated/floor/tiled/techmaint, +/area/mothership/hallway) +"SM" = ( +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_1_outer"; + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_1"; + name = "exterior access button"; + pixel_x = 26; + pixel_y = 5; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/breakroom) +"TZ" = ( +/obj/machinery/ion_engine, +/turf/space, +/area/mothership/telecomms2) +"Wi" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/mothership/hallway) +"WE" = ( +/obj/machinery/ion_engine, +/turf/space, +/area/mothership/telecomms1) +"Xh" = ( +/obj/item/modular_computer/console/preset/mercenary{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/bridge) +"Xy" = ( +/obj/machinery/status_display{ + pixel_y = 29 + }, +/obj/machinery/computer/ship/engines, +/turf/simulated/floor/tiled/steel_ridged, +/area/mothership/bridge) +"ZS" = ( +/obj/machinery/door/airlock/alien/blue/locked{ + frequency = 1380; + id_tag = "ws_dock_2_outer"; + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ws_dock_2"; + name = "exterior access button"; + pixel_x = 5; + pixel_y = 26; + req_one_access = list(101) + }, +/obj/structure/fans/hardlight, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/eva) +"ZZ" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/techmaint, +/area/mothership/hallway) (1,1,1) = {" aa @@ -17580,7 +18258,7 @@ mi on oB oL -pf +pV pt pV pe @@ -17680,7 +18358,7 @@ aa aa aa aa -aa +QU aa aa aa @@ -17722,7 +18400,7 @@ mi oo oC oM -pg +pe pu pW qt @@ -17864,7 +18542,7 @@ mi oo oC oM -pg +pe pv pX qu @@ -17872,7 +18550,7 @@ qR rj rt rJ -sa +WE aa aa aa @@ -18006,7 +18684,7 @@ oe op oD oN -pg +pe pw pX qv @@ -18099,7 +18777,7 @@ aa aa aa bc -cq +Su be bC bC @@ -18148,7 +18826,7 @@ of oq oE oO -pg +pe px pX qw @@ -18156,7 +18834,7 @@ qR rj rt rJ -sa +WE aa aa aa @@ -18242,7 +18920,7 @@ au au ae bd -bk +be bD bR bk @@ -18290,7 +18968,7 @@ og or oE oP -pg +pe py pY qx @@ -18432,18 +19110,18 @@ mi os oE oQ -pg +pe pz pZ -qy -qS -qS -qS -qS -qS -qS -qS -qK +qJ +qJ +qJ +qJ +qJ +qJ +qJ +qJ +qJ qJ qJ aa @@ -18521,8 +19199,8 @@ aa ad ai an -ao -ao +Gi +tZ ao aM bd @@ -18574,17 +19252,17 @@ mi ot oF oR -pg +pe pA qa -qz +qJ qT qT qT rK sb sr -rX +Am sD sH sL @@ -18664,7 +19342,7 @@ ae ab ae av -ao +Do ao aN bd @@ -18716,10 +19394,10 @@ nk ou oG oS -ph +pV pB qb -qA +qJ qU rk ru @@ -18806,7 +19484,7 @@ ag ab ao ao -ao +Do ao aO bd @@ -18858,8 +19536,8 @@ dz ov ov oT -pi -dj +dz +EK qc qB qV @@ -18948,7 +19626,7 @@ ae ae ap ao -ao +Do ao aP bd @@ -18963,14 +19641,14 @@ cX cr dk dx -dx -dx +Wi +Wi ev eM fc -dx +Wi fQ -dx +Wi dS gQ hc @@ -18990,17 +19668,17 @@ kG lz dx dS -dx -dx +Wi +Wi mU nl nE -dx -dx -dx +Wi +Wi +Wi oH oU -pj +fc pC qd qC @@ -19013,7 +19691,7 @@ st sz sE sI -sM +FC aa aa aa @@ -19090,7 +19768,7 @@ bc ac ao aw -ao +Do aG aQ bd @@ -19115,7 +19793,7 @@ fR fd gx dz -dj +EK hu hI if @@ -19129,7 +19807,7 @@ iv kE kV kG -dj +EK dz mb mc @@ -19232,7 +19910,7 @@ ab ae aq ax -ar +FW aH aR be @@ -19245,7 +19923,7 @@ cB cO cZ cr -dj +EK dz dP ec @@ -19257,7 +19935,7 @@ fS gh fd dz -dj +EK hu hJ ig @@ -19271,7 +19949,7 @@ iv kF kW kG -dj +EK dz mc mq @@ -19282,9 +19960,9 @@ mG mE oh mc -dj +EK oV -pl +pD pE qf qD @@ -19297,7 +19975,7 @@ st sz sE sI -sM +FC aa aa aa @@ -19387,7 +20065,7 @@ cC cO da de -dj +EK dA dP ed @@ -19399,7 +20077,7 @@ fS gi fd gR -dj +EK hv hK hu @@ -19413,20 +20091,20 @@ iv kG kX lm -dj +EK dA mc mr -mF +uI mW no no no oi mc -dj +EK oW -pl +pD pF qg qE @@ -19524,11 +20202,11 @@ bs bJ bV cg -ct +FY cD cP db -ct +FY dm dB dQ @@ -19540,23 +20218,23 @@ fx fS gj fd -gS +dz hd dS hL -dx -dx -dx -dx +Wi +Wi +Wi +Wi fe -dx -dx -dx -dx +Wi +Wi +Wi +Wi kY dS he -gS +dz mc ms mG @@ -19564,11 +20242,11 @@ mF np nG nT -np +Xh mc -dj +EK oX -pl +pD pG qh qF @@ -19666,11 +20344,11 @@ bt bK bW ch -cu +Ct cE cQ dc -cu +Ct dn dC dR @@ -19682,8 +20360,8 @@ fy fT gk fd -gS -dj +dz +EK dy dj gy @@ -19697,20 +20375,20 @@ ff gy dj dy -dj -gS +EK +dz mc -ms +wT mG mF nq nH nU -nq +tK mc -dj +EK oY -pl +pD pH qh qF @@ -19813,7 +20491,7 @@ cF cO dd cs -dj +EK dA dP eg @@ -19825,7 +20503,7 @@ fS gl fd gR -dj +EK hw hM hx @@ -19839,20 +20517,20 @@ hy kH kZ ln -dj +EK dA mc mr -mF +uI mX nr nr nr oj mc -dj +EK oZ -pl +pD pI qi qG @@ -19942,7 +20620,7 @@ ab ae aq ax -ar +FW aH aW bh @@ -19955,7 +20633,7 @@ cG cO cZ cr -dj +EK dD dP eh @@ -19967,7 +20645,7 @@ fU gm fd dz -dj +EK hx hN ih @@ -19981,10 +20659,10 @@ hy kI la kH -dj +EK dz mc -mq +Xy mH mY ns @@ -19992,9 +20670,9 @@ mG mH ok mc -dj +EK oV -pl +pD pJ qj qH @@ -20007,7 +20685,7 @@ st sz sE sI -sM +FC aa aa aa @@ -20084,7 +20762,7 @@ bc ac ao aB -ao +Do aK aX bi @@ -20097,7 +20775,7 @@ cA cO cY cr -dj +EK dz dO dP @@ -20134,7 +20812,7 @@ nF mc mc mb -dj +EK oW pk pD @@ -20226,7 +20904,7 @@ ae ae as ao -ao +Do ao aY bi @@ -20239,19 +20917,19 @@ cz cO cX cr -dk +ZZ dx dS -dx +Wi eB -dx +Wi fe fB fV +Wi +Wi dx -dx -dx -he +Kr hx hP ij @@ -20267,19 +20945,19 @@ lc kH lA lQ -dx -dx -dx -dx +Wi +Wi +Wi +Wi nu -dx +Wi nV -dx +Wi dS oI pa -pm -nV +fe +SE ql qI rd @@ -20291,7 +20969,7 @@ st sz sE sI -sM +FC aa aa aa @@ -20368,7 +21046,7 @@ ag ab at ao -ao +Do ao ao bj @@ -20420,14 +21098,14 @@ dz dy dz dj -pi -dj +dz +EK qc qJ re ro rF -rX +xn so st sz @@ -20510,7 +21188,7 @@ ae ab ae av -ao +Do ao aZ bi @@ -20562,14 +21240,14 @@ ol ow ol pb -pn +qs pK qm -qK +qJ rf rp rG -rX +xn rX sw sC @@ -20648,11 +21326,11 @@ aa aa aa aa -ad +SM am -an -ao -ao +yi +PC +EG ao ba bi @@ -20704,20 +21382,20 @@ lr ox oJ pc -po +pq pL qn -qz +qJ rg rq rH rY sp sx -rX +zE sG sK -sL +PT aa aa aa @@ -20846,18 +21524,18 @@ lr oy oK pd -po +pq pM qo -qL -qS -qS -qS -qS -qS -qS -qS -qA +qJ +qJ +qJ +qJ +qJ +qJ +qJ +qJ +qJ qJ qJ aa @@ -20946,7 +21624,7 @@ cc bk cr cs -cJ +uS cs cr dr @@ -20988,7 +21666,7 @@ lr oz oz oz -po +pq pN qp qM @@ -21130,7 +21808,7 @@ lr oz oz oz -po +pq pO qq qN @@ -21138,7 +21816,7 @@ rh rr rI rZ -sq +TZ aa aa aa @@ -21230,7 +21908,7 @@ aa aa aa cr -cH +ZS cr aa aa @@ -21272,7 +21950,7 @@ lr oz oz oz -po +pq pP qq qO @@ -21414,7 +22092,7 @@ lr oz oz oz -po +pq pQ qq qP @@ -21422,7 +22100,7 @@ rh rr rI rZ -sq +TZ aa aa aa @@ -21514,7 +22192,7 @@ aa aa aa aa -aa +QI aa aa aa @@ -21556,7 +22234,7 @@ lr oz oz oz -po +pq pR qr qQ @@ -21698,7 +22376,7 @@ lr oz oz oz -pp +qs pS qs pq diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 7e2bf1227b..8e060ed34c 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -13232,45 +13232,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -13374,45 +13374,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -13516,45 +13516,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -13658,45 +13658,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -13800,45 +13800,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -13942,45 +13942,45 @@ ap ap ap ap -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ap -ap -ap -ap -ap -ap ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -14084,6 +14084,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14116,13 +14120,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14226,6 +14226,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14258,13 +14262,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14368,6 +14368,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14400,13 +14404,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14510,6 +14510,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14542,13 +14546,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14652,6 +14652,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14684,13 +14688,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14794,6 +14794,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14826,13 +14830,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -14936,6 +14936,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -14968,13 +14972,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15078,6 +15078,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15110,13 +15114,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15220,6 +15220,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15252,13 +15256,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15362,6 +15362,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15394,13 +15398,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15504,6 +15504,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15536,13 +15540,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15646,6 +15646,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15678,13 +15682,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15788,6 +15788,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15820,13 +15824,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -15930,6 +15930,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -15962,13 +15966,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16072,6 +16072,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16104,13 +16108,9 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16214,6 +16214,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16246,13 +16250,9 @@ VI ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16356,6 +16356,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16388,13 +16392,9 @@ VI ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16498,6 +16498,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16530,13 +16534,9 @@ VI ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16640,6 +16640,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16672,13 +16676,9 @@ VI ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16782,6 +16782,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16814,13 +16818,9 @@ VI ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -16924,6 +16924,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -16956,13 +16960,9 @@ VI Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17066,6 +17066,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17098,13 +17102,9 @@ Xe Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17208,6 +17208,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17240,13 +17244,9 @@ Xf Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17350,6 +17350,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17382,13 +17386,9 @@ Xg Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17492,6 +17492,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17524,13 +17528,9 @@ Xh Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17634,6 +17634,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17666,13 +17670,9 @@ Zh Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17776,6 +17776,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17808,13 +17812,9 @@ WW Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -17918,6 +17918,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -17950,13 +17954,9 @@ VM Xi ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18060,6 +18060,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18092,13 +18096,9 @@ VM ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18202,6 +18202,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18234,13 +18238,9 @@ VM ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18344,6 +18344,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18376,13 +18380,9 @@ VM ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18486,6 +18486,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18518,13 +18522,9 @@ VM ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18628,6 +18628,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18660,13 +18664,9 @@ VM ae ae ae -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae ap ap ap @@ -18770,6 +18770,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18802,17 +18806,13 @@ VM VM ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -18912,6 +18912,10 @@ ap ap ap ap +ap +ae +ae +ae ae ae ae @@ -18944,17 +18948,13 @@ YP Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -19045,15 +19045,19 @@ ei ei fJ fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq ae ae ae @@ -19086,17 +19090,13 @@ YP Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -19187,18 +19187,22 @@ fA fA fU fZ +aq +uc +uc +uc +uc +uc +uc +uc +uc +uc +uc +uc +aq +ae +ae ae -uc -uc -uc -uc -uc -uc -uc -uc -uc -uc -uc ae ae ae @@ -19228,17 +19232,13 @@ XN Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -19329,18 +19329,22 @@ aL aL aL ar +aq +uc +ue +ue +uf +ue +ue +ue +uf +ue +ue +uc +aq +ae +ae ae -uc -ue -ue -uf -ue -ue -ue -uf -ue -ue -uc ae ae ae @@ -19370,17 +19374,13 @@ YQ Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -19471,7 +19471,7 @@ fK fR fR fZ -ae +aq uc uf uf @@ -19483,6 +19483,10 @@ uf uf uf uc +aq +ae +ae +ae ae ae ae @@ -19512,17 +19516,13 @@ YT Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -19613,18 +19613,22 @@ fK fR fR fZ +aq +uc +ue +ue +uf +ue +ue +ue +uf +ue +ue +uc +aq +ae +ae ae -uc -ue -ue -uf -ue -ue -ue -uf -ue -ue -uc ae ae ae @@ -19657,14 +19661,10 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -19755,18 +19755,22 @@ fK fR fR fZ +aq +ud +uf +uf +uf +uf +uf +uf +uf +uf +uf +ud +aq +ae +ae ae -ud -uf -uf -uf -uf -uf -uf -uf -uf -uf -ud ae ae ae @@ -19799,14 +19803,10 @@ Vd Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -19897,7 +19897,7 @@ fK fR fR fZ -ae +aq bc bc bc @@ -19909,8 +19909,12 @@ dh bc bc bc -ae aq +aq +ae +ae +ae +ae ae ae wl @@ -19941,14 +19945,10 @@ Zf Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20055,6 +20055,10 @@ ab aq ae ae +ae +ae +ae +ae wl Up Ut @@ -20083,14 +20087,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20197,6 +20197,10 @@ ac aq ae ae +ae +ae +ae +ae wl Us Vn @@ -20225,14 +20229,10 @@ Zq Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20339,6 +20339,10 @@ ad aq ae ae +ae +ae +ae +ae wl Ut Us @@ -20367,14 +20371,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20481,6 +20481,10 @@ ac aq ae ae +ae +ae +ae +ae wl wl Vo @@ -20509,14 +20513,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20623,6 +20623,10 @@ ag aq ae ae +ae +ae +ae +ae Vk Vk Vk @@ -20651,14 +20655,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20765,6 +20765,10 @@ ap aq ae ae +ae +ae +ae +ae Vk Vc Vz @@ -20793,14 +20797,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -20907,6 +20907,10 @@ aq aq ae ae +ae +ae +ae +ae Vk Vc Vc @@ -20935,14 +20939,10 @@ Zq Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -21049,6 +21049,10 @@ ap ap ae ae +ae +ae +ae +ae Vk Vf Vk @@ -21077,14 +21081,10 @@ WS Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -21191,6 +21191,10 @@ ap ap ae ae +ae +ae +ae +ae Vk Vb Vk @@ -21219,14 +21223,10 @@ Zg Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -21333,6 +21333,10 @@ ap ap ae ae +ae +ae +ae +ae Vk Vk Vk @@ -21361,14 +21365,10 @@ Vd Vd ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -21483,6 +21483,10 @@ ae ae ae ae +ae +ae +ae +ae Vg Wj Vg @@ -21503,14 +21507,10 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae ap ap ap @@ -21613,8 +21613,12 @@ hz hK hP fZ -ap -ap +ae +ae +ae +ae +ae +ae ae ae ae @@ -21642,17 +21646,13 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -21755,8 +21755,6 @@ hA hL hQ fZ -ap -ap ae ae ae @@ -21784,17 +21782,19 @@ ae ae ae ae -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ap ap ap @@ -21897,8 +21897,8 @@ hx hx hx fZ -ap -ap +ae +ae ae ae ae diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 0317648209..690f74677e 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1159,120 +1159,6 @@ /area/bigship/teleporter name = "Bigship Teleporter Room" -//////// Mothership areas //////// -/area/mothership - requires_power = 1 - flags = RAD_SHIELDED - base_turf = /turf/space - icon_state = "blue-red2" - -/area/mothership/breakroom - name = "Warship - Breakroom" - -/area/mothership/hydroponics - name = "Warship - Hydroponics" - -/area/mothership/kitchen - name = "Warship - Kitchen" - -/area/mothership/eva - name = "Warship - EVA" - -/area/mothership/bathroom1 - name = "Warship - Bathroom 1" - -/area/mothership/bathroom2 - name = "Warship - Bathroom 2" - -/area/mothership/dorm1 - name = "Warship - Dorm 1" - -/area/mothership/dorm2 - name = "Warship - Dorm 2" - -/area/mothership/dorm3 - name = "Warship - Dorm 3" - -/area/mothership/dorm4 - name = "Warship - Dorm 4" - -/area/mothership/dorm5 - name = "Warship - Dorm 5" - -/area/mothership/dorm6 - name = "Warship - Dorm 6" - -/area/mothership/chemistry - name = "Warship - Chemistry" - -/area/mothership/surgery - name = "Warship - Surgery" - -/area/mothership/vault - name = "Warship - Vault" - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/mothership/teleporter - name = "Warship - Teleporter Room" - -/area/mothership/security - name = "Warship - Security Equipment" - -/area/mothership/treatment - name = "Warship - Treatment Center" - -/area/mothership/medical - name = "Warship - Medical Equipment" - -/area/mothership/resleeving - name = "Warship - Resleeving" - -/area/mothership/morgue - name = "Warship - Morgue" - -/area/mothership/rnd - name = "Warship - Research" - -/area/mothership/robotics - name = "Warship - Robotics" - -/area/mothership/sechallway - name = "Warship - Security Hallway" - -/area/mothership/processing - name = "Warship - Processing" - -/area/mothership/warden - name = "Warship - Warden" - -/area/mothership/armory - name = "Warship - Armory" - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/mothership/bridge - name = "Warship - Bridge" - -/area/mothership/holodeck - name = "Warship - Holodeck Controls" -/area/mothership/holodeck/holo - name = "Warship - Holodeck" - icon_state = "dk_yellow" - -/area/mothership/cryotube - name = "Warship - Cryo chamber" - -/area/mothership/engineering - name = "Warship - Engineering" - -/area/mothership/hallway - name = "Warship - Main Hallway" - -/area/mothership/telecomms1 - name = "Warship - Telecommunications Main" - -/area/mothership/telecomms2 - name = "Warship - Telecommunications Relay" - //////// Abductor Areas //////// /area/unknown requires_power = 0 diff --git a/vorestation.dme b/vorestation.dme index 23605f0fd1..45e9abd654 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -781,6 +781,7 @@ #include "code\game\machinery\partslathe_vr.dm" #include "code\game\machinery\pda_multicaster.dm" #include "code\game\machinery\portable_turret.dm" +#include "code\game\machinery\portable_turret_vr.dm" #include "code\game\machinery\recharger.dm" #include "code\game\machinery\rechargestation.dm" #include "code\game\machinery\requests_console.dm"