From b706595d579d85e3ed471af86144d5d75698b6a0 Mon Sep 17 00:00:00 2001 From: Neerti Date: Mon, 13 Mar 2017 07:41:10 -0400 Subject: [PATCH] Makes red alert and evacs silence the atc Comments out military ships because lore for them is not finalized. --- code/controllers/emergency_shuttle_controller.dm | 2 ++ code/modules/busy_space/air_traffic.dm | 6 ++++-- code/modules/busy_space/organizations.dm | 4 ++++ code/modules/security levels/security levels.dm | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 6de0c6ca3ec..5b1b6a60d15 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -84,6 +84,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle if(istype(A, /area/hallway)) A.readyalert() + atc.reroute_traffic(yes = 1) + //calls the shuttle for a routine crew transfer /datum/emergency_shuttle_controller/proc/call_transfer() if(!can_call()) return diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index c88a6bcd9c4..7da2c6f73bf 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -34,10 +34,12 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller /datum/lore/atc_controller/proc/reroute_traffic(var/yes = 1) if(yes) - msg("Rerouting traffic away from [using_map.station_name].") + if(!squelched) + msg("Rerouting traffic away from [using_map.station_name].") squelched = 1 else - msg("Resuming normal traffic routing around [using_map.station_name].") + if(squelched) + msg("Resuming normal traffic routing around [using_map.station_name].") squelched = 0 /datum/lore/atc_controller/proc/shift_ending(var/evac = 0) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 38bd2f1418b..86f88e7ec03 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -296,6 +296,9 @@ "Titan" )// autogen will add a lot of other places as well. +/* +// To be expanded upon later, once the military lore gets sorted out. + // Military /datum/lore/organization/sif_guard @@ -320,3 +323,4 @@ "a wreck in SifGov territory", "a military outpost", ) +*/ diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 23c0585340f..32d752c7730 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -50,6 +50,11 @@ if(FA.z in using_map.contact_levels) FA.set_security_level(newlevel) + if(level >= SEC_LEVEL_RED) + atc.reroute_traffic(yes = 1) // Tell them fuck off we're busy. + else + atc.reroute_traffic(yes = 0) + /proc/get_security_level() switch(security_level)