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

Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.

code/modules/paperwork/clipboard.dm

@@ -84,13 +84,13 @@
 
 		if(href_list["write"])
 			var/obj/item/P = locate(href_list["write"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				if(usr.get_active_hand())
 					P.attackby(usr.get_active_hand(), usr)
 
 		if(href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				P.loc = usr.loc
 				usr.put_in_hands(P)
 				if(P == toppaper)
@@ -103,12 +103,12 @@
 
 		if(href_list["read"])
 			var/obj/item/weapon/paper/P = locate(href_list["read"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				P.examine()
 
 		if(href_list["top"])
 			var/obj/item/P = locate(href_list["top"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				toppaper = P
 				usr << "<span class='notice'>You move [P.name] to the top.</span>"
 

code/modules/paperwork/filingcabinet.dm

@@ -74,7 +74,7 @@
 
 		//var/retrieveindex = text2num(href_list["retrieve"])
 		var/obj/item/P = locate(href_list["retrieve"])//contents[retrieveindex]
-		if(P && in_range(src, usr))
+		if(istype(P) && P.loc == src && in_range(src, usr))
 			usr.put_in_hands(P)
 			updateUsrDialog()
 			icon_state = "[initial(icon_state)]-open"

code/modules/paperwork/folders.dm

@@ -62,13 +62,13 @@
 
 		if(href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				P.loc = usr.loc
 				usr.put_in_hands(P)
 
 		if(href_list["read"])
 			var/obj/item/weapon/paper/P = locate(href_list["read"])
-			if(P)
+			if(istype(P) && P.loc == src)
 				P.examine()
 
 		//Update everything