From 4f84ed7fdd44db0d3fb64e7cc5b686b8e516162b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 26 Feb 2019 18:28:20 -0500 Subject: [PATCH] Nerfs benos being able to hold any item but only if they strip it off someone else first (#8039) --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/living.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8c8c8e2d0c..7909b5e71a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -264,7 +264,7 @@ if(pocket_item) if(pocket_item == (pocket_id == SLOT_R_STORE ? r_store : l_store)) //item still in the pocket we search dropItemToGround(pocket_item) - if(!put_in_hands(pocket_item)) + if(!usr.can_hold_items() || !usr.put_in_hands(pocket_item)) pocket_item.forceMove(drop_location()) else if(place_item) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index ef91c6843d..7c0eaacf26 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -705,7 +705,7 @@ log_combat(src, who, "stripped [what] off") if(what == who.get_item_by_slot(where)) if(who.dropItemToGround(what)) - if(!put_in_hands(what)) + if(!can_hold_items() || !put_in_hands(what)) what.forceMove(drop_location()) log_combat(src, who, "stripped [what] off")