From ba89b53445373da34740d9b5097963f6759ede65 Mon Sep 17 00:00:00 2001 From: argoneus Date: Tue, 29 Apr 2014 20:25:57 +0200 Subject: [PATCH 1/2] Shamelessly added myself to the admin list --- config/admins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/admins.txt b/config/admins.txt index 01a9ad8d92b..837dfbd8ba7 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -59,3 +59,4 @@ hornygranny = Game Master yota = Game Master firecage = Game Master donkieyo = Game Master +argoneus = Game Master From d08c9ebc08284300ff2ad757ccf1d567c75a778d Mon Sep 17 00:00:00 2001 From: argoneus Date: Tue, 29 Apr 2014 21:38:38 +0200 Subject: [PATCH 2/2] Fixed #3571 --- code/game/objects/structures/watercloset.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5c9900c3c5c..5e08b6c70e3 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -152,11 +152,8 @@ on = !on update_icon() if(on) - if (M.loc == loc) - wash(M) - check_heat(M) for (var/atom/movable/G in loc) - G.clean_blood() + Crossed(G) /obj/machinery/shower/attackby(obj/item/I, mob/user)