From 793d4051e238ca3ac572737d44c1b27936faf641 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sun, 4 Dec 2011 10:25:03 +0000 Subject: [PATCH] security levels commit oddities fixed. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2611 316c924e-a436-60f5-8080-3fe189b3f50e --- .../{admin => security levels}/security levels.dm | 13 ++++++++++++- tgstation.dme | 2 -- 2 files changed, 12 insertions(+), 3 deletions(-) rename code/modules/{admin => security levels}/security levels.dm (88%) diff --git a/code/modules/admin/security levels.dm b/code/modules/security levels/security levels.dm similarity index 88% rename from code/modules/admin/security levels.dm rename to code/modules/security levels/security levels.dm index b004f84837c..7b431c23da5 100644 --- a/code/modules/admin/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -28,7 +28,7 @@ if(1) if(security_level < 1) world << "Attention! security level elevated to blue" - world << "The station has received reliable information about possible hostle activity on the station. Security staff may have weapons visible, random searches are permitted." + world << "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." else world << "Attention! security level lowered to blue" world << "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." @@ -60,6 +60,17 @@ else return +/proc/get_security_level() + switch(security_level) + if(0) + return "green" + if(1) + return "blue" + if(2) + return "red" + if(3) + return "delta" + /*DEBUG /mob/verb/set_thing0() diff --git a/tgstation.dme b/tgstation.dme index 9ad85309a6b..5d9dab35fae 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -161,7 +161,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "sound" #define FILE_DIR "sound/ambience" #define FILE_DIR "sound/announcer" @@ -965,7 +964,6 @@ #include "code\modules\research\rdmachines.dm" #include "code\modules\research\research.dm" #include "code\modules\research\server.dm" -#include "code\modules\security levels\security levels.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" #include "code\WorkInProgress\mapload\dmm_suite.dm"