From 4efc4cc3a5a2faa29123351f55cae5c66694ae2b Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 29 May 2017 18:54:17 -0700 Subject: [PATCH] Updates to make sharp items effective more generally --- code/game/objects/effects/glowshroom.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index d78aa5965f4..9af07df67b4 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -162,9 +162,8 @@ G.endurance -= damage_to_do G.CheckEndurance() return - if(istype(I, /obj/item/weapon/wirecutters)) - endurance -= 15 // two hits - CheckEndurance() + else if(I.sharp) + damage_to_do = I.force * 3 // wirecutter: 6->18, knife 10->30, hatchet 12->36 if(I.damtype != STAMINA) endurance -= damage_to_do CheckEndurance()