cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source
This commit is contained in:
alberyk
2022-01-14 21:04:38 -03:00
parent 4f92ac55c7 f305ceee42
commit 1dc3bb2dd8
99 changed files with 915 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/command/comm.dm
+3 -3
View File
@@ -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