From 9ad0bc5c89c37d825a78ea19f1e42dbc4b3f97dd Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Thu, 29 Dec 2011 10:01:19 -0700
Subject: [PATCH] Can compile, now.

---
 code/WorkInProgress/SkyMarshal/policetape.dm  |  2 +-
 .../game/objects/items/weapons/papers_bins.dm | 57 +++++++++----------
 code/game/objects/items/weapons/uplinks.dm    |  2 +-
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/code/WorkInProgress/SkyMarshal/policetape.dm b/code/WorkInProgress/SkyMarshal/policetape.dm
index 54d1977492c..60d9aebd072 100644
--- a/code/WorkInProgress/SkyMarshal/policetape.dm
+++ b/code/WorkInProgress/SkyMarshal/policetape.dm
@@ -106,7 +106,7 @@
 	breaktape(null, user)
 
 /obj/item/policetape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
-	if(!W || (!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user)))
+	if(!W && user.a_intent != "help" || (!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user)))
 		user << "You can't break the tape with that!"
 		return
 	user.show_viewers(text("\blue [] breaks the police tape!", user))
diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm
index 46247b0257a..9b0ff45816d 100644
--- a/code/game/objects/items/weapons/papers_bins.dm
+++ b/code/game/objects/items/weapons/papers_bins.dm
@@ -85,15 +85,13 @@ CLIPBOARDS
 
 /obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob)
 	..()
-	var/clown = 0
-	if(user.mind && (user.mind.assigned_role == "Clown"))
-		clown = 1
-
 	if (istype(P, /obj/item/weapon/pen))
 		if(src.stamped != null && src.stamped.len > 0)
 			user << "\blue This paper has been stamped and can no longer be edited."
 			return
 
+		for(var/mob/O in viewers(user))
+			O.show_message("\blue [user] starts writing on the paper with [src].", 1)
 		var/t = "[src.info]"
 		do
 			t = input(user, "What text do you wish to add?", text("[]", src.name), t)  as message
@@ -151,33 +149,32 @@ CLIPBOARDS
 
 			user << "\blue You stamp the paper with your rubber stamp."
 
-	else if(istype(P, /obj/item/weapon/stamperaser))
-		if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
+		if(istype(P, /obj/item/weapon/stamperaser))
+			if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
 				return
-		src.info = src.infoold
-		for(var/i, i <= stamped.len, i++)
-			switch(stamped[i])
-				if(/obj/item/weapon/stamp/captain)
-					src.overlays -= "paper_stamped_cap"
-				if(/obj/item/weapon/stamp/hop)
-					src.overlays -= "paper_stamped_hop"
-				if(/obj/item/weapon/stamp/hos)
-					src.overlays -= "paper_stamped_hos"
-				if(/obj/item/weapon/stamp/ce)
-					src.overlays -= "paper_stamped_ce"
-				if(/obj/item/weapon/stamp/rd)
-					src.overlays -= "paper_stamped_rd"
-				if(/obj/item/weapon/stamp/cmo)
-					src.overlays -= "paper_stamped_cmo"
-				if(/obj/item/weapon/stamp/denied)
-					src.overlays -= "paper_stamped_denied"
-				if(/obj/item/weapon/stamp/clown)
-					src.overlays -= "paper_stamped_clown"
-				else
-					src.overlays -= "paper_stamped"
-		stamped = new list()
-
-		user << "\blue You sucessfully remove those pesky stamps."
+			src.info = src.infoold
+			for(var/i, i <= stamped.len, i++)
+				switch(stamped[i])
+					if(/obj/item/weapon/stamp/captain)
+						src.overlays -= "paper_stamped_cap"
+					if(/obj/item/weapon/stamp/hop)
+						src.overlays -= "paper_stamped_hop"
+					if(/obj/item/weapon/stamp/hos)
+						src.overlays -= "paper_stamped_hos"
+					if(/obj/item/weapon/stamp/ce)
+						src.overlays -= "paper_stamped_ce"
+					if(/obj/item/weapon/stamp/rd)
+						src.overlays -= "paper_stamped_rd"
+					if(/obj/item/weapon/stamp/cmo)
+						src.overlays -= "paper_stamped_cmo"
+					if(/obj/item/weapon/stamp/denied)
+						src.overlays -= "paper_stamped_denied"
+					if(/obj/item/weapon/stamp/clown)
+						src.overlays -= "paper_stamped_clown"
+					else
+						src.overlays -= "paper_stamped"
+			stamped = list()
+			user << "\blue You sucessfully remove those pesky stamps."
 
 	/*
 	else
diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm
index cc9c8b9d1ab..8a8b9fa3cc0 100644
--- a/code/game/objects/items/weapons/uplinks.dm
+++ b/code/game/objects/items/weapons/uplinks.dm
@@ -200,7 +200,7 @@ SYNDICATE UPLINK
 				if("eraser")
 					if(uses)
 						uses --
-						new /obj/item/weapon/stamperaser(get_turf(hostpda))
+						new /obj/item/weapon/stamperaser(get_turf(src))
 		else if (href_list["lock"] && src.origradio)
 			// presto chango, a regular radio again! (reset the freq too...)
 			shutdown_uplink()