From 86944c35ee899e23cbf0de278b9309eba0105ddb Mon Sep 17 00:00:00 2001 From: IK3I Date: Sun, 14 Jan 2018 15:46:21 -0600 Subject: [PATCH] More Buttons Deeper down the alert rabbit hole we go. --- code/modules/admin/verbs/randomverbs.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 28fcfbf2778..29c6111bc02 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -787,11 +787,14 @@ Traitors and the like can also be revived with the previous role mostly intact. return 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 + if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes") return + else + var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability + shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work + shuttle_master.emergency.cancel() + if(keepStatus) + shuttle_master.emergency.canRecall = FALSE // restores original status else shuttle_master.emergency.cancel()