From deb99cc8de6fb5d829860a3da24bf62b6efc210e Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 17:54:24 +0200 Subject: [PATCH] shuttle fixes --- .../shuttles/exploration/exploration_corg.dmm | 43 ++++++------------- .../exploration/exploration_delta.dmm | 6 ++- .../exploration/exploration_fland.dmm | 7 +-- .../shuttles/exploration/exploration_kilo.dmm | 2 +- .../shuttles/exploration/exploration_rad.dmm | 2 +- .../exploration/exploration_shuttle.dmm | 16 ++----- 6 files changed, 24 insertions(+), 52 deletions(-) diff --git a/_maps/shuttles/exploration/exploration_corg.dmm b/_maps/shuttles/exploration/exploration_corg.dmm index 1e41747bababb..a64e2d453943c 100644 --- a/_maps/shuttles/exploration/exploration_corg.dmm +++ b/_maps/shuttles/exploration/exploration_corg.dmm @@ -239,7 +239,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/shuttle{ req_access_txt = "49"; - name = "Exploration Tank Storage" + name = "Shuttle Tank Storage" }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) @@ -289,7 +289,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -325,7 +325,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -457,7 +457,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -610,7 +610,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/shuttle/glass{ autoclose = 0.1; - name = "Exploration Engine"; + name = "Shuttle Engine"; req_access_txt = "49" }, /obj/effect/turf_decal/stripes/closeup{ @@ -618,15 +618,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) -"BW" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2/flipped, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/exploration) "CY" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/internals, @@ -704,7 +695,6 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Il" = ( @@ -719,7 +709,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -916,7 +906,7 @@ "Pm" = ( /obj/machinery/door/airlock/shuttle{ req_access_txt = "49"; - name = "Exploration Storage" + name = "Shuttle Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -939,7 +929,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/shuttle{ - name = "Shuttle cockpit"; + name = "Shuttle Cockpit"; req_access_txt = "49" }, /obj/effect/turf_decal/stripes/closeup{ @@ -960,7 +950,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -970,12 +960,6 @@ /area/shuttle/exploration) "QN" = ( /obj/machinery/firealarm/directional/south, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2/flipped, /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "Ri" = ( @@ -986,7 +970,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -1080,7 +1064,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -1111,7 +1095,6 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "Wp" = ( -/obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/west, /obj/machinery/airalarm/directional/south{ locked = 0 @@ -1196,7 +1179,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -1441,7 +1424,7 @@ jB Us pz QN -BW +df uv UJ ug diff --git a/_maps/shuttles/exploration/exploration_delta.dmm b/_maps/shuttles/exploration/exploration_delta.dmm index 7dbb465913c17..0d92ddd9f8301 100644 --- a/_maps/shuttles/exploration/exploration_delta.dmm +++ b/_maps/shuttles/exploration/exploration_delta.dmm @@ -38,7 +38,9 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/shuttle/glass, +/obj/machinery/door/airlock/shuttle/glass{ + name = "Exploration Cockpit" + }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "gl" = ( @@ -201,7 +203,7 @@ }, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm index 5a5dd0f053b54..340a2fb967152 100644 --- a/_maps/shuttles/exploration/exploration_fland.dmm +++ b/_maps/shuttles/exploration/exploration_fland.dmm @@ -649,11 +649,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/closeup, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/janitorialcart{ dir = 8 }, @@ -749,7 +744,7 @@ dir = 5 }, /turf/template_noop, -/area/template_noop) +/area/shuttle/exploration) "FP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/exploration/exploration_kilo.dmm b/_maps/shuttles/exploration/exploration_kilo.dmm index 42a6291138155..8fdec4caa3242 100644 --- a/_maps/shuttles/exploration/exploration_kilo.dmm +++ b/_maps/shuttles/exploration/exploration_kilo.dmm @@ -224,7 +224,7 @@ }, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 diff --git a/_maps/shuttles/exploration/exploration_rad.dmm b/_maps/shuttles/exploration/exploration_rad.dmm index 2bb6b2e860129..0c0bff3962b9e 100644 --- a/_maps/shuttles/exploration/exploration_rad.dmm +++ b/_maps/shuttles/exploration/exploration_rad.dmm @@ -116,7 +116,7 @@ }, /obj/machinery/door/airlock/external/glass{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) diff --git a/_maps/shuttles/exploration/exploration_shuttle.dmm b/_maps/shuttles/exploration/exploration_shuttle.dmm index 6f8be0e8490d9..4caa76f5b848c 100644 --- a/_maps/shuttles/exploration/exploration_shuttle.dmm +++ b/_maps/shuttles/exploration/exploration_shuttle.dmm @@ -242,7 +242,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/door/airlock/shuttle/glass, +/obj/machinery/door/airlock/shuttle/glass{ + name = "Shuttle Cockpit" + }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/mineral/plastitanium, @@ -358,13 +360,7 @@ }, /obj/effect/turf_decal/box, /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "Co" = ( @@ -469,10 +465,6 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "WX" = ( -/obj/machinery/newscaster{ - pixel_x = 32; - pixel_y = 1 - }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/stripes/line, /obj/effect/spawner/lootdrop/maintenance/three, @@ -543,7 +535,7 @@ }, /obj/machinery/door/airlock/external{ req_access_txt = "49"; - name = "Exploration Shuttle airlock" + name = "Exploration Shuttle Airlock" }, /turf/open/floor/plating, /area/shuttle/exploration)