From 7297f815193f7e6c2fd8e3d3d92b66bdcd7dc515 Mon Sep 17 00:00:00 2001 From: S34NW <06sean@gmail.com> Date: Sat, 6 Mar 2021 11:57:51 +0000 Subject: [PATCH 1/5] Alert does not equate to armory --- code/modules/admin/admin.dm | 8 ++++++++ code/modules/admin/secrets.dm | 3 +++ code/modules/admin/topic.dm | 6 ++++++ code/modules/security_levels/security_levels.dm | 9 +-------- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 10417e2b937..b40b73825dd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -787,9 +787,17 @@ 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.locked = 0 + H.update_icon() + GLOB.event_announcement.Announce("Centcomm 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.locked = 1 + H.update_icon() + GLOB.event_announcement.Announce("Centcomm 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 5cfd50a5ce9..50119d5b24b 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -82,6 +82,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 aa10d51ce1d..c1e1fd3d8ab 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -3218,6 +3218,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 bacf982b595..24deabde6a1 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!", new_sound = 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) From 352d3983423cbfd91ad05ba9bb3f04f69b8bcf29 Mon Sep 17 00:00:00 2001 From: Sean Williams <06sean@gmail.com> Date: Sun, 7 Mar 2021 14:38:19 +0000 Subject: [PATCH 2/5] Apply suggestions from AA code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/modules/admin/admin.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b40b73825dd..f0b5f3c8653 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -788,14 +788,14 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space 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.locked = 0 + H.locked = FALSE H.update_icon() GLOB.event_announcement.Announce("Centcomm 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.locked = 1 + H.locked = TRUE H.update_icon() GLOB.event_announcement.Announce("Centcomm has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') fromArea.move_contents_to(toArea) @@ -925,4 +925,3 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space continue result[1]++ return result - From 7e989b6b7ac005424a06afd59ec44beef174e7e0 Mon Sep 17 00:00:00 2001 From: Sean Williams <06sean@gmail.com> Date: Sun, 7 Mar 2021 22:26:29 +0000 Subject: [PATCH 3/5] Apply suggestions from farie code review Co-authored-by: Farie82 --- code/modules/admin/admin.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index f0b5f3c8653..f4f2bb3170e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -788,15 +788,13 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space 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.locked = FALSE - H.update_icon() + H.unlock(TRUE) GLOB.event_announcement.Announce("Centcomm 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.locked = TRUE - H.update_icon() + H.lock(TRUE) GLOB.event_announcement.Announce("Centcomm has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') fromArea.move_contents_to(toArea) From 8926877d29e379b4420c1435152b4a125c531d0b Mon Sep 17 00:00:00 2001 From: Sean Williams <06sean@gmail.com> Date: Wed, 10 Mar 2021 23:51:23 +0000 Subject: [PATCH 4/5] =?UTF-8?q?Centcomm=20=E2=89=A0=20Central=20Command?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/admin/admin.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index f4f2bb3170e..59975082aca 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -789,13 +789,13 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = 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("Centcomm has deployed the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') + 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("Centcomm has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') + 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) From 4b22d5b2dcdf46423ec68aeb52011393e924feb7 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat, 10 Jul 2021 14:11:21 +0100 Subject: [PATCH 5/5] Update code/modules/security_levels/security_levels.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/security_levels/security_levels.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index 24deabde6a1..bc47267a98c 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -77,7 +77,7 @@ 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.","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 if(GLOB.security_level < SEC_LEVEL_RED)