shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3453 from Citadel-Station-13/upstream-merge-31750

Browse Source 
[MIRROR] Prevent creampie overlays from stacking.
This commit is contained in:
LetterJay
2017-10-17 08:58:39 -04:00
committed by GitHub
parent e3922656fc 7526b3cb94
commit dc17bfd316
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_pie.dm
+4 -2
View File
@@ -50,7 +50,9 @@
H.adjust_blurriness(1) H.adjust_blurriness(1)
H.visible_message("<span class='warning'>[H] is creamed by [src]!</span>", "<span class='userdanger'>You've been creamed by [src]!</span>") H.visible_message("<span class='warning'>[H] is creamed by [src]!</span>", "<span class='userdanger'>You've been creamed by [src]!</span>")
playsound(H, "desceration", 50, TRUE) 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) qdel(src)
@@ -237,4 +239,4 @@
icon_state = "frostypie" icon_state = "frostypie"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6) bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
tastes = list("mint" = 1, "pie" = 1) tastes = list("mint" = 1, "pie" = 1)
foodtype = GRAIN | FRUIT | SUGAR foodtype = GRAIN | FRUIT | SUGAR
code/modules/mob/living/carbon/human/human.dm
+4 -4
View File
@@ -696,10 +696,10 @@
/mob/living/carbon/human/wash_cream() /mob/living/carbon/human/wash_cream()
//clean both to prevent a rare bug 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_lizard"))
cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human")) cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human"))
creamed = FALSE
//Turns a mob black, flashes a skeleton overlay //Turns a mob black, flashes a skeleton overlay
//Just like a cartoon! //Just like a cartoon!
code/modules/mob/living/carbon/human/human_defines.dm
+50 -48
View File
@@ -1,48 +1,50 @@
/mob/living/carbon/human /mob/living/carbon/human
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD) 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) possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
pressure_resistance = 25 pressure_resistance = 25
//Hair colour and style //Hair colour and style
var/hair_color = "000" var/hair_color = "000"
var/hair_style = "Bald" var/hair_style = "Bald"
//Facial hair colour and style //Facial hair colour and style
var/facial_hair_color = "000" var/facial_hair_color = "000"
var/facial_hair_style = "Shaved" var/facial_hair_style = "Shaved"
//Eye colour //Eye colour
var/eye_color = "000" var/eye_color = "000"
var/skin_tone = "caucasian1" //Skin tone 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_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
var/lip_color = "white" var/lip_color = "white"
var/age = 30 //Player's age (pure fluff) var/age = 30 //Player's age (pure fluff)
var/underwear = "Nude" //Which underwear the player wants var/underwear = "Nude" //Which underwear the player wants
var/undershirt = "Nude" //Which undershirt the player wants var/undershirt = "Nude" //Which undershirt the player wants
var/socks = "Nude" //Which socks the player wants var/socks = "Nude" //Which socks the player wants
var/backbag = DBACKPACK //Which backpack type the player has chosen. var/backbag = DBACKPACK //Which backpack type the player has chosen.
//Equipment slots //Equipment slots
var/obj/item/wear_suit = null var/obj/item/wear_suit = null
var/obj/item/w_uniform = null var/obj/item/w_uniform = null
var/obj/item/belt = null var/obj/item/belt = null
var/obj/item/wear_id = null var/obj/item/wear_id = null
var/obj/item/r_store = null var/obj/item/r_store = null
var/obj/item/l_store = null var/obj/item/l_store = null
var/obj/item/s_store = null var/obj/item/s_store = null
var/special_voice = "" // For changing our voice. Used by a symptom. var/special_voice = "" // For changing our voice. Used by a symptom.
var/bleed_rate = 0 //how much are we bleeding var/bleed_rate = 0 //how much are we bleeding
var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding
var/name_override //For temporary visible name changes var/name_override //For temporary visible name changes
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
var/datum/personal_crafting/handcrafting var/datum/personal_crafting/handcrafting
can_buckle = TRUE can_buckle = TRUE
buckle_lying = FALSE buckle_lying = FALSE
can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot) 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