From c4a10f05b1e947346bedc169670f3fc37fbdc089 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 31 Mar 2015 13:45:51 +0200 Subject: [PATCH] Allows admins to more easily set security levels. Also alters the sound for code delta. --- code/defines/procs/announce.dm | 8 ++++---- code/modules/admin/admin_verbs.dm | 14 +++++++++++++- code/modules/security levels/security levels.dm | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 3e5454d8ac..3d1dfdee35 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -33,8 +33,8 @@ /datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast) if(!message) return - var/tmp/message_title = new_title ? new_title : title - var/tmp/message_sound = new_sound ? sound(new_sound) : sound + var/message_title = new_title ? new_title : title + var/message_sound = new_sound ? sound(new_sound) : sound message = sanitize(message, extra = 0) message_title = sanitizeSafe(message_title) @@ -102,8 +102,8 @@ datum/announcement/proc/Sound(var/message_sound) PlaySound(message_sound) datum/announcement/priority/Sound(var/message_sound) - if(sound) - world << sound + if(message_sound) + world << message_sound datum/announcement/priority/command/Sound(var/message_sound) PlaySound(message_sound) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d83d4da747..41c27789a2 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -84,7 +84,8 @@ var/list/admin_verbs_admin = list( /client/proc/empty_ai_core_toggle_latejoin, /client/proc/aooc, /client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ - /client/proc/change_human_appearance_self /* Allows the human-based mob itself change its basic appearance */ + /client/proc/change_human_appearance_self, /* Allows the human-based mob itself change its basic appearance */ + /client/proc/change_security_level ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -762,6 +763,17 @@ var/list/admin_verbs_mentor = list( H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1) feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/proc/change_security_level() + set name = "Set security level" + set desc = "Sets the station security level" + set category = "Admin" + + if(!check_rights(R_ADMIN)) return + var sec_level = input(usr, "It's currently code [get_security_level()].", "Select Security Level") as null|anything in (list("green","blue","red","delta")-get_security_level()) + if(alert("Switch from code [get_security_level()] to code [sec_level]?","Change security level?","Yes","No") == "Yes") + set_security_level(sec_level) + log_admin("[key_name(usr)] changed the security level to code [sec_level].") + //---- bs12 verbs ---- diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index e96ed5b334..1892af891e 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -57,7 +57,7 @@ FA.overlays += image('icons/obj/monitors.dmi', "overlay_red") if(SEC_LEVEL_DELTA) - security_announcement_up.Announce("[config.alert_desc_delta]", "Attention! Delta security level reached!") + security_announcement_up.Announce("[config.alert_desc_delta]", "Attention! Delta security level reached!", new_sound = 'sound/effects/siren.ogg') security_level = SEC_LEVEL_DELTA for(var/obj/machinery/firealarm/FA in machines) if(FA.z in config.contact_levels)