From c39de1e7ed342f72b3f2bdcb42e563123e24c40f Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 10 Jan 2018 10:54:35 -0200 Subject: [PATCH] Merge pull request #34209 from ShizCalev/defib-icon-fixes Fixes missing defib inhands --- code/game/objects/items/defib.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 6ee50f5524..cce97f6766 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -273,6 +273,9 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles" item_state = "defibpaddles" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + force = 0 throwforce = 6 w_class = WEIGHT_CLASS_BULKY @@ -311,6 +314,9 @@ item_state = "defibpaddles[wielded]" if(cooldown) icon_state = "defibpaddles[wielded]_cooldown" + if(iscarbon(loc)) + var/mob/living/carbon/C = loc + C.update_inv_hands() /obj/item/twohanded/shockpaddles/suicide_act(mob/user) user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") @@ -583,8 +589,6 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' req_defib = FALSE /obj/item/twohanded/shockpaddles/cyborg/attack(mob/M, mob/user) @@ -606,8 +610,6 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' req_defib = FALSE #undef HALFWAYCRITDEATH