From 205c9b3d4364491869e7fc372ed256812e19da1c Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 23 Mar 2022 12:21:29 -0300 Subject: [PATCH] Those are too early. --- code/_onclick/item_attack.dm | 2 +- code/_onclick/other_mobs.dm | 2 +- code/controllers/subsystem/fire_burning.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index cdc561e4b3..8f3a7ef02c 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -146,7 +146,7 @@ visible_message("[user] has hit [src] with [I]!", null, null, COMBAT_MESSAGE_RANGE) //only witnesses close by and the victim see a hit message. log_combat(user, src, "attacked", I) - take_damage(totitemdamage, I.damtype, MELEE, 1) + take_damage(totitemdamage, I.damtype, "melee", 1) /mob/living/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) var/list/block_return = list() diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index b4b3582c73..073f50d8c5 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -171,7 +171,7 @@ if(ishuman(ML)) var/mob/living/carbon/human/H = ML affecting = H.get_bodypart(ran_zone(dam_zone)) - var/armor = ML.run_armor_check(affecting, MELEE) + var/armor = ML.run_armor_check(affecting, "melee") if(prob(75)) ML.apply_damage(rand(1,3), BRUTE, affecting, armor) ML.visible_message("[name] bites [ML]!", \ diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fire_burning.dm index a5e903221a..f81c23d186 100644 --- a/code/controllers/subsystem/fire_burning.dm +++ b/code/controllers/subsystem/fire_burning.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(fire_burning) if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun if(!(O.resistance_flags & FIRE_PROOF)) - O.take_damage(10 * delta_time, BURN, FIRE, 0) + O.take_damage(10 * delta_time, BURN, "fire", 0) else O.extinguish()