From 7f7aed0112320d20db8c164ca1d0cadf0dfdcac7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 5 Aug 2017 12:20:37 -0500 Subject: [PATCH] Fixes showers breaking lighting objects. --- code/game/objects/structures/watercloset.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 8d796904fd..1b8a6635ee 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -222,7 +222,7 @@ if(isliving(G)) var/mob/living/L = G wash_mob(L) - else + else if(isobj(G)) // Skip the light objects wash_obj(G) else if(isopenturf(loc)) @@ -286,7 +286,7 @@ wash_obj(O) -/obj/machinery/shower/proc/wash_obj(atom/movable/O) +/obj/machinery/shower/proc/wash_obj(obj/O) . = O.clean_blood() O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) if(isitem(O))