cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Requested Changes

Browse Source
This commit is contained in:
IK3I
2018-01-11 13:08:47 -06:00
parent d57622b460
commit 69eab5b919
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+13 -7
View File
@@ -762,11 +762,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
switch(alert(src, "Can the crew recall?", "Recallable?", "Yes", "No"))
if("Yes")
shuttle_master.emergency.canRecall = TRUE
else
shuttle_master.emergency.canRecall = FALSE
if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
shuttle_master.emergency.canRecall = TRUE
else
shuttle_master.emergency.canRecall = FALSE
shuttle_master.emergency.request()
@@ -786,8 +786,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
return
shuttle_master.emergency.canRecall = TRUE // Resets incase the admin recalls a round ender for some reason.
shuttle_master.emergency.cancel()
if(shuttle_master.emergency.canRecall == FALSE)
if(alert("Shuttle is currently set to be nonrecallable. Normally this happens due to round ending events. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
shuttle_master.emergency.canRecall = TRUE // Resets incase the admin recalls a round ender for some reason.
shuttle_master.emergency.cancel()
else
return
else
shuttle_master.emergency.cancel()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")