diff --git a/code/__DEFINES/~skyrat_defines/security_alerts.dm b/code/__DEFINES/~skyrat_defines/security_alerts.dm index 3425587b795..2d4d16b69e2 100644 --- a/code/__DEFINES/~skyrat_defines/security_alerts.dm +++ b/code/__DEFINES/~skyrat_defines/security_alerts.dm @@ -1,9 +1,9 @@ //Security levels -#define SEC_LEVEL_GREEN 1 -#define SEC_LEVEL_BLUE 2 -#define SEC_LEVEL_VIOLET 3 -#define SEC_LEVEL_ORANGE 4 -#define SEC_LEVEL_AMBER 5 -#define SEC_LEVEL_RED 6 -#define SEC_LEVEL_DELTA 7 -#define SEC_LEVEL_GAMMA 8 //Oh shit bois +#define SEC_LEVEL_GREEN 0 +#define SEC_LEVEL_BLUE 1 +#define SEC_LEVEL_VIOLET 2 +#define SEC_LEVEL_ORANGE 3 +#define SEC_LEVEL_AMBER 4 +#define SEC_LEVEL_RED 5 +#define SEC_LEVEL_DELTA 6 +#define SEC_LEVEL_GAMMA 7 //Oh shit bois diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1df904a4064..990e84ba1ba 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -883,7 +883,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return - var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","violet","amber","red","delta","gamma") + var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","violet","orange","amber","red","delta","gamma") if(level) set_security_level(level) diff --git a/modular_skyrat/modules/alerts/code/set_security_level.dm b/modular_skyrat/modules/alerts/code/set_security_level.dm index abc5e00bcce..997d758ffa0 100644 --- a/modular_skyrat/modules/alerts/code/set_security_level.dm +++ b/modular_skyrat/modules/alerts/code/set_security_level.dm @@ -3,7 +3,7 @@ GLOBAL_VAR_INIT(gamma_looping, FALSE) //This is so we know if the gamma sound ef #define GAMMA_LOOP_LENGTH 1236 //2.06 minutes in deciseconds /proc/set_security_level(level) - level = seclevel2num(level) || level + level = isnum(level) ? level : seclevel2num(level) //Will not be announced if you try to set to the same level as it already is if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_GAMMA && level != GLOB.security_level)