diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 8fd1d5d858..d78484dc39 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -403,7 +403,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie process() check_owner() - if(state > 1) + if((state > 1) || !owner) processing_objects.Remove(src) attack_self(mob/user as mob) @@ -419,7 +419,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie proc/check_owner() //He's dead, jim - if(!owner || owner.stat == DEAD) + if((state == 1) && owner && (owner.stat == DEAD)) update_state(2) audible_message("The [name] begins flashing red.") sleep(30)