From 25c01ef3ba191d392b0e194ba98d65e052a18be2 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 22 Jul 2016 21:03:17 -0400 Subject: [PATCH] Fixes up apply_damage --- code/game/objects/items/toys.dm | 2 +- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/research/experimentor.dm | 4 ++-- code/modules/surgery/face.dm | 2 +- code/modules/surgery/other.dm | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index dd5102a25d7..ec524314b71 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1372,7 +1372,7 @@ obj/item/toy/cards/deck/syndicate/black is_empty = 1 playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1) user.visible_message("The [src] goes off!") - M.apply_damage(200, "brute", "head", used_weapon = "Self-inflicted gunshot would to the head.", sharp=1) + M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot would to the head.") M.death() else user.visible_message("[user] lowers the [src] from their head.") diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 866c01c9702..921080c989a 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -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, var/sharp = 0, var/edge = 0) +/mob/living/proc/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/used_weapon = null) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 30c58cce776..262820990c2 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -260,7 +260,7 @@ if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!") for(var/mob/living/m in oview(1, src)) - m.apply_damage(15,"brute",pick("head","chest","groin")) + m.apply_damage(15,BRUTE,pick("head","chest","groin")) investigate_log("Experimentor dealt minor brute to [m].", "experimentor") ejectItem(TRUE) if(prob(EFFECT_PROB_LOW-badThingCoeff)) @@ -398,7 +398,7 @@ visible_message("[src] malfunctions, activating its emergency coolant systems!") throwSmoke(src.loc) for(var/mob/living/m in oview(1, src)) - m.apply_damage(5,"burn",pick("head","chest","groin")) + m.apply_damage(5,BURN,pick("head","chest","groin")) investigate_log("Experimentor has dealt minor burn damage to [m]", "experimentor") ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 1c1ad5dfa1d..6e947511dd6 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -128,7 +128,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ " Your hand slips, tearing skin on [target]'s face with \the [tool]!") - target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1) + target.apply_damage(10, BRUTE, affected, sharp=1, edge=1) return 0 /datum/surgery_step/face/cauterize diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 44c0e30d9f2..21328599a19 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -256,11 +256,11 @@ if(iscarbon(user)) var/mob/living/carbon/C = user C.Weaken(6) - C.apply_damage(20, "brute", "chest") + C.apply_damage(20, BRUTE, "chest") else if(issilicon(user)) var/mob/living/silicon/S = user S.Weaken(8) - S.apply_damage(20, "brute") + S.apply_damage(20, BRUTE) playsound(S, 'sound/effects/bang.ogg', 50, 1) return 0 user.visible_message("[user] shines light onto the tumor in [target]'s head!", "You cleanse the contamination from [target]'s brain!")