From 9677bfb5a36bd7b2b5fa230df02b1245cfc2454b Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 17 Jun 2023 09:40:06 +0100 Subject: [PATCH 1/2] parries don't cut npcs in half --- code/game/objects/weapons.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 44d582249f9f6..265863023012c 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_disintegrate) + return 1 + if(!isnull(item_to_disintegrate) && istype(item_to_disintegrate,/obj/item/weapon/gun) && !prob(BASE_PARRY_PLASMA_DESTROY)) force_half_damage = 1 From a7814787fd92148876b7b48e6ae8e4c3c634e579 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 17 Jun 2023 09:46:27 +0100 Subject: [PATCH 2/2] typo --- code/game/objects/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 265863023012c..649d9efa24b98 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -64,7 +64,7 @@ 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_disintegrate) + 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))