From ccaecf4a4e473a12d72771604d42e8fb3fa6618e Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Mon, 24 Aug 2015 20:56:11 -0400 Subject: [PATCH] RIG boots may now be worn over shoes. Changes rig/proc/toggle_peice() to allow RIG-based magboots to be worn over shoes. --- code/modules/clothing/spacesuits/rig/rig.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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)