diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 60a4c5ce24..55c13be21d 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -621,16 +621,14 @@
use_obj.loc = src
else if (deploy_mode != ONLY_RETRACT)
- if(check_slot)
- if(check_slot != use_obj)
- H << "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way."
+ if(check_slot && check_slot == use_obj)
return
+ use_obj.loc = H
+ if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0, 1))
+ use_obj.loc = src
+ H << "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way."
else
- use_obj.loc = H
- if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0))
- use_obj.loc = src
- else
- H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly."
+ H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly."
if(piece == "helmet" && helmet)
helmet.update_light(H)