Reworked paper and stamping. Fixes issue 116.

Changed some stuff around in research, as per Xennith's suggestion.
Fixed up the areas in research.

Removed the 2.0.7 map, for the sake of making checkouts slightly faster.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2353 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/weapon.dm

@@ -773,7 +773,7 @@
 
 /obj/item/weapon/paper
 	name = "Paper"
-	icon = 'items.dmi'
+	icon = 'paper.dmi'
 	icon_state = "paper"
 	var/info = null
 	throwforce = 0
@@ -805,7 +805,6 @@
 	name = "paper- 'Judgement'"
 	info = "For crimes against the station, the offender is sentenced to:<BR>\n<BR>\n"
 
-
 /obj/item/weapon/paper/Toxin
 	name = "paper- 'Chemical Information'"
 	info = "Known Onboard Toxins:<BR>\n\tGrade A Semi-Liquid Plasma:<BR>\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.<BR>\n\t\tA gas mask fails to filter plasma after 50 units.<BR>\n\t\tWill attempt to diffuse like a gas.<BR>\n\t\tFiltered by scrubbers.<BR>\n\t\tThere is a bottled version which is very different<BR>\n\t\t\tfrom the version found in canisters!<BR>\n<BR>\n\t\tWARNING: Highly Flammable. Keep away from heat sources<BR>\n\t\texcept in a enclosed fire area!<BR>\n\t\tWARNING: It is a crime to use this without authorization.<BR>\nKnown Onboard Anti-Toxin:<BR>\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.<BR>\n\t\tBest if injected directly into bloodstream.<BR>\n\t\tA full injection is in every regular Med-Kit.<BR>\n\t\tSpecial toxin Kits hold around 7.<BR>\n<BR>\nKnown Onboard Chemicals (other):<BR>\n\tRejuvenation T#001:<BR>\n\t\tEven 1 unit injected directly into the bloodstream<BR>\n\t\t\twill cure paralysis and sleep toxins.<BR>\n\t\tIf administered to a dying patient it will prevent<BR>\n\t\t\tfurther damage for about units*3 seconds.<BR>\n\t\t\tit will not cure them or allow them to be cured.<BR>\n\t\tIt can be administeredd to a non-dying patient<BR>\n\t\t\tbut the chemicals disappear just as fast.<BR>\n\tSleep Toxin T#054:<BR>\n\t\t5 units wilkl induce precisely 1 minute of sleep.<BR>\n\t\t\tThe effect are cumulative.<BR>\n\t\tWARNING: It is a crime to use this without authorization"
@@ -840,7 +839,7 @@
 /obj/item/weapon/paper_bin
 	name = "Paper Bin"
 	desc = "This contains many papers."
-	icon = 'items.dmi'
+	icon = 'paper.dmi'
 	icon_state = "paper_bin1"
 	var/amount = 30.0
 	item_state = "sheet-metal"
@@ -852,7 +851,7 @@
 /obj/item/weapon/pen
 	desc = "It's a normal black ink pen."
 	name = "pen"
-	icon = 'items.dmi'
+	icon = 'paper.dmi'
 	icon_state = "pen"
 	flags = FPRINT | ONBELT | TABLEPASS
 	throwforce = 0
@@ -1378,7 +1377,7 @@
 /obj/item/weapon/stamp
 	desc = "A rubber stamp for stamping important documents."
 	name = "rubber stamp"
-	icon = 'items.dmi'
+	icon = 'paper.dmi'
 	icon_state = "stamp-qm"
 	item_state = "stamp"
 	flags = FPRINT | TABLEPASS

code/game/magic/cultist/talisman.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/paper/talisman
-	icon_state = "papertalisman"
+	icon_state = "paper_talisman"
 	var/imbue = null
 	var/uses = 0
 

code/game/objects/items/weapons/papers_bins.dm

@@ -18,6 +18,8 @@ CLIPBOARDS
 	..()
 	src.pixel_y = rand(-8, 8)
 	src.pixel_x = rand(-9, 9)
+	if(src.info)
+		src.overlays += "paper_words"
 	return
 
 
@@ -187,8 +189,6 @@ CLIPBOARDS
 	n_name = copytext(n_name, 1, 32)
 	if ((src.loc == usr && usr.stat == 0))
 		src.name = text("paper[]", (n_name ? text("- '[n_name]'") : null))
-	if(src.icon_state == "paper_blank" && n_name != "")
-		src.icon_state = "paper"
 	src.add_fingerprint(usr)
 	return
 
@@ -237,8 +237,8 @@ CLIPBOARDS
 		*/
 		t = text("<font face=calligrapher>[]</font>", t)
 
-		if(src.icon_state == "paper_blank")
-			src.icon_state = "paper"
+		if(!overlays.Find("paper_words"))
+			src.overlays += "paper_words"
 		src.info += t
 
 	else
@@ -248,27 +248,27 @@ CLIPBOARDS
 			src.info += text("<BR><i>This paper has been stamped with the [].</i><BR>", P.name)
 			switch(P.type)
 				if(/obj/item/weapon/stamp/captain)
-					src.icon_state = "paper_stamped_cap"
+					src.overlays += "paper_stamped_cap"
 				if(/obj/item/weapon/stamp/hop)
-					src.icon_state = "paper_stamped_hop"
+					src.overlays += "paper_stamped_hop"
 				if(/obj/item/weapon/stamp/hos)
-					src.icon_state = "paper_stamped_hos"
+					src.overlays += "paper_stamped_hos"
 				if(/obj/item/weapon/stamp/ce)
-					src.icon_state = "paper_stamped_ce"
+					src.overlays += "paper_stamped_ce"
 				if(/obj/item/weapon/stamp/rd)
-					src.icon_state = "paper_stamped_rd"
+					src.overlays += "paper_stamped_rd"
 				if(/obj/item/weapon/stamp/cmo)
-					src.icon_state = "paper_stamped_cmo"
+					src.overlays += "paper_stamped_cmo"
 				if(/obj/item/weapon/stamp/denied)
-					src.icon_state = "paper_stamped_denied"
+					src.overlays += "paper_stamped_denied"
 				if(/obj/item/weapon/stamp/clown)
 					if (!clown)
 						usr << "\red You are totally unable to use the stamp. HONK!"
 						return
 					else
-						src.icon_state = "paper_stamped_clown"
+						src.overlays += "paper_stamped_clown"
 				else
-					src.icon_state = "paper_stamped"
+					src.overlays += "paper_stamped"
 			if(!stamped)
 				stamped = new
 			stamped += P.type
@@ -363,7 +363,6 @@ CLIPBOARDS
 			src.amount--
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper
 			P.loc = usr.loc
-			P.icon_state = "paper_blank"
 			if(ishuman(usr))
 				if(!usr.get_active_hand())
 					usr.put_in_hand(P)