From 09758ba01ee4925f9af8eca85f1217ec4ca58eea Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Mon, 2 Aug 2021 20:14:14 -0500 Subject: [PATCH] renames damge -> damage (#60647) --- code/__DEFINES/dcs/signals.dm | 3 +-- code/datums/components/explodable.dm | 6 ++---- code/datums/components/gunpoint.dm | 4 ++-- code/modules/mob/living/carbon/damage_procs.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/mob/living/damage_procs.dm | 4 ++-- code/modules/surgery/organs/heart.dm | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 71ef8c31d15..af75224f55c 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -514,7 +514,7 @@ #define COMSIG_MOB_HUD_CREATED "mob_hud_created" ///from base of /mob/living/proc/apply_damage(): (damage, damagetype, def_zone) -#define COMSIG_MOB_APPLY_DAMGE "mob_apply_damage" +#define COMSIG_MOB_APPLY_DAMAGE "mob_apply_damage" ///from base of /mob/living/attack_alien(): (user) #define COMSIG_MOB_ATTACK_ALIEN "mob_attack_alien" ///from base of /mob/throw_item(): (atom/target) @@ -1365,4 +1365,3 @@ /// Called on the organ when it is removed from someone (mob/living/carbon/old_owner) #define COMSIG_ORGAN_REMOVED "comsig_organ_removed" - diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index ae32315f1a8..cfb9048a22b 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -80,12 +80,12 @@ /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMGE, .proc/explodable_attack_zone, TRUE) + RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, .proc/explodable_attack_zone, TRUE) /datum/component/explodable/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER - UnregisterSignal(user, COMSIG_MOB_APPLY_DAMGE) + UnregisterSignal(user, COMSIG_MOB_APPLY_DAMAGE) /// Checks if we're hitting the zone this component is covering /datum/component/explodable/proc/is_hitting_zone(def_zone) @@ -135,5 +135,3 @@ explosion(A, devastation_range, heavy_impact_range, light_impact_range, flame_range, flash_range, log) //epic explosion time if(always_delete) qdel(A) - - diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 4a0f5e99907..51daa6b12fa 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -62,13 +62,13 @@ /datum/component/gunpoint/RegisterWithParent() RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_deescalate) - RegisterSignal(parent, COMSIG_MOB_APPLY_DAMGE, .proc/flinch) + RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, .proc/flinch) RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, .proc/check_shove) RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), .proc/check_bump) /datum/component/gunpoint/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) - UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMGE) + UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE) UnregisterSignal(parent, COMSIG_MOB_ATTACK_HAND) UnregisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP)) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 4a77ff1b8c6..c06ae421220 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -1,7 +1,7 @@ /mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE) - SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) + SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) return 0 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index fe0d1a693e1..df455ce0edc 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1484,7 +1484,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) return TRUE /datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE) - SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone, wound_bonus, bare_wound_bonus, sharpness) // make sure putting wound_bonus here doesn't screw up other signals or uses for this signal + SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone, wound_bonus, bare_wound_bonus, sharpness) // make sure putting wound_bonus here doesn't screw up other signals or uses for this signal var/hit_percent = (100-(blocked+armor))/100 hit_percent = (hit_percent * (100-H.physiology.damage_resistance))/100 if(!damage || (!forced && hit_percent <= 0)) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 5fa935fbf0e..e51d49c58fa 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -2,7 +2,7 @@ /** * Applies damage to this mob * - * Sends [COMSIG_MOB_APPLY_DAMGE] + * Sends [COMSIG_MOB_APPLY_DAMAGE] * * Arguuments: * * damage - amount of damage @@ -15,7 +15,7 @@ * Returns TRUE if damage applied */ /mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE) - SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) + SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) return FALSE diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index fbbdac069b1..0090dcdaaac 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -348,7 +348,7 @@ RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, .proc/reset_crystalizing) RegisterSignal(victim, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(victim, COMSIG_MOB_APPLY_DAMGE, .proc/on_take_damage) + RegisterSignal(victim, COMSIG_MOB_APPLY_DAMAGE, .proc/on_take_damage) ///Ran when disarmed, prevents the ethereal from reviving /obj/item/organ/heart/ethereal/proc/reset_crystalizing(mob/living/defender, mob/living/attacker, zone) @@ -381,7 +381,7 @@ /obj/item/organ/heart/ethereal/proc/stop_crystalization_process(mob/living/ethereal, succesful = FALSE) UnregisterSignal(ethereal, COMSIG_HUMAN_DISARM_HIT) UnregisterSignal(ethereal, COMSIG_PARENT_EXAMINE) - UnregisterSignal(ethereal, COMSIG_MOB_APPLY_DAMGE) + UnregisterSignal(ethereal, COMSIG_MOB_APPLY_DAMAGE) crystalization_process_damage = 0 //Reset damage taken during crystalization