From e6a7a295d24541a42b81fb75f4d3375a0b1056f8 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Thu, 24 Dec 2020 19:39:41 +0000 Subject: [PATCH] Wash cum bug again Muliple stacks break it.. --- code/game/atoms.dm | 7 +++++-- code/game/objects/structures/watercloset.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index a3543eaf..b9fe5688 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -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) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index cc201ae9..a43c5a47 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7de000c2..ad8960db 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -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)