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
+3 -1
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)
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
+2
View File
@@ -46,3 +46,5 @@
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