cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports https://github.com/PolarisSS13/Polaris/pull/6147

Browse Source
This commit is contained in:
Unknown
2019-05-01 20:55:25 -04:00
parent de5f932d6e
commit 34457953cb
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/emergency_shuttle_controller.dm
View File

@@ -35,7 +35,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
if (!shuttle.location) //leaving from the station if (!shuttle.location) //leaving from the station
//launch the pods! //launch the pods!
for (var/datum/shuttle/ferry/escape_pod/pod in escape_pods) for (var/EP in escape_pods)
var/datum/shuttle/ferry/escape_pod/pod
if(istype(escape_pods[EP], /datum/shuttle/ferry/escape_pod))
pod = escape_pods[EP]
else
continue
if (!pod.arming_controller || pod.arming_controller.armed) if (!pod.arming_controller || pod.arming_controller.armed)
pod.launch(src) pod.launch(src)
@@ -57,7 +62,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
//arm the escape pods //arm the escape pods
if (evac) if (evac)
for (var/datum/shuttle/ferry/escape_pod/pod in escape_pods) for (var/EP in escape_pods)
var/datum/shuttle/ferry/escape_pod/pod
if(istype(escape_pods[EP], /datum/shuttle/ferry/escape_pod))
pod = escape_pods[EP]
else
continue
if (pod.arming_controller) if (pod.arming_controller)
pod.arming_controller.arm() pod.arming_controller.arm()

2
code/modules/shuttles/escape_pods.dm
View File

@@ -150,10 +150,8 @@
/datum/computer/file/embedded_program/docking/simple/escape_pod/ready_for_docking() /datum/computer/file/embedded_program/docking/simple/escape_pod/ready_for_docking()
return 1 return 1
/* VOREStation Removal
/datum/computer/file/embedded_program/docking/simple/escape_pod/finish_docking() /datum/computer/file/embedded_program/docking/simple/escape_pod/finish_docking()
return //don't do anything - the doors only open when the pod is armed. return //don't do anything - the doors only open when the pod is armed.
*/
/datum/computer/file/embedded_program/docking/simple/escape_pod/prepare_for_undocking() /datum/computer/file/embedded_program/docking/simple/escape_pod/prepare_for_undocking()
eject_time = world.time + eject_delay*10 eject_time = world.time + eject_delay*10