From 736b24d6428755ae0188ddd43747f138d9aac95d Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Wed, 27 Aug 2014 15:57:44 +0100 Subject: [PATCH] Delta level updates Allows cancelling using controller debug Shows the current active security level when selecting a level --- code/controllers/delta_level.dm | 3 +++ code/modules/admin/admin_verbs.dm | 3 ++- html/changelog.html | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/controllers/delta_level.dm b/code/controllers/delta_level.dm index 413c7f31..4b21f760 100644 --- a/code/controllers/delta_level.dm +++ b/code/controllers/delta_level.dm @@ -48,6 +48,9 @@ datum/delta_level/proc/dotheboom() datum/delta_level/proc/process() if(!active) + if(ticker.mode:explosion_in_progress == 1) + ticker.mode:explosion_in_progress = 0 + settimeleft(0) return var/timeleft = timeleft() if(timeleft > 1e5) // midnight rollover protection diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 454bf874..40f4f20a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -903,7 +903,8 @@ var/list/admin_verbs_mod = list( "Delta", ) - var/input = input("Select the alert level.", "Alert Level", null, null) in L + var/current_level = get_security_level() + var/input = input("Select the alert level.", "Alert Level -( [current_level] )", null, null) in L switch(input) if("Green") set_security_level(SEC_LEVEL_GREEN) diff --git a/html/changelog.html b/html/changelog.html index 027b3cf8..7e4f6b43 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -76,6 +76,7 @@ should be listed in the changelog upon commit though. Thanks. -->
  • HTML tags in logs
  • Faithless sprite unbork
  • Tossed Salad from microwave recipes
    • +
  • Current Security Level now shown to the admin when choosing the new one
  • Law Giver settings