shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update communications.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-22 10:46:32 -05:00
committed by GitHub
parent b439b96865
commit b7fa4410ce
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/communications.dm
+1 -11
View File
@@ -231,14 +231,9 @@
if("status")
state = STATE_STATUSDISPLAY
if("securitylevel")
<<<<<<< HEAD
src.tmp_alertlevel = text2num( href_list["newalertlevel"] )
if(!tmp_alertlevel) tmp_alertlevel = 0
=======
tmp_alertlevel = text2num( href_list["newalertlevel"] )
if(!tmp_alertlevel)
tmp_alertlevel = 0
>>>>>>> 7feea9a... Merge pull request #31849 from AnturK/commsconsolecleanup
state = STATE_CONFIRM_LEVEL
if("changeseclevel")
state = STATE_ALERT_LEVEL
@@ -367,14 +362,9 @@
if("ai-announce")
make_announcement(usr, 1)
if("ai-securitylevel")
<<<<<<< HEAD
src.tmp_alertlevel = text2num( href_list["newalertlevel"] )
if(!tmp_alertlevel) tmp_alertlevel = 0
=======
tmp_alertlevel = text2num( href_list["newalertlevel"] )
if(!tmp_alertlevel)
tmp_alertlevel = 0
>>>>>>> 7feea9a... Merge pull request #31849 from AnturK/commsconsolecleanup
var/old_level = GLOB.security_level
if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN
@@ -735,4 +725,4 @@
var/title
var/content
var/list/possible_answers = list()
var/answered
var/answered