From a852d3f314e335f7d3bb90850b43599d7b12b4a9 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 10 Jan 2017 18:28:40 -0800 Subject: [PATCH] Fixes a garrote runtime --- code/game/objects/items/weapons/garrote.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 22b589c7517..a48bc19d512 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -107,6 +107,12 @@ return /obj/item/weapon/twohanded/garrote/process() + if(!strangling) + // Our mark got gibbed or similar + update_icon() + processing_objects.Remove(src) + return + if(!istype(loc, /mob/living/carbon/human)) strangling = null