mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-06 07:22:15 +00:00
Brings back crew transfer (#16402)
* screams * button * stuff * evacuation * shift change instead * new stuff * emergency * last one * jummp time * transfer * Sound file fix * stuff for arrow * fix * sound fix * changelog * Update code/controllers/subsystems/evacuation/evacuation_shuttle.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_pods.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_pods.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_pods.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_pods.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_pods.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/controllers/subsystems/evacuation/evacuation_shuttle.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/datums/discord/webhook.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/datums/late_choices.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/game/machinery/case_button.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
@@ -320,7 +320,7 @@ Command action procs
|
||||
return FALSE
|
||||
|
||||
//Returns 1 if called 0 if not
|
||||
/proc/call_shuttle_proc(var/mob/user, var/emergency = FALSE)
|
||||
/proc/call_shuttle_proc(var/mob/user, var/_evac_type = TRANSFER_CREW)
|
||||
if((!(ROUND_IS_STARTED) || !evacuation_controller))
|
||||
return FALSE
|
||||
|
||||
@@ -343,7 +343,7 @@ Command action procs
|
||||
to_chat(user, "An evacuation is already underway.")
|
||||
return
|
||||
|
||||
if(evacuation_controller.call_evacuation(user, emergency))
|
||||
if(evacuation_controller.call_evacuation(user, _evac_type))
|
||||
log_and_message_admins("[user? key_name(user) : "Autotransfer"] has called a shuttle.")
|
||||
|
||||
return TRUE
|
||||
@@ -359,7 +359,7 @@ Command action procs
|
||||
to_world(FONT_LARGE(SPAN_VOTE(current_map.shuttle_called_message)))
|
||||
return
|
||||
|
||||
. = evacuation_controller.call_evacuation(null, _emergency_evac = FALSE, autotransfer = TRUE)
|
||||
. = evacuation_controller.call_evacuation(null, _evac_type = TRANSFER_CREW, autotransfer = TRUE)
|
||||
|
||||
//delay events in case of an autotransfer
|
||||
if(.)
|
||||
|
||||
Reference in New Issue
Block a user