diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
index bc805048277..bdb37b80da1 100644
--- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
@@ -1,6 +1,5 @@
// Interface for humans.
/obj/item/rig/verb/hardsuit_interface()
-
set name = "Open Hardsuit Interface"
set desc = "Open the hardsuit system interface."
set category = "Hardsuit"
@@ -10,28 +9,27 @@
ui_interact(usr)
/obj/item/rig/verb/toggle_vision()
-
set name = "Toggle Visor"
set desc = "Turns your rig visor off or on."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
return
if(!check_power_cost(usr))
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!check_suit_access(usr))
return
if(!visor)
- to_chat(usr, "The hardsuit does not have a configurable visor.")
+ to_chat(usr, SPAN_WARNING("The hardsuit does not have a configurable visor."))
return
if(!visor.active)
@@ -40,14 +38,16 @@
visor.deactivate(usr)
/obj/item/rig/proc/toggle_helmet()
-
set name = "Toggle Helmet"
set desc = "Deploys or retracts your helmet."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
return
if(!check_suit_access(usr))
@@ -56,26 +56,34 @@
toggle_piece("helmet",wearer)
/obj/item/rig/proc/toggle_chest()
-
set name = "Toggle Chestpiece"
set desc = "Deploys or retracts your chestpiece."
set category = "Hardsuit"
set src = usr.contents
+ if(!istype(wearer) || !wearer.back == src)
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
+ return
+
if(!check_suit_access(usr))
return
toggle_piece(BP_CHEST,wearer)
/obj/item/rig/proc/toggle_gauntlets()
-
set name = "Toggle Gauntlets"
set desc = "Deploys or retracts your gauntlets."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
return
if(!check_suit_access(usr))
@@ -84,14 +92,16 @@
toggle_piece("gauntlets",wearer)
/obj/item/rig/proc/toggle_boots()
-
set name = "Toggle Boots"
set desc = "Deploys or retracts your boots."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
return
if(!check_suit_access(usr))
@@ -100,14 +110,16 @@
toggle_piece("boots",wearer)
/obj/item/rig/verb/deploy_suit()
-
set name = "Deploy Hardsuit"
set desc = "Deploys helmet, gloves and boots."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
return
if(!check_suit_access(usr))
@@ -119,14 +131,16 @@
deploy(wearer)
/obj/item/rig/verb/toggle_seals_verb()
-
set name = "Toggle Hardsuit"
set desc = "Activates or deactivates your rig."
set category = "Hardsuit"
set src = usr.contents
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
+ return
+
+ if(use_check_and_message(usr))
return
if(!check_suit_access(usr))
@@ -135,7 +149,6 @@
toggle_seals(wearer)
/obj/item/rig/verb/switch_vision_mode()
-
set name = "Switch Vision Mode"
set desc = "Switches between available vision modes."
set category = "Hardsuit"
@@ -148,24 +161,23 @@
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!visor)
- to_chat(usr, "The hardsuit does not have a configurable visor.")
+ to_chat(usr, SPAN_WARNING("The hardsuit does not have a configurable visor."))
return
if(!visor.active)
visor.activate(usr)
if(!visor.active)
- to_chat(usr, "The visor is suffering a hardware fault and cannot be configured.")
+ to_chat(usr, SPAN_WARNING("The visor is suffering a hardware fault and cannot be configured."))
return
visor.engage(null, usr)
/obj/item/rig/verb/alter_voice()
-
set name = "Configure Voice Synthesiser"
set desc = "Toggles or configures your voice synthesizer."
set category = "Hardsuit"
@@ -175,21 +187,20 @@
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
return
if(!speech)
- to_chat(usr, "The hardsuit does not have a speech synthesiser.")
+ to_chat(usr, SPAN_WARNING("The hardsuit does not have a speech synthesiser."))
return
speech.engage(null, usr)
/obj/item/rig/verb/select_module()
-
set name = "Select Module"
set desc = "Selects a module as your primary system."
set category = "Hardsuit"
@@ -202,11 +213,11 @@
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
return
var/list/selectable = list()
@@ -218,14 +229,13 @@
if(!istype(module))
selected_module = null
- to_chat(usr, "Primary system is now: deselected.")
+ to_chat(usr, SPAN_NOTICE("Primary system is now: deselected."))
return
selected_module = module
- to_chat(usr, "Primary system is now: [selected_module.interface_name].")
+ to_chat(usr, SPAN_NOTICE("Primary system is now: [selected_module.interface_name]."))
/obj/item/rig/verb/toggle_module()
-
set name = "Toggle Module"
set desc = "Toggle a system module."
set category = "Hardsuit"
@@ -238,11 +248,11 @@
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
return
var/list/selectable = list()
@@ -263,7 +273,6 @@
module.activate(usr)
/obj/item/rig/verb/engage_module()
-
set name = "Engage Module"
set desc = "Engages a system module."
set category = "Hardsuit"
@@ -273,11 +282,11 @@
return
if(canremove)
- to_chat(usr, "The suit is not active.")
+ to_chat(usr, SPAN_WARNING("The suit is not active."))
return
if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
+ to_chat(usr, SPAN_WARNING("The hardsuit is not being worn."))
return
if(!check_power_cost(usr, 0, 0, 0, 0))
diff --git a/html/changelogs/geeves-hardsuit_toggling.yml b/html/changelogs/geeves-hardsuit_toggling.yml
new file mode 100644
index 00000000000..ca198cc9aa8
--- /dev/null
+++ b/html/changelogs/geeves-hardsuit_toggling.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+ - tweak: "You can no longer toggle your hardsuit pieces while incapacitated."
\ No newline at end of file