Merge branch 'master' into HTML

code/modules/paperwork/clipboard.dm

@@ -11,7 +11,6 @@
 	var/obj/item/weapon/toppaper	//The topmost piece of paper.
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
-	pressure_resistance = 10
 
 /obj/item/weapon/clipboard/New()
 	update_icon()
@@ -35,7 +34,7 @@
 			return
 
 /obj/item/weapon/clipboard/update_icon()
-	overlays = null
+	overlays.Cut()
 	if(toppaper)
 		overlays += toppaper.icon_state
 		overlays += toppaper.overlays

code/modules/paperwork/folders.dm

@@ -23,7 +23,7 @@
 	icon_state = "folder_white"
 
 /obj/item/weapon/folder/update_icon()
-	overlays = null
+	overlays.Cut()
 	if(contents.len)
 		overlays += "folder_paper"
 	return

code/modules/paperwork/paperbin.dm

@@ -14,7 +14,7 @@
 
 /obj/item/weapon/paper_bin/MouseDrop(mob/user as mob)
 	if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
-		if(!istype(usr, /mob/living/carbon/metroid) && !istype(usr, /mob/living/simple_animal))
+		if(!istype(usr, /mob/living/carbon/slime) && !istype(usr, /mob/living/simple_animal))
 			if( !usr.get_active_hand() )		//if active hand is empty
 				attack_hand(usr, 1, 1)
 

code/modules/paperwork/pen.dm

@@ -23,7 +23,7 @@
 	throw_range = 15
 	m_amt = 10
 	var/colour = "black"	//what colour the ink is!
-	pressure_resistance = 5
+	pressure_resistance = 2
 
 
 /obj/item/weapon/pen/blue
@@ -36,7 +36,7 @@
 	icon_state = "pen_red"
 	colour = "red"
 
-/obj/item/weapon/pen/invisble
+/obj/item/weapon/pen/invisible
 	desc = "It's an invisble pen marker."
 	icon_state = "pen"
 	colour = "white"

code/modules/paperwork/photography.dm

@@ -25,7 +25,7 @@
 	name = "photo"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "photo"
-	item_state = "clipboard"
+	item_state = "paper"
 	w_class = 1.0
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.

code/modules/paperwork/stamps.dm

@@ -11,7 +11,7 @@
 	throw_range = 15
 	m_amt = 60
 	color = "cargo"
-	pressure_resistance = 5
+	pressure_resistance = 2
 	attack_verb = list("stamped")
 
 /obj/item/weapon/stamp/captain