diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index d8b83eb6a2e..59111b1b2cf 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -4,7 +4,6 @@ Contains most of the procs that are called when a mob is attacked by something bullet_act ex_act meteor_act -emp_act */ @@ -138,13 +137,6 @@ emp_act . = shield.handle_shield(src, damage, damage_source, attacker, def_zone, attack_text) if(.) return return 0 -/* -/mob/living/carbon/human/emp_act(severity) - for(var/obj/O in src) - if(!O) continue - O.emp_act(severity) - ..() -*/ //Returns 1 if the attack hit, 0 if it missed. /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index f146ab25412..b44a362405b 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -231,7 +231,6 @@ var/list/organ_cache = list() //Note: external organs have their own version of this proc /obj/item/organ/proc/take_damage(amount, var/silent=0) - world << "take_damage([amount], [silent]) called on [src.name]." if(src.status & ORGAN_ROBOT) src.damage = between(0, src.damage + (amount * 0.8), max_damage) else diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 8a2bb4cf360..32ab9b08c9b 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -222,7 +222,6 @@ return (vital || brute_dam + burn_dam + additional_damage < max_damage) /obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list()) - world << "take_damage([brute], [burn], [sharp], [edge], [used_weapon], [forbidden_limbs]) called on [src.name]." if((brute <= 0) && (burn <= 0)) return 0 if(status & ORGAN_DESTROYED)