Merge pull request #8366 from Woodratt/evacpodfix

Small shuttle fixes
This commit is contained in:
Atermonera
2022-01-15 20:20:44 -08:00
committed by GitHub
3 changed files with 13 additions and 11 deletions
+2 -5
View File
@@ -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
+2 -5
View File
@@ -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
+9 -1
View File
@@ -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"