Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modular Evacuation #818

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4f60d6a
move autotransfer into main code
DTraitor Jan 23, 2024
a54711f
save the changes
DTraitor Jan 23, 2024
f046192
And another save before solving hundreds of errors
DTraitor Jan 23, 2024
6ed5bd0
Almost done Pt. 1
DTraitor Jan 30, 2024
b084e4c
God save us all
DTraitor Feb 2, 2024
380485d
huge refactor
DTraitor Feb 2, 2024
8750037
I expected more problems after the refactor tbh
DTraitor Feb 2, 2024
38eac62
almost done with compiling
DTraitor Feb 3, 2024
e155726
emergency shuttle changes
DTraitor Feb 4, 2024
0ceb355
comm console
DTraitor Feb 4, 2024
69567fa
emergency shuttle
DTraitor Feb 5, 2024
0cf9598
whoops, shouldn't have commited it
DTraitor Feb 9, 2024
8d3cff9
evac panel
DTraitor Feb 10, 2024
315aba7
almost done
DTraitor Feb 20, 2024
419e686
Guess I am done with the project...
DTraitor Feb 20, 2024
b3fb68b
Merge remote-tracking branch 'DaedalusDock/master' into evacuation-da…
DTraitor Feb 20, 2024
0c1088e
remove some unused stuff
DTraitor Feb 20, 2024
32e3683
Merge branch 'master' into evacuation-datums
DTraitor Feb 21, 2024
7eb04ba
Update code/controllers/configuration/entries/game_options.dm
DTraitor Feb 24, 2024
05f9360
removed some leftover code
DTraitor Feb 24, 2024
f446dfa
Merge branch 'master' into evacuation-datums
DTraitor Feb 24, 2024
52f50cd
Arrival and recall time fixes
DTraitor Mar 3, 2024
6775a73
Merge branch 'master' into evacuation-datums
DTraitor Mar 3, 2024
420e61d
Merge branch 'master' into evacuation-datums
DTraitor Mar 6, 2024
dda6026
requested
DTraitor Mar 11, 2024
42e7bd0
Merge remote-tracking branch 'DaedalusDock/master' into evacuation-da…
DTraitor Mar 11, 2024
5639942
Merge branch 'evacuation-datums' of https://github.com/DTraitor/DS13-…
DTraitor Mar 11, 2024
236d17d
made stack traces better
DTraitor Mar 24, 2024
c1323b7
includes IDs now
DTraitor Mar 25, 2024
b567cb1
done
DTraitor Mar 25, 2024
d2f6f0e
Merge branch 'master' into evacuation-datums
DTraitor Apr 3, 2024
ed564a3
oopsie
DTraitor Apr 3, 2024
1b3ae0b
naming
DTraitor Apr 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
made stack traces better
DTraitor committed Mar 24, 2024
commit 236d17d6043281df349b6a1ee96095a156b740d4
17 changes: 9 additions & 8 deletions code/controllers/subsystem/evacuation.dm
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(evacuation)
/datum/controller/subsystem/evacuation/proc/request_evacuation(mob/caller, reason, controller_id, admin = FALSE)
var/datum/evacuation_controller/controller = controllers[controller_id]
if(!controller)
CRASH("Invalid controller ID")
CRASH("Evacuaton was requested with an invalid controller ID")
for(var/identifier in controllers)
if(controllers[identifier].state >= EVACUATION_STATE_AWAITING)
to_chat(caller, "Evacuation is already in progress.")
@@ -75,13 +75,14 @@ SUBSYSTEM_DEF(evacuation)
/datum/controller/subsystem/evacuation/proc/can_cancel(mob/caller, controller_id)
var/datum/evacuation_controller/controller = controllers[controller_id]
if(!controller)
CRASH("Invalid controller ID")
stack_trace("can_cancel() was passed an invalid controller ID")
return "Error 500. Please contact your system administrator."
return controller.can_cancel(caller)

/datum/controller/subsystem/evacuation/proc/request_cancel(mob/caller, controller_id)
var/datum/evacuation_controller/controller = controllers[controller_id]
if(!controller)
CRASH("Invalid controller ID")
CRASH("Evacuaton cancel was requested with an invalid controller ID")
controller.trigger_cancel_evacuation(caller)

/datum/controller/subsystem/evacuation/proc/add_evacuation_blocker(datum/bad)
@@ -98,22 +99,22 @@ SUBSYSTEM_DEF(evacuation)

/datum/controller/subsystem/evacuation/proc/disable_evacuation(controller_id)
if(!controllers[controller_id])
CRASH("Invalid controller ID")
CRASH("Tried to disable evacuation of an invalid controller ID")
controllers[controller_id].disable_evacuation()

/datum/controller/subsystem/evacuation/proc/enable_evacuation(controller_id)
if(!controllers[controller_id])
CRASH("Invalid controller ID")
CRASH("Tried to enable evacuation of an invalid controller ID")
controllers[controller_id].enable_evacuation()

/datum/controller/subsystem/evacuation/proc/block_cancel(controller_id)
if(!controllers[controller_id])
CRASH("Invalid controller ID")
CRASH("Tried to block cancel of an invalid controller ID")
controllers[controller_id].block_cancel()

/datum/controller/subsystem/evacuation/proc/unblock_cancel(controller_id)
if(!controllers[controller_id])
CRASH("Invalid controller ID")
CRASH("Tried to unblock cancel of an invalid controller ID")
controllers[controller_id].unblock_cancel()

//Perhaps move it to SShuttle?
@@ -164,7 +165,7 @@ SUBSYSTEM_DEF(evacuation)

/datum/controller/subsystem/evacuation/proc/delay_evacuation(identifier, delay)
if(!controllers[identifier])
CRASH("Invalid controller ID")
CRASH("Tried to delay evacuation of an invalid controller ID")
controllers[identifier].delay_evacuation(delay)

/datum/controller/subsystem/evacuation/proc/get_controllers_names(active_only = FALSE)