Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-03-15 16:02:14 +01:00
committed by GitHub
270 changed files with 9902 additions and 1687 deletions

View File

@@ -32,9 +32,7 @@
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.")
security_level = SEC_LEVEL_GREEN
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "outline")
post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))
@@ -48,9 +46,7 @@
security_announcement_down.Announce("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.","Attention! Security level lowered to blue.")
security_level = SEC_LEVEL_BLUE
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "outline")
post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))
@@ -69,9 +65,7 @@
R.locked = 0
R.update_icon()
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "redalert")
post_status("alert", "redalert")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))
@@ -95,9 +89,7 @@
H.locked = 0
H.update_icon()
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "gammaalert")
post_status("alert", "gammaalert")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))
@@ -109,9 +101,7 @@
security_announcement_up.Announce("Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.","Attention! Epsilon security level activated!")
security_level = SEC_LEVEL_EPSILON
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "epsilonalert")
post_status("alert", "epsilonalert")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))
@@ -122,9 +112,7 @@
security_announcement_up.Announce("The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.","Attention! Delta security level reached!")
security_level = SEC_LEVEL_DELTA
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
CC.post_status("alert", "deltaalert")
post_status("alert", "deltaalert")
for(var/obj/machinery/firealarm/FA in world)
if(is_station_contact(FA.z))