Wash cum bug again

Muliple stacks break it..
This commit is contained in:
QuoteFox
2020-12-24 19:39:41 +00:00
parent 36deebe5b8
commit e6a7a295d2
3 changed files with 10 additions and 2 deletions
+5 -2
View File
@@ -313,7 +313,7 @@
/atom/proc/examine(mob/user)
. = list("[get_examine_string(user, TRUE)].")
if(desc)
. += desc
@@ -514,6 +514,9 @@
/atom/proc/wash_cream()
return TRUE
/atom/proc/wash_cum()
return TRUE
/atom/proc/isinspace()
if(isspaceturf(get_turf(src)))
return TRUE
@@ -866,4 +869,4 @@ Proc for attack log creation, because really why not
return TRUE
/atom/proc/intercept_zImpact(atom/movable/AM, levels = 1)
. |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels)
. |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels)
@@ -340,6 +340,7 @@
/obj/machinery/shower/proc/wash_mob(mob/living/L)
SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
L.wash_cream()
L.wash_cum()
L.ExtinguishMob()
L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
L.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
@@ -719,6 +719,10 @@
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
creamed = FALSE
/mob/living/carbon/human/wash_cum()
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_normal"))
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
//Turns a mob black, flashes a skeleton overlay
//Just like a cartoon!
/mob/living/carbon/human/proc/electrocution_animation(anim_duration)