From 7e8c1cf7fe34f556bedb8077c4298ad6a4b7a9d7 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Mon, 4 Aug 2014 17:05:16 -0700 Subject: [PATCH] Plasmamen ignite when not wearing their suit. Conflicts: code/modules/mob/living/carbon/human/human_defines.dm --- .../mob/living/carbon/human/human_defines.dm | 3 +++ code/modules/mob/living/carbon/human/life.dm | 6 +++++- .../living/carbon/human/plasmaman/species.dm | 6 ++++++ .../mob/living/carbon/human/update_icons.dm | 3 +-- icons/mob/OnFire.dmi | Bin 6192 -> 4324 bytes 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index c57f84a1f6f..6f99995aba4 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -70,3 +70,6 @@ var/check_mutations=0 // Check mutations on next life tick var/lastFart = 0 // Toxic fart cooldown. + + fire_dmi = 'icons/mob/OnFire.dmi' + fire_sprite = "Standing" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ad4875dfa6b..c6f13cba5aa 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -446,7 +446,11 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc if (!istype(wear_suit,/obj/item/clothing/suit/space/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/plasmaman)) //testing("Plasmaman [src] leakin'. coverflags=[cover_flags]") // OH FUCK HE LEAKIN'. - environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount) + // This was OP. + //environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount) + src << "Your body reacts with the atmosphere and bursts into flame!" + adjust_fire_stacks(0.5) + IgniteMob() if(breath) loc.assume_air(breath) diff --git a/code/modules/mob/living/carbon/human/plasmaman/species.dm b/code/modules/mob/living/carbon/human/plasmaman/species.dm index fc084ff6c6f..75053b54a7f 100644 --- a/code/modules/mob/living/carbon/human/plasmaman/species.dm +++ b/code/modules/mob/living/carbon/human/plasmaman/species.dm @@ -11,12 +11,18 @@ breath_type = "plasma" + var/heat_level_1 = 350 // Heat damage level 1 above this point. + var/heat_level_2 = 400 // Heat damage level 2 above this point. + var/heat_level_3 = 500 // Heat damage level 3 above this point. + /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking) if(copytext(message, 1, 2) != "*") message = replacetext(message, "s", stutter("ss")) return message /datum/species/plasmaman/equip(var/mob/living/carbon/human/H) + H.fire_sprite = "Plasmaman" + // Unequip existing suits and hats. H.u_equip(H.wear_suit) H.u_equip(H.head) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 4ea26a60a66..34eb4261402 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -432,7 +432,6 @@ proc/get_damage_icon_part(damage_state, body_part) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") if(facial_hair_style.do_colouration) facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) - face_standing.Blend(facial_s, ICON_OVERLAY) if(h_style && !(head && (head.flags & BLOCKHEADHAIR))) @@ -541,7 +540,7 @@ proc/get_damage_icon_part(damage_state, body_part) remove_overlay(FIRE_LAYER) if(on_fire) - overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"=-FIRE_LAYER) + overlays_standing[FIRE_LAYER] = image("icon"=fire_dmi, "icon_state"=fire_sprite, "layer"=-FIRE_LAYER) else overlays_standing[FIRE_LAYER] = null diff --git a/icons/mob/OnFire.dmi b/icons/mob/OnFire.dmi index 52c6ad88a1ca2c24cad096906bec0c79e4ec789e..a4327f071c6e1525bc0eff51364a03a55fe2ec0e 100644 GIT binary patch literal 4324 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 A;Q#;t