From 81a6d9ddbfe280988e7c5233305f880f4b87abe1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 8 Feb 2016 10:29:32 +1030 Subject: [PATCH] Should fix Teshari stripping intent bugs. --- code/modules/mob/holder.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 212f2219ad9..15c3dc321e5 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -98,7 +98,7 @@ var/list/holder_mob_icon_cache = list() /mob/living/MouseDrop(var/atom/over_object) var/mob/living/carbon/human/H = over_object - if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H)) + if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) get_scooped(H, (usr == src)) return return ..() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f7f1ba74865..a0636f453f4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1357,13 +1357,6 @@ return 1 return 0 -/mob/living/carbon/human/MouseDrop(var/atom/over_object) - var/mob/living/carbon/human/H = over_object - if(holder_type && a_intent == I_HELP && istype(H) && H == usr && H.a_intent == I_HELP && !issmall(H) && Adjacent(H)) - get_scooped(H) - return - return ..() - //Puts the item into our active hand if possible. returns 1 on success. /mob/living/carbon/human/put_in_active_hand(var/obj/item/W) return (hand ? put_in_l_hand(W) : put_in_r_hand(W))