From 06ea404a2835b3171e51323790c828b26baf36bd Mon Sep 17 00:00:00 2001 From: Mercenaryblue Date: Tue, 17 Oct 2017 04:47:45 -0400 Subject: [PATCH] Prevent creampie overlays from stacking. --- .../food_and_drinks/food/snacks_pie.dm | 6 ++- code/modules/mob/living/carbon/human/human.dm | 8 +-- .../mob/living/carbon/human/human_defines.dm | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index b92c3b3874..977bd60da1 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -50,7 +50,9 @@ H.adjust_blurriness(1) H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") playsound(H, "desceration", 50, TRUE) - H.add_overlay(creamoverlay) + if (!H.creamed) // one layer at a time + H.add_overlay(creamoverlay) + H.creamed = TRUE qdel(src) @@ -237,4 +239,4 @@ icon_state = "frostypie" bonus_reagents = list("nutriment" = 4, "vitamin" = 6) tastes = list("mint" = 1, "pie" = 1) - foodtype = GRAIN | FRUIT | SUGAR + foodtype = GRAIN | FRUIT | SUGAR \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d1e363bb90..1d7b482875 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -696,10 +696,10 @@ /mob/living/carbon/human/wash_cream() - //clean both to prevent a rare bug - cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard")) - cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human")) - + if(creamed) //clean both to prevent a rare bug + cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard")) + cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human")) + creamed = FALSE //Turns a mob black, flashes a skeleton overlay //Just like a cartoon! diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index c1f5075b43..9e72a1eaad 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /mob/living/carbon/human hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD) possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) @@ -46,3 +47,55 @@ can_buckle = TRUE buckle_lying = FALSE can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot) +======= +/mob/living/carbon/human + hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD) + possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) + pressure_resistance = 25 + //Hair colour and style + var/hair_color = "000" + var/hair_style = "Bald" + + //Facial hair colour and style + var/facial_hair_color = "000" + var/facial_hair_style = "Shaved" + + //Eye colour + var/eye_color = "000" + + var/skin_tone = "caucasian1" //Skin tone + + var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup + var/lip_color = "white" + + var/age = 30 //Player's age (pure fluff) + + var/underwear = "Nude" //Which underwear the player wants + var/undershirt = "Nude" //Which undershirt the player wants + var/socks = "Nude" //Which socks the player wants + var/backbag = DBACKPACK //Which backpack type the player has chosen. + + //Equipment slots + var/obj/item/wear_suit = null + var/obj/item/w_uniform = null + var/obj/item/belt = null + var/obj/item/wear_id = null + var/obj/item/r_store = null + var/obj/item/l_store = null + var/obj/item/s_store = null + + var/special_voice = "" // For changing our voice. Used by a symptom. + + var/bleed_rate = 0 //how much are we bleeding + var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding + + var/name_override //For temporary visible name changes + + var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects + var/datum/personal_crafting/handcrafting + can_buckle = TRUE + buckle_lying = FALSE + can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot) + + var/creamed = FALSE //to use with creampie overlays +>>>>>>> 4b06c5c... Prevent creampie overlays from stacking. (#31750)