cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into night_shift

Browse Source 
# Conflicts:
#	code/world.dm
This commit is contained in:
tigercat2000
2018-04-02 17:24:36 -07:00
parent e71c4279a7 7e2c51f0e0
commit 8e5a42a7a1
35 changed files with 473 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/security_levels/security levels.dm
+4
View File
@@ -27,6 +27,10 @@
//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_DELTA && level != security_level)
if(level >= SEC_LEVEL_RED && security_level < SEC_LEVEL_RED)
// Mark down this time to prevent shuttle cheese
shuttle_master.emergency_sec_level_time = world.time
switch(level)
if(SEC_LEVEL_GREEN)
security_announcement_down.Announce("All threats to the station have passed. All weapons need to be holstered and privacy laws are once again fully enforced.","Attention! Security level lowered to green.")