diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 44d582249f9f6..649d9efa24b98 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -63,6 +63,10 @@ if(isnull(item_to_disintegrate)) return 1 + //Once we have all the references, let's make sure we're not cutting an npc in half. + if(item_to_disintegrate == mob_holding_disintegrated) + return 1 + if(!isnull(item_to_disintegrate) && istype(item_to_disintegrate,/obj/item/weapon/gun) && !prob(BASE_PARRY_PLASMA_DESTROY)) force_half_damage = 1