Fixes evac shuttles being called as transfer shuttles, fixes shuttle arrive time announcement. (#12876)

This commit is contained in:
Matt Atlas
2021-12-30 22:10:05 +01:00
committed by GitHub
parent 235cb41148
commit 5234c0544a
10 changed files with 66 additions and 18 deletions
@@ -391,7 +391,7 @@ Command action procs
return FALSE
//Returns 1 if called 0 if not
/proc/call_shuttle_proc(var/mob/user)
/proc/call_shuttle_proc(var/mob/user, var/emergency = FALSE)
if((!(ROUND_IS_STARTED) || !evacuation_controller))
return FALSE
@@ -414,8 +414,8 @@ Command action procs
to_chat(user, "An evacuation is already underway.")
return
if(evacuation_controller.call_evacuation(user))
log_and_message_admins("[user? key_name(user) : "Autotransfer"] has called the shuttle.")
if(evacuation_controller.call_evacuation(user, emergency))
log_and_message_admins("[user? key_name(user) : "Autotransfer"] has called a shuttle.")
return TRUE