From 79a5fde86a7ebf9f935466fb3bf06227a536ef19 Mon Sep 17 00:00:00 2001 From: fighterslam Date: Wed, 28 Aug 2024 13:50:08 -0500 Subject: [PATCH] typo fix, wallmount adjustments --- .../shuttles/nanotrasen/nanotrasen_ranger.dmm | 170 ++++++++++-------- .../MapData/shuttles/nanotrasen_ranger.dm | 2 +- 2 files changed, 93 insertions(+), 79 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 983f5f70e7a0..fbacaac00232 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -74,6 +74,7 @@ /obj/effect/turf_decal/corner/opaque/vired/three_quarters{ dir = 4 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "aG" = ( @@ -549,11 +550,9 @@ /turf/template_noop, /area/template_noop) "eo" = ( -/obj/machinery/computer/helm/viewscreen/directional/west, /obj/machinery/camera/autoname{ dir = 5 }, -/obj/structure/closet/crate/bin, /obj/structure/railing{ dir = 4; layer = 4.1 @@ -561,6 +560,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/structure/closet/emcloset/wall/directional/west, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "er" = ( @@ -1340,7 +1340,6 @@ pixel_x = 7; pixel_y = -20 }, -/obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/techfloor{ dir = 1 }, @@ -1350,6 +1349,7 @@ /obj/effect/turf_decal/corner/opaque/lightgrey{ dir = 10 }, +/obj/machinery/computer/cryopod/directional/west, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "ks" = ( @@ -1449,7 +1449,6 @@ dir = 4; railing_color = "#0C119E" }, -/obj/machinery/computer/cryopod/directional/south, /obj/machinery/recharge_station, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) @@ -1617,6 +1616,9 @@ /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 8 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "my" = ( @@ -2159,7 +2161,6 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "rX" = ( -/obj/machinery/airalarm/directional/west, /obj/structure/railing{ dir = 5; layer = 4.1 @@ -2167,6 +2168,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, +/obj/structure/closet/firecloset/wall/directional/west, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "rZ" = ( @@ -2258,6 +2260,11 @@ "sJ" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) +"sP" = ( +/obj/structure/crate_shelf, +/obj/machinery/light/dim/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "sR" = ( /obj/machinery/light/dim/directional/south, /obj/effect/turf_decal/siding/red/end, @@ -2441,7 +2448,8 @@ pixel_x = -21; name = "Shutters"; id = "Ranger_SB_maint_shut"; - req_ship_access = 1 + req_ship_access = 1; + pixel_y = 5 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -2619,6 +2627,9 @@ /obj/structure/sign/nanotrasen/ns{ pixel_x = 32 }, +/obj/machinery/camera/autoname{ + dir = 10 + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "vp" = ( @@ -2650,10 +2661,6 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "vz" = ( -/obj/machinery/light/dim/directional/south, -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/structure/closet/crate/hydroponics{ name = "Sustenance Crate" }, @@ -2667,6 +2674,7 @@ /obj/item/storage/ration/beef_goulash, /obj/item/storage/ration/beef_strips, /obj/item/storage/ration/fried_fish, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech, /area/ship/cargo) "vB" = ( @@ -2752,9 +2760,6 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 24 - }, /obj/effect/turf_decal/borderfloorwhite{ dir = 4 }, @@ -2986,7 +2991,7 @@ /obj/machinery/button/shieldwallgen{ dir = 8; pixel_x = 20; - pixel_y = -7; + pixel_y = 9; id = "AI_Core_Field_Engi" }, /obj/machinery/button/door{ @@ -3157,6 +3162,12 @@ name = "Cargo Bay"; id = "Ranger_Cargo_Door" }, +/obj/machinery/button/door{ + name = "Cargo Bay Shutters"; + id = "Ranger_Cargo_Door"; + pixel_y = 23; + req_ship_access = 1 + }, /turf/open/floor/plasteel/white, /area/ship/cargo) "zF" = ( @@ -3210,14 +3221,14 @@ dir = 1 }, /obj/machinery/button/door{ - pixel_y = 19; - pixel_x = 24; + pixel_y = 20; + pixel_x = -5; name = "Starboard Corridor Shutters"; id = "RangerStarboardShutters" }, /obj/machinery/button/door{ - pixel_y = 27; - pixel_x = 24; + pixel_y = 20; + pixel_x = 5; name = "Port Corridor Shutters"; id = "RangerPortShutters" }, @@ -3613,6 +3624,32 @@ /obj/structure/table/reinforced{ color = "#8A9397" }, +/obj/machinery/button/door{ + id = "SecShutters"; + name = "Privacy Shutters"; + layer = 2.92; + req_ship_access = 1; + req_access_txt = "1"; + pixel_x = -5; + pixel_y = 10 + }, +/obj/machinery/button/door{ + id = "CellHallShutters"; + name = "Cell Hall Shutters"; + req_access_txt = "1"; + req_ship_access = 1; + pixel_x = -5; + pixel_y = 2; + layer = 2.91 + }, +/obj/machinery/button/door{ + pixel_y = -6; + pixel_x = -5; + id = "SecCellWindowShutters"; + name = "Cell Window Shutters"; + req_access_txt = "1"; + req_ship_access = 1 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "DE" = ( @@ -3680,15 +3717,6 @@ /area/ship/maintenance/starboard) "DZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -20; - name = "Cargo Bay Shutters"; - id = "Ranger_Cargo_Door"; - pixel_y = 1; - req_ship_access = 1 - }, -/obj/machinery/airalarm/directional/north, /obj/structure/filingcabinet/double, /turf/open/floor/plasteel/tech, /area/ship/cargo) @@ -4014,12 +4042,14 @@ /area/ship/medical) "GE" = ( /obj/structure/table/optable, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/shower{ layer = 2.4; name = "Emergency Coolant Sprayer" }, /obj/effect/turf_decal/borderfloorwhite/full, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 24 + }, /turf/open/floor/noslip, /area/ship/medical) "GG" = ( @@ -4130,6 +4160,13 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/port) +"HP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/poddoor/shutters/preopen, +/turf/open/floor/plasteel/stairs{ + color = "#8A9397" + }, +/area/ship/crew/cryo) "HZ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -4362,10 +4399,10 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Kl" = ( -/obj/structure/closet/emcloset/wall/directional/west, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Kt" = ( @@ -4497,6 +4534,16 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering) +"LT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/poddoor/shutters/preopen, +/turf/open/floor/plasteel/stairs{ + color = "#8A9397" + }, +/area/ship/crew/cryo) "LU" = ( /obj/machinery/door/poddoor/shutters{ dir = 4; @@ -4736,6 +4783,9 @@ /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 8 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "MW" = ( @@ -4975,19 +5025,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "OK" = ( -/obj/machinery/light_switch{ - pixel_x = -7; - pixel_y = 21 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/button/door{ - dir = 8; - pixel_x = 20; - name = "Cargo Bay Shutters"; - id = "Ranger_Cargo_Door"; - pixel_y = 1; - req_ship_access = 1 - }, /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner, /obj/machinery/autolathe, /obj/item/disk/design_disk/ammo_c9mm, @@ -5253,10 +5291,10 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/cargo) "Sv" = ( -/obj/structure/closet/firecloset/wall/directional/west, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "SC" = ( @@ -5366,7 +5404,8 @@ pixel_x = 26; id = "AiCore"; name = "Core Access"; - req_access_txt = "20" + req_access_txt = "20"; + pixel_y = 8 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 5 @@ -5565,37 +5604,7 @@ dir = 4; name = "tactical swivel chair" }, -/obj/machinery/button/door{ - pixel_y = -39; - pixel_x = 9; - id = "SecCellWindowShutters"; - name = "Cell Window Shutters"; - req_access_txt = "1"; - req_ship_access = 1; - dir = 1 - }, -/obj/machinery/button/door{ - pixel_x = 9; - id = "CellHallShutters"; - name = "Cell Hall Shutters"; - pixel_y = -31; - req_access_txt = "1"; - req_ship_access = 1; - dir = 1 - }, -/obj/machinery/button/door{ - pixel_y = -23; - pixel_x = 9; - id = "SecShutters"; - name = "Privacy Shutters"; - layer = 2.91; - req_ship_access = 1; - req_access_txt = "1"; - dir = 1 - }, -/obj/item/radio/intercom/directional/south{ - pixel_x = -7 - }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "VQ" = ( @@ -5609,7 +5618,6 @@ /obj/structure/cable{ icon_state = "0-6" }, -/obj/structure/table/rolling, /obj/structure/railing{ dir = 4; layer = 4.1 @@ -5617,6 +5625,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Wj" = ( @@ -5812,6 +5821,10 @@ /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "XQ" = ( @@ -5851,6 +5864,7 @@ dir = 8 }, /obj/structure/table/chem, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) "XT" = ( @@ -6738,7 +6752,7 @@ JR Iy ym VC -VC +HP EL ml Tz @@ -6812,7 +6826,7 @@ JR tb mQ rq -rq +LT Zs pf jA @@ -7096,7 +7110,7 @@ DZ So Eq lU -gL +sP XT zW zW diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm index 8d88ffc57812..a60625128a69 100644 --- a/code/game/MapData/shuttles/nanotrasen_ranger.dm +++ b/code/game/MapData/shuttles/nanotrasen_ranger.dm @@ -264,7 +264,7 @@ "} /obj/item/disk/holodisk/lp/aid/rescue - name = "Aid Mission Rescure" + name = "Aid Mission Rescue" desc = "A holodisk containing an aid mission for the LP." preset_image_type = /datum/preset_holoimage/commissioner preset_record_text = {"