From d2a92f0b0e6ae6c5332d1cede8f6f5201593d451 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 15 Oct 2021 18:28:53 +0200 Subject: [PATCH] [MIRROR] Fixes the on fire overlay for monkeys. [MDB IGNORE] (#8835) * Fixes the on fire overlay for monkeys. (#62110) Monkeys were receiving the "Standing" overlay when ablaze, which is meant for human mobs. * Fixes the on fire overlay for monkeys. Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/mob/living/carbon/human/human_update_icons.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 3 +++ code/modules/mob/living/carbon/human/species_types/monkeys.dm | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index c0340b57b7a..9b6cc0e727e 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -66,7 +66,7 @@ There are several things that need to be remembered: ..() /mob/living/carbon/human/update_fire() - ..((fire_stacks > HUMAN_FIRE_STACK_ICON_NUM) ? "Standing" : "Generic_mob_burning") + ..((fire_stacks > HUMAN_FIRE_STACK_ICON_NUM) ? dna.species.fire_overlay : "Generic_mob_burning") /* --------------------------------------- */ diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index f908e9fc1f2..d7607ea92d6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -144,6 +144,9 @@ GLOBAL_LIST_EMPTY(features_by_species) /// The body temperature limit the body can take before it starts taking damage from cold. var/bodytemp_cold_damage_limit = BODYTEMP_COLD_DAMAGE_LIMIT + /// The icon_state of the fire overlay added when sufficently ablaze and standing. see onfire.dmi + var/fire_overlay = "Standing" + ///the species that body parts are surgically compatible with (found in _DEFINES/mobs.dm) ///current acceptable bitfields are HUMAN_BODY, ALIEN_BODY, LARVA_BODY, MONKEY_BODY, or NONE var/allowed_animal_origin = HUMAN_BODY diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index ccb464202da..9227193ab25 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -38,6 +38,7 @@ BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/monkey,\ BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/monkey,\ BODY_ZONE_CHEST = /obj/item/bodypart/chest/monkey) + fire_overlay = "Monkey_burning" dust_anim = "dust-m" gib_anim = "gibbed-m"