From 1808b82cd40eaa1d65f1085a20ca7cc40f940c16 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Wed, 25 Jul 2012 00:16:43 +0000 Subject: [PATCH] - You can now wash people's mouths out with soap by having soap in your hand and targeting their mouth. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4166 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/clown_items.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index ae385487874..86e1cbd02f6 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -45,13 +45,19 @@ BIKE HORN /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob) if(istype(target,/obj/effect/decal/cleanable)) - user << "\blue You scrub the [target.name] out." + user << "\blue You scrub \the [target.name] out." del(target) else - user << "\blue You clean the [target.name]." + user << "\blue You clean \the [target.name]." target.clean_blood() return +/obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob) + if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" ) + user.visible_message("\red \the [user] washes \the [target]'s mouth out with soap!") + return + ..() + /obj/item/weapon/bikehorn/attack_self(mob/user as mob) if (spam_flag == 0) spam_flag = 1