Merge pull request #2268 from Citadel-Station-13/upstream-merge-29706

[MIRROR] Fixes showers breaking lighting objects.
This commit is contained in:
LetterJay
2017-08-07 07:18:17 -05:00
committed by GitHub
+2 -2
View File
@@ -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))