Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers

code/modules/paperwork/paperbin.dm

@@ -26,6 +26,13 @@
 
 
 /obj/item/weapon/paper_bin/attack_hand(mob/user as mob)
+	if (hasorgans(user))
+		var/datum/organ/external/temp = user:organs_by_name["r_hand"]
+		if (user.hand)
+			temp = user:organs_by_name["l_hand"]
+		if(temp && !temp.is_usable())
+			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
+			return
 	if(amount >= 1)
 		amount--
 		if(amount==0)
@@ -104,4 +111,4 @@
 		user << "<span class='notice'>[src] is empty!</span>"
 
 	add_fingerprint(user)
-	return
+	return

code/modules/paperwork/photography.dm

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