From 1ca42d0c88d2d35ed7034fe59bb29e666d2b7f93 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 22 May 2013 12:55:15 +0400 Subject: [PATCH] Fixed some sharp stuff not being recognized as such. That lead to knives bruising people you stab, for example. --- code/__HELPERS/unsorted.dm | 1 + code/modules/mob/living/carbon/human/human_defense.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 659948266e..40e2d4618c 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1328,6 +1328,7 @@ proc/is_hot(obj/item/W as obj) //Is this even used for anything besides balloons? Yes I took out the W:lit stuff because : really shouldnt be used. /proc/is_sharp(obj/item/W as obj) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT? return ( \ + W.sharp || \ istype(W, /obj/item/weapon/screwdriver) || \ istype(W, /obj/item/weapon/pen) || \ istype(W, /obj/item/weapon/weldingtool) || \ diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 214100d2cc..34a57cd931 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -138,7 +138,7 @@ emp_act if(armor >= 2) return 0 if(!I.force) return 0 - apply_damage(I.force, I.damtype, affecting, armor , I.sharp, I.name) + apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), I.name) var/bloody = 0 if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))