From ac8f5451e8d74db2ea1f452651c1532093578593 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Thu, 27 Feb 2014 14:09:47 +1300 Subject: [PATCH] Chemgrenade fix - If check to handle grenades detonating in a mobs hand correctly. --- code/game/objects/items/weapons/grenades/chem_grenade.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 29814b14acc..2f24667049d 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -161,6 +161,10 @@ if( A == src ) continue src.reagents.reaction(A, 1, 10) + if(istype(loc, /mob/living/carbon)) //drop dat grenade if it goes off in your hand + var/mob/living/carbon/C = loc + C.drop_from_inventory(src) + C.throw_mode_off() invisibility = INVISIBILITY_MAXIMUM //Why am i doing this? spawn(50) //To make sure all reagents can work