diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 61e5570148e..ba676aa5daf 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -788,9 +788,15 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space if(GLOB.gamma_ship_location == 1) fromArea = locate(/area/shuttle/gamma/space) toArea = locate(/area/shuttle/gamma/station) + for(var/obj/machinery/door/airlock/hatch/gamma/H in GLOB.airlocks) + H.unlock(TRUE) + GLOB.event_announcement.Announce("Central Command has deployed the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') else fromArea = locate(/area/shuttle/gamma/station) toArea = locate(/area/shuttle/gamma/space) + for(var/obj/machinery/door/airlock/hatch/gamma/H in GLOB.airlocks) + H.lock(TRUE) + GLOB.event_announcement.Announce("Central Command has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') fromArea.move_contents_to(toArea) for(var/obj/machinery/mech_bay_recharge_port/P in toArea) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 16cd1084805..c423868c748 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -81,6 +81,9 @@ Create Weather
Weather - Ash Storm  
+ Reinforce Station
+ Move the Gamma Armory   +
"} if(2) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8ca57e828c6..8cb2ea4b706 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -3213,6 +3213,12 @@ if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away")) message_admins("[key_name_admin(usr)] moved the centcom ferry") log_admin("[key_name(usr)] moved the centcom ferry") + + if("gammashuttle") + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Send Gamma Armory") + message_admins("[key_name_admin(usr)] moved the gamma armory") + log_admin("[key_name(usr)] moved the gamma armory") + move_gamma_ship() if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index af22e0061e4..d3d4be7dff9 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -77,22 +77,15 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur FA.overlays += image('icons/obj/monitors.dmi', "overlay_red") if(SEC_LEVEL_GAMMA) - GLOB.security_announcement_up.Announce("Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location. The station's Gamma armory has been unlocked and is ready for use.","Attention! Gamma security level activated!", new_sound = sound('sound/effects/new_siren.ogg')) + GLOB.security_announcement_up.Announce("Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location.", "Attention! Gamma security level activated!", sound('sound/effects/new_siren.ogg')) GLOB.security_level = SEC_LEVEL_GAMMA - move_gamma_ship() - if(GLOB.security_level < SEC_LEVEL_RED) for(var/obj/machinery/door/airlock/highsecurity/red/R in GLOB.airlocks) if(is_station_level(R.z)) R.locked = 0 R.update_icon() - for(var/obj/machinery/door/airlock/hatch/gamma/H in GLOB.airlocks) - if(is_station_level(H.z)) - H.locked = 0 - H.update_icon() - post_status("alert", "gammaalert") for(var/obj/machinery/firealarm/FA in GLOB.machines)