From 0d032d34eb5f4ea83e75e66d7833880444ed8671 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Apr 2021 13:13:14 -0400 Subject: [PATCH] Excursion Shuttle Tweaks -Changes the pilot's room window to tintable -Moves the pilot cycler to somewhere less cramped -Adds access requirements to the fuel and atmos rooms on the excursion shuttle -Rearranges some things --- maps/offmap_vr/om_ships/shelter_6.dmm | 1 - maps/tether/tether-07-station3.dmm | 316 ++++++++++++++------------ 2 files changed, 169 insertions(+), 148 deletions(-) diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index 132d4b6c49c..6d8637ad4ee 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -1380,7 +1380,6 @@ /obj/item/device/radio/uplink, /obj/item/device/spaceflare, /obj/item/device/spaceflare, -/obj/item/device/perfect_tele/frontier/unknown/six, /obj/item/device/healthanalyzer/phasic, /obj/item/device/bluespaceradio/tether_prelinked, /obj/item/weapon/cat_box, diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index aeb496cda4e..e374cb30107 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2270,20 +2270,23 @@ /turf/simulated/floor/tiled/white, /area/security/security_bathroom) "aex" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -2784,10 +2787,23 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "afi" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, -/obj/structure/curtain/open/bed, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "pilot_room" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "afj" = ( /obj/structure/disposalpipe/segment{ @@ -3327,12 +3343,17 @@ /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "agd" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/brown, +/obj/structure/curtain/open/bed, +/obj/machinery/button/windowtint{ + id = "pilot_room"; + pixel_x = 26; + pixel_y = 6; + req_access = list() }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/cargo) "age" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3354,31 +3375,32 @@ /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) "agf" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/firealarm{ dir = 8; - icon_state = "propulsion_l" + pixel_x = -24 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/general) "agg" = ( /turf/simulated/floor/airless, /area/space) "agh" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/general) +"agi" = ( +/obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) -"agi" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" - }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/general) "agj" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -3391,6 +3413,23 @@ }, /turf/simulated/floor/airless, /area/space) +"agk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/shuttle_sensor{ + dir = 5; + id_tag = "shuttlesens_exp_int"; + pixel_y = -24 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/general) "agl" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -3401,6 +3440,83 @@ /obj/structure/grille, /turf/space, /area/space) +"agn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light, +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/excursion/general) +"ago" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/excursion/general) +"agp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/excursion/general) +"agq" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/general) +"agr" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"ags" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"agt" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "agx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ frequency = 1379; @@ -4088,25 +4204,6 @@ }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) -"aiY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp_int"; - pixel_y = -24 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "ajf" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -4532,27 +4629,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"akx" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "akz" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -19688,27 +19764,6 @@ /obj/item/device/binoculars, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) -"aUl" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "aUn" = ( /obj/structure/cable/green{ d1 = 4; @@ -22827,10 +22882,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"iPK" = ( -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "iUO" = ( /obj/structure/barricade, /turf/simulated/floor, @@ -23163,14 +23214,6 @@ "kTn" = ( /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) -"kUK" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "kVs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -23696,14 +23739,6 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) -"opv" = ( -/obj/structure/handrail{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "opL" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24605,19 +24640,6 @@ }, /turf/simulated/floor/plating/eris/under, /area/shuttle/medivac/general) -"uVS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/structure/table/steel, -/obj/machinery/recharger, -/obj/machinery/light, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "uZd" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ dir = 4 @@ -36105,16 +36127,16 @@ aaY aaY aaR oNI -iPK +agf rFo -aex +agp jsf aWn aUJ aXb afT aez -agd +agq ams aXq abe @@ -36256,7 +36278,7 @@ wRt eug afT aeG -agd +agq ams aXq abe @@ -36383,14 +36405,14 @@ abe abX acE acK -aeI afi +agd afx aaY aVi hTW adj -akx +ago adj adj wOI @@ -36538,7 +36560,7 @@ adj hNx kTn ckU -aiY +agk xiw acK ams @@ -36961,7 +36983,7 @@ isN aXD hyH adj -kUK +agh ydG xCq qJK @@ -37097,7 +37119,7 @@ aaY abL aRZ aaY -aUl +aex adj adj adj @@ -37105,8 +37127,8 @@ wOI adj aXS rLd -opv -uVS +agi +agn xiw acK ams @@ -37392,7 +37414,7 @@ ikk efQ wPF aeG -agd +agq ams aSx krj @@ -37534,7 +37556,7 @@ iEV tEV xiw aeH -agd +agq ams eAm abe @@ -39571,11 +39593,11 @@ avt avt adD aZS -agf -agh -agh -agh -agi +agr +ags +ags +ags +agt baB adD avt