From 242ba82a5005036c6d31c183547ff999d3f77690 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 24 Jul 2015 19:19:36 +0800 Subject: [PATCH 1/4] ERTDescForAdmins --- code/modules/admin/verbs/one_click_antag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 5cdf335ed49..74fd6d586ee 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -450,7 +450,7 @@ // CENTCOM RESPONSE TEAM /datum/admins/proc/makeEmergencyresponseteam() - var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT", "Amber: Full ERT", "Red: Elite ERT", "Delta: Deathsquad") + var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Guns)", "Amber: Full ERT (Energy Guns)", "Red: Elite ERT (Pulse Guns)", "Delta: Deathsquad") if(!alert) return switch(alert) From 45ebc998de7efe1e454102ec069e6ad206cb6747 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 24 Jul 2015 19:37:55 +0800 Subject: [PATCH 2/4] Fix --- code/modules/admin/verbs/one_click_antag.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 74fd6d586ee..a584d8fc587 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -456,11 +456,11 @@ switch(alert) if("Delta: Deathsquad") return makeDeathsquad() - if("Red: Elite ERT") + if("Red: Elite ERT (Pulse Guns)") alert = "Red" - if("Amber: Full ERT") + if("Amber: Full ERT (Energy Guns)") alert = "Amber" - if("Blue: Light ERT") + if("Blue: Light ERT (No Guns)") alert = "Blue" if("Green: Centcom Official") return makeOfficial() From a5233a77d6649b65ce1a35ce65d1eed6ab3d330b Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 27 Jul 2015 01:35:23 +0800 Subject: [PATCH 3/4] DescUpdate --- code/modules/admin/verbs/one_click_antag.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index a584d8fc587..ca97f4d5905 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -450,17 +450,17 @@ // CENTCOM RESPONSE TEAM /datum/admins/proc/makeEmergencyresponseteam() - var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Guns)", "Amber: Full ERT (Energy Guns)", "Red: Elite ERT (Pulse Guns)", "Delta: Deathsquad") + var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Guns)", "Delta: Deathsquad") if(!alert) return switch(alert) if("Delta: Deathsquad") return makeDeathsquad() - if("Red: Elite ERT (Pulse Guns)") + if("Red: Elite ERT (Armoury Access + Pulse Weapons)") alert = "Red" - if("Amber: Full ERT (Energy Guns)") + if("Amber: Full ERT (Armoury Access)") alert = "Amber" - if("Blue: Light ERT (No Guns)") + if("Blue: Light ERT (No Armoury Access)") alert = "Blue" if("Green: Centcom Official") return makeOfficial() From a3099df65a003a713350de0a48504193b2edd295 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 27 Jul 2015 01:38:29 +0800 Subject: [PATCH 4/4] WrongWord --- code/modules/admin/verbs/one_click_antag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index ca97f4d5905..25b84838539 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -450,7 +450,7 @@ // CENTCOM RESPONSE TEAM /datum/admins/proc/makeEmergencyresponseteam() - var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Guns)", "Delta: Deathsquad") + var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad") if(!alert) return switch(alert)