Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

code/game/objects/items/documents.dm

@@ -8,7 +8,7 @@
 	w_class = 1
 	throw_range = 1
 	throw_speed = 1
-	layer = 4
+	layer = MOB_LAYER
 	pressure_resistance = 1
 
 /obj/item/documents/nanotrasen

code/game/objects/items/stacks/sheets/leather.dm

@@ -153,7 +153,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	singular_name = "hide plate"
 	flags = NOBLUDGEON
 	w_class = 3
-	layer = 4
+	layer = MOB_LAYER
 
 /obj/item/stack/sheet/animalhide/ashdrake
 	name = "ash drake hide"
@@ -163,7 +163,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	singular_name = "drake plate"
 	flags = NOBLUDGEON
 	w_class = 3
-	layer = 4
+	layer = MOB_LAYER
 
 
 //Step one - dehairing.

code/game/objects/items/stacks/sheets/mineral.dm

@@ -62,7 +62,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 	icon = 'icons/obj/items.dmi'
 	icon_state = "sandbags"
 	singular_name = "sandbag"
-	layer = 2.95
+	layer = LOW_ITEM_LAYER
 	origin_tech = "materials=2"
 
 var/global/list/datum/stack_recipe/sandbag_recipes = list ( \

code/game/objects/items/weapons/implants/implantchair.dm

@@ -69,24 +69,7 @@
 			add_implants()
 			ready = 1
 
-	src.updateUsrDialog()
-	return
-
-
-/obj/machinery/implantchair/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/grab))
-		var/obj/item/weapon/grab/G = W
-		if(!ismob(G.affecting))
-			return
-		var/mob/M = G.affecting
-		if(M.buckled_mobs.len)
-			user << "[M] will not fit into [src] because they have a creature on them!"
-			return
-		if(put_mob(M))
-			qdel(G)
-		updateUsrDialog()
-	else
-		return ..()
+	updateUsrDialog()
 
 
 /obj/machinery/implantchair/go_out(mob/M)

code/game/objects/items/weapons/storage/backpack.dm

@@ -82,7 +82,7 @@
 		qdel(src)
 		singulo.process()
 		return
-	..()
+	. = ..()
 
 /obj/item/weapon/storage/backpack/holding/singularity_act(current_size)
 	var/dist = max((current_size - 2),1)

code/game/objects/items/weapons/storage/bags.dm

@@ -201,6 +201,8 @@
 		if(!S.amount)
 			qdel(S)
 		else
+			if(S.pulledby)
+				S.pulledby.stop_pulling()
 			S.loc = src
 
 	orient2hud(usr)
@@ -345,7 +347,7 @@
 
 /obj/item/weapon/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
 	overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1)
-	..()
+	. = ..()
 
 
 /*

code/game/objects/items/weapons/storage/storage.dm

@@ -157,7 +157,7 @@
 	boxes.screen_loc = "[tx]:,[ty] to [mx],[my]"
 	for(var/obj/O in contents)
 		O.screen_loc = "[cx],[cy]"
-		O.layer = 20
+		O.layer = ABOVE_HUD_LAYER
 		cx++
 		if(cx > mx)
 			cx = tx
@@ -176,7 +176,7 @@
 			ND.sample_object.mouse_opacity = 2
 			ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
 			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
-			ND.sample_object.layer = 20
+			ND.sample_object.layer = ABOVE_HUD_LAYER
 			cx++
 			if(cx > (4+cols))
 				cx = 4
@@ -186,7 +186,7 @@
 			O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip"
 			O.screen_loc = "[cx]:16,[cy]:16"
 			O.maptext = ""
-			O.layer = 20
+			O.layer = ABOVE_HUD_LAYER
 			cx++
 			if(cx > (4+cols))
 				cx = 4
@@ -301,6 +301,8 @@
 			return 0
 	if(silent)
 		prevent_warning = 1
+	if(W.pulledby)
+		W.pulledby.stop_pulling()
 	W.loc = src
 	W.on_enter_storage(src)
 	if(usr)
@@ -462,11 +464,11 @@
 	boxes.master = src
 	boxes.icon_state = "block"
 	boxes.screen_loc = "7,7 to 10,8"
-	boxes.layer = 19
+	boxes.layer = HUD_LAYER
 	closer = new /obj/screen/close()
 	closer.master = src
 	closer.icon_state = "backpack_close"
-	closer.layer = 20
+	closer.layer = ABOVE_HUD_LAYER
 	orient2hud()
 
 

code/game/objects/items/weapons/storage/wallets.dm

@@ -51,7 +51,7 @@
 		combined_access |= I.access
 
 /obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0)
-	. = ..(W, prevent_warning)
+	. = ..()
 	if(.)
 		if(istype(W, /obj/item/weapon/card/id))
 			refreshID()