Remove sharp/edge in procs and consolidate them into damage flags. (#8672)

This commit is contained in:
Matt Atlas
2020-04-30 20:29:35 +02:00
committed by GitHub
parent bf4e3d939d
commit 105cb5d64e
41 changed files with 194 additions and 176 deletions
@@ -104,7 +104,7 @@
if(W.edge)
to_chat(H, "<span class='warning'>You stab \the [src] with \the [W]!</span>")
H.apply_damage(2, BRUTE, target_zone, edge = TRUE)
H.apply_damage(2, BRUTE, target_zone, damage_flags = DAM_EDGE)
playsound(get_turf(H), 'sound/weapons/bladeslice.ogg', 50, 1, -1)
if(H.can_feel_pain())
var/obj/item/organ/external/organ = H.get_organ(target_zone)
@@ -46,7 +46,7 @@
var/obj/item/organ/external/affecting = H.get_organ(zone)
to_chat(user, "<span class='danger'>The sword refuses you as its true wielder, slashing your [affecting.name] instead!</span>")
user.apply_damage(active_force, BRUTE, zone, 0, sharp=1, edge=1)
user.apply_damage(active_force, BRUTE, zone, 0, damage_flags = DAM_SHARP|DAM_EDGE)
user.drop_from_inventory(src)