diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 4936256484e..8d3ba50e6fe 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -202,7 +202,46 @@
var/aggressiveness = 1
var/safety = 1
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust, /datum/action/item_action/selectphrase)
-
+ var/phrase_sound_list = list(
+ "halt",
+ "bobby",
+ "compliance",
+ "justice",
+ "running",
+ "dontmove",
+ "floor",
+ "robocop",
+ "god",
+ "freeze",
+ "imperial",
+ "bash",
+ "harry",
+ "asshole",
+ "stfu",
+ "shutup",
+ "super",
+ "dredd"
+ )
+ var/phrase_text_list = list(
+ "HALT! HALT! HALT! HALT!",
+ "Stop in the name of the Law.",
+ "Compliance is in your best ineterest.",
+ "Prepare for justice!",
+ "Running will only increase your sentence",
+ "Don't move, Creep!",
+ "Down on the floor, Creep!",
+ "Dead or alive you're coming with me.",
+ "God made today for the crooks we could not catch yesterday.",
+ "Freeze, Scum Bag!",
+ "Stop right there, criminal scum!",
+ "Stop or I'll bash you.",
+ "Go ahead, make my day",
+ "Stop breaking the law, asshole.",
+ "You have the right to shut the fuck up",
+ "Shut up crime!",
+ "Face the wrath of the golden bolt.",
+ "I am, the LAW!"
+ )
/obj/item/clothing/mask/gas/sechailer/hos
name = "\improper HOS SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe."
@@ -252,131 +291,17 @@
else if(actiontype == /datum/action/item_action/selectphrase)
switch(aggressiveness)
if(1)
- switch(phrase)
- if(1)
- to_chat(user, "You set the restrictor to: Stop in the name of the Law.")
- phrase = 2
- if(2)
- to_chat(user, "You set the restrictor to: Compliance is in your best interest.")
- phrase = 3
- if(3)
- to_chat(user, "You set the restrictor to: Prepare for justice.")
- phrase = 4
- if(4)
- to_chat(user, "You set the restrictor to: Running will only increase your sentence.")
- phrase = 5
- if(5)
- to_chat(user, "You set the restrictor to: Don't move, Creep!")
- phrase = 6
- if(6)
- to_chat(user, "You set the restrictor to: HALT! HALT! HALT! HALT!")
- phrase = 1
- else
- to_chat(user, "You set the restrictor to: HALT! HALT! HALT! HALT!")
- phrase = 1
+ phrase = (phrase < 6) ? (phrase + 1) : 1
+ to_chat(user,"You set the restrictor to: [phrase_text_list[phrase]]")
if(2)
- switch(phrase)
- if(7)
- to_chat(user, "You set the restrictor to: Dead or alive you're coming with me.")
- phrase = 8
- if(8)
- to_chat(user, "You set the restrictor to: God made today for the crooks we could not catch yesterday.")
- phrase = 9
- if(9)
- to_chat(user, "You set the restrictor to: Freeze, Scum Bag!")
- phrase = 10
- if(10)
- to_chat(user, "You set the restrictor to: Stop right there, criminal scum!")
- phrase = 11
- if(11)
- to_chat(user, "You set the restrictor to: Down on the floor, Creep!")
- phrase = 7
- else
- to_chat(user, "You set the restrictor to: Down on the floor, Creep!")
- phrase = 7
+ phrase = (phrase < 11 && phrase >= 7) ? (phrase + 1) : 7
+ to_chat(user,"You set the restrictor to: [phrase_text_list[phrase]]")
if(3)
- switch(phrase)
- if(12)
- to_chat(user, "You set the restrictor to: Go ahead, make my day.")
- phrase = 13
- if(13)
- to_chat(user, "You set the restrictor to: Stop breaking the law, ass hole.")
- phrase = 14
- if(14)
- to_chat(user, "You set the restrictor to: You have the right to shut the fuck up.")
- phrase = 15
- if(15)
- to_chat(user, "You set the restrictor to: Shut up crime!")
- phrase = 16
- if(16)
- to_chat(user, "You set the restrictor to: Face the wrath of the golden bolt.")
- phrase = 17
- if(17)
- to_chat(user, "You set the restrictor to: I am, the LAW!")
- phrase = 18
- if(18)
- to_chat(user, "You set the restrictor to: Stop or I'll bash you.")
- phrase = 12
- else
- to_chat(user, "You set the restrictor to: Go ahead, make my day.")
- phrase = 13
-
+ phrase = (phrase < 18 && phrase >= 12 ) ? (phrase + 1) : 12
+ to_chat(user,"You set the restrictor to: [phrase_text_list[phrase]]")
if(4)
- switch(phrase)
- if(1)
- to_chat(user, "You set the restrictor to: Stop in the name of the Law.")
- phrase = 2
- if(2)
- to_chat(user, "You set the restrictor to: Compliance is in your best interest.")
- phrase = 3
- if(3)
- to_chat(user, "You set the restrictor to: Prepare for justice.")
- phrase = 4
- if(4)
- to_chat(user, "You set the restrictor to: Running will only increase your sentence.")
- phrase = 5
- if(5)
- to_chat(user, "You set the restrictor to: Don't move, Creep!")
- phrase = 6
- if(6)
- to_chat(user, "You set the restrictor to: Down on the floor, Creep!")
- phrase = 7
- if(7)
- to_chat(user, "You set the restrictor to: Dead or alive you're coming with me.")
- phrase = 8
- if(8)
- to_chat(user, "You set the restrictor to: God made today for the crooks we could not catch yesterday.")
- phrase = 9
- if(9)
- to_chat(user, "You set the restrictor to: Freeze, Scum Bag!")
- phrase = 10
- if(10)
- to_chat(user, "You set the restrictor to: Stop right there, criminal scum!")
- phrase = 11
- if(11)
- to_chat(user, "You set the restrictor to: Stop or I'll bash you.")
- phrase = 12
- if(12)
- to_chat(user, "You set the restrictor to: Go ahead, make my day.")
- phrase = 13
- if(13)
- to_chat(user, "You set the restrictor to: Stop breaking the law, ass hole.")
- phrase = 14
- if(14)
- to_chat(user, "You set the restrictor to: You have the right to shut the fuck up.")
- phrase = 15
- if(15)
- to_chat(user, "You set the restrictor to: Shut up crime!")
- phrase = 16
- if(16)
- to_chat(user, "You set the restrictor to: Face the wrath of the golden bolt.")
- phrase = 17
- if(17)
- to_chat(user, "You set the restrictor to: I am, the LAW!")
- phrase = 18
- if(18)
- to_chat(user, "You set the restrictor to: HALT! HALT! HALT! HALT!")
- phrase = 1
+ phrase = (phrase < 18 && phrase >= 1 ) ? (phrase + 1) : 1
+ to_chat(user,"You set the restrictor to: [phrase_text_list[phrase]]")
else
to_chat(user, "It's broken.")
@@ -419,8 +344,8 @@
return
/obj/item/clothing/mask/gas/sechailer/proc/halt()
- var/phrase_text = null
- var/phrase_sound = null
+ var/phrase_text = phrase_text_list[phrase]
+ var/phrase_sound = phrase_sound_list[phrase]
if(cooldown < world.time - 35) // A cooldown, to stop people being jerks
@@ -431,63 +356,6 @@
cooldown = world.time
return
-
- switch(phrase) //sets the properties of the chosen phrase
- if(1) // good cop
- phrase_text = "HALT! HALT! HALT! HALT!"
- phrase_sound = "halt"
- if(2)
- phrase_text = "Stop in the name of the Law."
- phrase_sound = "bobby"
- if(3)
- phrase_text = "Compliance is in your best interest."
- phrase_sound = "compliance"
- if(4)
- phrase_text = "Prepare for justice!"
- phrase_sound = "justice"
- if(5)
- phrase_text = "Running will only increase your sentence."
- phrase_sound = "running"
- if(6) // bad cop
- phrase_text = "Don't move, Creep!"
- phrase_sound = "dontmove"
- if(7)
- phrase_text = "Down on the floor, Creep!"
- phrase_sound = "floor"
- if(8)
- phrase_text = "Dead or alive you're coming with me."
- phrase_sound = "robocop"
- if(9)
- phrase_text = "God made today for the crooks we could not catch yesterday."
- phrase_sound = "god"
- if(10)
- phrase_text = "Freeze, Scum Bag!"
- phrase_sound = "freeze"
- if(11)
- phrase_text = "Stop right there, criminal scum!"
- phrase_sound = "imperial"
- if(12) // LA-PD
- phrase_text = "Stop or I'll bash you."
- phrase_sound = "bash"
- if(13)
- phrase_text = "Go ahead, make my day."
- phrase_sound = "harry"
- if(14)
- phrase_text = "Stop breaking the law, ass hole."
- phrase_sound = "asshole"
- if(15)
- phrase_text = "You have the right to shut the fuck up."
- phrase_sound = "stfu"
- if(16)
- phrase_text = "Shut up crime!"
- phrase_sound = "shutup"
- if(17)
- phrase_text = "Face the wrath of the golden bolt."
- phrase_sound = "super"
- if(18)
- phrase_text = "I am, the LAW!"
- phrase_sound = "dredd"
-
usr.visible_message("[usr]'s Compli-o-Nator: [phrase_text]")
playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4)
cooldown = world.time