From ece947132907b69ea907b5b52bbd93c34e16201e Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 27 Sep 2019 23:37:49 -0800 Subject: [PATCH] Fixes grab having big delay on deletion after throws --- code/modules/mob/living/living.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index bb0759b5eef..a2ea9809e22 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1281,7 +1281,11 @@ default behaviour is: var/turf/end_T = get_turf(target) if(end_T) add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]") +<<<<<<< HEAD src.drop_from_inventory(G) //VOREStation Addition: grab exploit fix +======= + src.drop_from_inventory(G) +>>>>>>> 2ec5dbb... Merge pull request #6463 from Heroman3003/grabfix src.drop_from_inventory(item) if(!item || !isturf(item.loc))