Merge branch 'master' into Spray-Fix

code/__DEFINES/layers.dm

@@ -7,6 +7,7 @@
 #define PLANE_SPACE_PARALLAX -90
 
 #define FLOOR_PLANE -2
+#define FLOOR_OVERLAY_PLANE -1.5
 #define GAME_PLANE -1
 #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
 

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

@@ -15,6 +15,7 @@
  */
 GLOBAL_LIST_INIT(metal_recipes, list(
 	new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("barstool", /obj/structure/chair/stool/bar, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),

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

@@ -204,9 +204,9 @@
 		/obj/item/flashlight/pen,
 		/obj/item/seeds,
 		/obj/item/wirecutters,
-        /obj/item/wrench,
-        /obj/item/reagent_containers/spray/weedspray,
-        /obj/item/reagent_containers/spray/pestspray
+    /obj/item/wrench,
+    /obj/item/reagent_containers/spray/weedspray
+    /obj/item/reagent_containers/spray/pestspray
 	)
 
 /obj/item/storage/belt/security

code/game/turfs/simulated.dm

@@ -53,6 +53,7 @@
 				wet_overlay = image('icons/effects/water.dmi', src, "ice_floor")
 			else
 				wet_overlay = image('icons/effects/water.dmi', src, "wet_static")
+		wet_overlay.plane = FLOOR_OVERLAY_PLANE
 		overlays += wet_overlay
 	if(time == INFINITY)
 		return