Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake

code/modules/paperwork/filingcabinet.dm

@@ -55,8 +55,10 @@
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
 		user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] [src].</span>"
-	else
+	else if(user.a_intent != "harm")
 		user << "<span class='warning'>You can't put [P] in [src]!</span>"
+	else
+		return ..()
 
 
 /obj/structure/filingcabinet/attack_hand(mob/user)

code/modules/paperwork/handlabeler.dm

@@ -12,8 +12,6 @@
 	if(!proximity) return
 	if(!mode)	//if it's off, give up.
 		return
-	if(A == loc)	// if placing the labeller into something (e.g. backpack)
-		return		// don't set a label
 
 	if(!labels_left)
 		user << "<span class='warning'>No labels left!</span>"

code/modules/paperwork/paper.dm

@@ -20,6 +20,7 @@
 	body_parts_covered = HEAD
 	burn_state = FLAMMABLE
 	burntime = 5
+	dog_fashion = /datum/dog_fashion/head
 
 	var/info		//What's actually written on the paper.
 	var/info_links	//A different version of the paper which includes html links at fields and EOF

code/modules/paperwork/paperbin.dm

@@ -78,19 +78,19 @@
 	add_fingerprint(user)
 
 
-/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i, mob/user, params)
-	if(!istype(i))
+/obj/item/weapon/paper_bin/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/paper))
+		var/obj/item/weapon/paper/P = I
+		if(!user.unEquip(P))
+			return
+		P.loc = src
+		user << "<span class='notice'>You put [P] in [src].</span>"
+		papers.Add(P)
+		amount++
+		update_icon()
+	else
 		return ..()
 
-	if(!user.unEquip(i))
-		return
-	i.loc = src
-	user << "<span class='notice'>You put [i] in [src].</span>"
-	papers.Add(i)
-	amount++
-	update_icon()
-
-
 /obj/item/weapon/paper_bin/examine(mob/user)
 	..()
 	if(amount)

code/modules/paperwork/photocopier.dm

@@ -288,6 +288,8 @@
 				return
 			user << "<span class='notice'>You [anchored ? "unwrench" : "wrench"] [src].</span>"
 			anchored = !anchored
+	else
+		return ..()
 
 /obj/machinery/photocopier/ex_act(severity, target)
 	switch(severity)

code/modules/paperwork/photography.dm

@@ -422,12 +422,8 @@
 		viewpichelper(Ainfo)
 
 /obj/item/device/camera/afterattack(atom/target, mob/user, flag)
-	if(!on || !pictures_left || ismob(target.loc) || !isturf(target.loc))
+	if(!on || !pictures_left || !isturf(target.loc))
 		return
-	if(user.Adjacent(target))
-		var/list/bad_targets = list(/obj/structure, /obj/item/weapon/storage)
-		if(is_type_in_list(target, bad_targets))
-			return
 
 	captureimage(target, user, flag)