From 7b431ad2b59f316c96e6ba36cbf909ec3bd63373 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 26 Mar 2020 19:19:47 -0400 Subject: [PATCH] Remove emergencyShuttle process controller. Just use SSprocessing instead. - The emergencyShuttle process controller (/datum/controller/process/emergencyShuttle) was just a wrapper around the true workhorse emergency_shuttle anyway. - The emergency_shuttle (/datum/emergency_shuttle_controller) is the actual controller and it only needs to process during the tiny fraction of the round when the shuttle is getting ready to launch. Therefore we leave it non-processing, and just register/deregister with SSprocessing when it actually needs to. --- code/controllers/Processes/emergencyShuttle.dm | 9 --------- code/controllers/emergency_shuttle_controller.dm | 6 ++++-- polaris.dme | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 code/controllers/Processes/emergencyShuttle.dm diff --git a/code/controllers/Processes/emergencyShuttle.dm b/code/controllers/Processes/emergencyShuttle.dm deleted file mode 100644 index e7289311b9..0000000000 --- a/code/controllers/Processes/emergencyShuttle.dm +++ /dev/null @@ -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() diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 54f97e2060..05f6fe0c6d 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -2,7 +2,7 @@ // 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 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) wait_for_launch = 1 launch_time = world.time + seconds*10 + START_PROCESSING(SSprocessing, src) /datum/emergency_shuttle_controller/proc/stop_launch_countdown() + STOP_PROCESSING(SSprocessing, src) wait_for_launch = 0 //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() if (!can_recall()) return - wait_for_launch = 0 + stop_launch_countdown() shuttle.cancel_launch(src) if (evac) diff --git a/polaris.dme b/polaris.dme index 855816fda7..7b7248bb61 100644 --- a/polaris.dme +++ b/polaris.dme @@ -190,7 +190,6 @@ #include "code\controllers\subsystem.dm" #include "code\controllers\verbs.dm" #include "code\controllers\observer_listener\atom\observer.dm" -#include "code\controllers\Processes\emergencyShuttle.dm" #include "code\controllers\Processes\ticker.dm" #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm"