cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some sharp stuff not being recognized as such.

Browse Source 
That lead to knives bruising people you stab, for example.
This commit is contained in:
Chinsky
2013-05-22 12:55:15 +04:00
parent 33c2b45818
commit 1ca42d0c88
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__HELPERS/unsorted.dm
View File

@@ -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. //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? /proc/is_sharp(obj/item/W as obj) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT?
return ( \ return ( \
W.sharp || \
istype(W, /obj/item/weapon/screwdriver) || \ istype(W, /obj/item/weapon/screwdriver) || \
istype(W, /obj/item/weapon/pen) || \ istype(W, /obj/item/weapon/pen) || \
istype(W, /obj/item/weapon/weldingtool) || \ istype(W, /obj/item/weapon/weldingtool) || \

2
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -138,7 +138,7 @@ emp_act
if(armor >= 2) return 0 if(armor >= 2) return 0
if(!I.force) 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 var/bloody = 0
if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2))) if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))