cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 18:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes projectile sharp and edge flags being ignored

Browse Source
This commit is contained in:
unknown
2014-06-16 19:17:20 -04:00
parent c5e09980b9
commit 95e05a894b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -8,7 +8,7 @@
Returns
standard 0 if fail
*/
/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/used_weapon = null)
/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/used_weapon = null, var/sharp = 0, var/edge = 0)
if(!damage || (blocked >= 2)) return 0
switch(damagetype)
if(BRUTE)
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -57,7 +57,7 @@
P.on_hit(src,2)
return 2
if(!P.nodamage)
apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P)
apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P, sharp=is_sharp(P), edge=has_edge(P))
P.on_hit(src, absorb, def_zone)
return absorb