Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm

code/game/objects/items.dm

@@ -247,6 +247,9 @@
 // for items that can be placed in multiple slots
 // note this isn't called during the initial dressing of a player
 /obj/item/proc/equipped(var/mob/user, var/slot)
+	layer = 20
+	if(user.client)	user.client.screen |= src
+	if(user.pulling == src) user.stop_pulling()
 	return
 
 //Defines which slots correspond to which slot flags