From a586c1dd70573f3e5ac97833f1fbf1acc68a4167 Mon Sep 17 00:00:00 2001
From: Walter0o <Walter0o@users.noreply.github.com>
Date: Sun, 3 Aug 2014 13:52:47 +0200
Subject: [PATCH] remove double paper/attack() definition

---
 code/game/objects/items/weapons/cosmetics.dm | 22 +-------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index d473343e61..2e5f61f80e 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -65,24 +65,4 @@
 	else
 		user << "<span class='notice'>Where are the lips on that?</span>"
 
-//you can wipe off lipstick with paper!
-/obj/item/weapon/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(user.zone_sel.selecting == "mouth")
-		if(!istype(M, /mob))	return
-
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H == user)
-				user << "<span class='notice'>You wipe off the lipstick with [src].</span>"
-				H.lip_style = null
-				H.update_body()
-			else
-				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
-								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
-				if(do_after(user, 10) && do_after(H, 10, 5, 0))	//user needs to keep their active hand, H does not.
-					user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
-										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
-					H.lip_style = null
-					H.update_body()
-	else
-		..()
\ No newline at end of file
+//you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack()