cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6935 from VOREStation/vplk-escape-controller

Browse Source 
Remove emergencyShuttle as a process controller
This commit is contained in:
Atermonera
2020-04-06 23:08:57 -07:00
committed by VirgoBot
parent 91e161a73b
commit 19133df3bf
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/Processes/emergencyShuttle.dm
View File

@@ -1,9 +0,0 @@
/datum/controller/process/emergencyShuttle/setup()
name = "emergency shuttle"
schedule_interval = 20 // every 2 seconds
if(!emergency_shuttle)
emergency_shuttle = new
/datum/controller/process/emergencyShuttle/doWork()
emergency_shuttle.process()

6
code/controllers/emergency_shuttle_controller.dm
View File

@@ -2,7 +2,7 @@
// Controls the emergency shuttle // Controls the emergency shuttle
var/global/datum/emergency_shuttle_controller/emergency_shuttle var/global/datum/emergency_shuttle_controller/emergency_shuttle = new
/datum/emergency_shuttle_controller /datum/emergency_shuttle_controller
var/datum/shuttle/autodock/ferry/emergency/shuttle // Set in shuttle_emergency.dm TODO - is it really? var/datum/shuttle/autodock/ferry/emergency/shuttle // Set in shuttle_emergency.dm TODO - is it really?
@@ -75,8 +75,10 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
/datum/emergency_shuttle_controller/proc/set_launch_countdown(var/seconds) /datum/emergency_shuttle_controller/proc/set_launch_countdown(var/seconds)
wait_for_launch = 1 wait_for_launch = 1
launch_time = world.time + seconds*10 launch_time = world.time + seconds*10
START_PROCESSING(SSprocessing, src)
/datum/emergency_shuttle_controller/proc/stop_launch_countdown() /datum/emergency_shuttle_controller/proc/stop_launch_countdown()
STOP_PROCESSING(SSprocessing, src)
wait_for_launch = 0 wait_for_launch = 0
//calls the shuttle for an emergency evacuation //calls the shuttle for an emergency evacuation
@@ -120,7 +122,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
/datum/emergency_shuttle_controller/proc/recall() /datum/emergency_shuttle_controller/proc/recall()
if (!can_recall()) return if (!can_recall()) return
wait_for_launch = 0 stop_launch_countdown()
shuttle.cancel_launch(src) shuttle.cancel_launch(src)
if (evac) if (evac)

1
vorestation.dme
View File

@@ -222,7 +222,6 @@
#include "code\controllers\subsystem.dm" #include "code\controllers\subsystem.dm"
#include "code\controllers\verbs.dm" #include "code\controllers\verbs.dm"
#include "code\controllers\observer_listener\atom\observer.dm" #include "code\controllers\observer_listener\atom\observer.dm"
#include "code\controllers\Processes\emergencyShuttle.dm"
#include "code\controllers\Processes\ticker.dm" #include "code\controllers\Processes\ticker.dm"
#include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm"