From 2bc42255f14bc5c843dffbd587d6e1a4d8530c22 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Wed, 29 Apr 2015 18:19:06 +0100 Subject: [PATCH] New fire overlay sprite for ALL Humanoid mobs, Removes hacky plasmaman fire underlay code - Thanks WJohnston! --- .../mob/living/carbon/human/species.dm | 2 -- .../mob/living/carbon/human/species_types.dm | 8 +------- .../mob/living/carbon/human/update_icons.dm | 3 --- icons/mob/OnFire.dmi | Bin 3759 -> 3571 bytes 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 874846982fe..33761bbeefe 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -80,8 +80,6 @@ var/tox_breath_dam_min = MIN_PLASMA_DAMAGE var/tox_breath_dam_max = MAX_PLASMA_DAMAGE - var/custom_fire = 0 //Whether we handle fire icons ourself - /////////// // PROCS // /////////// diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index fd82ab5a17e..730518381ab 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -358,7 +358,6 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ safe_oxygen_min = 0 //We don't breath this safe_toxins_min = 16 //We breath THIS! safe_toxins_max = 0 - custom_fire = 1 var/skin = 0 /datum/species/plasmaman/skin @@ -386,12 +385,7 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ var/obj/item/clothing/suit/space/eva/plasmaman/P = H.wear_suit if(istype(P)) P.Extinguish(H) - - if(H.on_fire) - H.underlays |= plasmaman_on_fire - else - //Thank god humans don't use underlays - H.underlays.Cut() + H.update_fire() //Heal from plasma /datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 307763e4044..c33e23bbf8e 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -177,9 +177,6 @@ Please contact me on #coderbus IRC. ~Carnie x remove_overlay(FIRE_LAYER) if(on_fire) - if(dna) - if(dna.species.custom_fire) - return overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"=-FIRE_LAYER) apply_overlay(FIRE_LAYER) diff --git a/icons/mob/OnFire.dmi b/icons/mob/OnFire.dmi index abd550d9bdd5ec095c8b1feff7bdc9166f6b543c..44ead91e362701e42a57957d13424cc730ccd4e2 100644 GIT binary patch delta 3489 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 P00000NkvXXu0mjfa`wAo delta 3679 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