From 540ccbaaee827161c3afe7433e2a49c627eab0f1 Mon Sep 17 00:00:00 2001 From: Woodratt Date: Wed, 12 Jan 2022 16:11:03 -0800 Subject: [PATCH] Small shuttle fixes - Fixes Large Escape Pods not launching - Fixes for missing roofs on several shuttles --- maps/cynosure/cynosure-2.dmm | 7 ++----- maps/cynosure/cynosure-3.dmm | 7 ++----- maps/cynosure/cynosure_shuttles.dm | 10 +++++++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index 196b748533..40bf92853f 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -15515,10 +15515,6 @@ "heM" = ( /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) -"heS" = ( -/obj/effect/shuttle_landmark/cynosure/large_escape_pod1/station, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1/station) "heZ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -24639,6 +24635,7 @@ pixel_y = -26; tag_door = "large_escape_pod_1_hatch" }, +/obj/effect/shuttle_landmark/cynosure/large_escape_pod1/station, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1/station) "lyg" = ( @@ -81795,7 +81792,7 @@ cei nNo nUW qdT -heS +qdT itc dof cHr diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index 31e9babc2a..b44c5b033e 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -14635,10 +14635,6 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) -"jjp" = ( -/obj/effect/shuttle_landmark/cynosure/large_escape_pod2/station, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod2/station) "jjB" = ( /obj/structure/railing{ dir = 4 @@ -23579,6 +23575,7 @@ pixel_y = -26; tag_door = "large_escape_pod_2_hatch" }, +/obj/effect/shuttle_landmark/cynosure/large_escape_pod2/station, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod2/station) "pwG" = ( @@ -64096,7 +64093,7 @@ bFA efC nsL uxm -jjp +uxm szd cRp kRo diff --git a/maps/cynosure/cynosure_shuttles.dm b/maps/cynosure/cynosure_shuttles.dm index 6614402000..f7c5f159b9 100644 --- a/maps/cynosure/cynosure_shuttles.dm +++ b/maps/cynosure/cynosure_shuttles.dm @@ -67,6 +67,7 @@ "nav_wilderness" ) docking_controller_tag = "centcom_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, Transport Shuttle is approaching Cynosure Station." departure_message = "Attention, Transport Shuttle is departing Cynosure Station." @@ -91,6 +92,7 @@ "nav_wilderness" ) docking_controller_tag = "admin_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, Administration Shuttle is approaching Cynosure Station." departure_message = "Attention, Administration Shuttle is departing Cynosure Station." @@ -119,6 +121,7 @@ "nav_wilderness" ) docking_controller_tag = "response_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, the Emergency Response Team's shuttle is approaching Cynosure Station." departure_message = "Attention, the Emergency Response Team's shuttle is departing Cynosure Station." @@ -141,6 +144,7 @@ "nav_wilderness" ) docking_controller_tag = "trade_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, Beruang is approaching Cynosure Station." departure_message = "Attention, Beruang is departing Cynosure Station." @@ -170,6 +174,7 @@ "nav_wilderness" ) docking_controller_tag = "ninja_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, unknown shuttle is approaching Cynosure Station." departure_message = "Attention, unknown shuttle is departing Cynosure Station." @@ -196,6 +201,7 @@ "nav_wilderness" ) docking_controller_tag = "skipjack_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, unknown shuttle is approaching Cynosure Station." departure_message = "Attention, unknown shuttle is departing Cynosure Station." @@ -222,6 +228,7 @@ "nav_wilderness" ) docking_controller_tag = "merc_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, unknown shuttle is approaching Cynosure Station." departure_message = "Attention, unknown shuttle is departing Cynosure Station." @@ -246,6 +253,7 @@ "nav_wilderness" ) docking_controller_tag = "merc_elite_shuttle" + ceiling_type = /turf/simulated/floor/reinforced announcer = "Automated Traffic Control" arrival_message = "Attention, unknown shuttle is approaching Cynosure Station." departure_message = "Attention, unknown shuttle is departing Cynosure Station." @@ -424,7 +432,7 @@ ESCAPE_POD(1) docking_controller_tag = "expshuttle_docker" shuttle_area = list(/area/shuttle/exploration/general, /area/shuttle/exploration/cockpit, /area/shuttle/exploration/cargo) fuel_consumption = 3 - ceiling_type = /turf/simulated/floor/reinforced/airless + ceiling_type = /turf/simulated/floor/reinforced /obj/effect/overmap/visitable/ship/landable/explorer_shuttle name = "Exploration Shuttle"