Layers are now defines (#17949)

* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message

code/modules/mining/equipment_locker.dm

@@ -649,7 +649,7 @@
 	desc = "A resonating field that significantly damages anything inside of it when the field eventually ruptures."
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "shield1"
-	layer = 4.1
+	layer = ABOVE_ALL_MOB_LAYER
 	mouse_opacity = 0
 	var/resonance_damage = 20
 
@@ -1035,7 +1035,7 @@
 				var/client/C = user.client
 				for(var/turf/closed/mineral/M in minerals)
 					var/turf/F = get_turf(M)
-					var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state, layer = 18)
+					var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state, layer = FLASH_LAYER)
 					C.images += I
 					spawn(30)
 						if(C)
@@ -1053,7 +1053,7 @@
 			C.icon_state = M.scan_state
 
 /obj/effect/overlay/temp/mining_overlay
-	layer = 20
+	layer = FLASH_LAYER
 	icon = 'icons/turf/smoothrocks.dmi'
 	anchored = 1
 	mouse_opacity = 0

code/modules/mining/lavaland/necropolis_chests.dm

@@ -124,7 +124,7 @@
 	icon_state = "orb"
 	var/obj/item/device/wisp_lantern/home
 	luminosity = 7
-	layer = FLY_LAYER - 0.3
+	layer = ABOVE_ALL_MOB_LAYER
 
 /obj/item/device/warp_cube
 	name = "blue cube"

code/modules/mining/lavaland/ruins/gym.dm

@@ -4,7 +4,7 @@
 	icon = 'goon/icons/obj/fitness.dmi'
 	icon_state = "punchingbag"
 	anchored = 1
-	layer = MOB_LAYER+1 // TODO LAYER
+	layer = WALL_OBJ_LAYER
 	var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
 	'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
 
@@ -69,7 +69,7 @@
 		user.Stun(4)
 		user.loc = src.loc
 		var/image/W = image('goon/icons/obj/fitness.dmi',"fitnessweight-w")
-		W.layer = MOB_LAYER+1
+		W.layer = WALL_OBJ_LAYER
 		overlays += W
 		var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
 		user.visible_message("<B>[user] is [bragmessage]!</B>")

code/modules/mining/lavaland/weather.dm

@@ -22,7 +22,7 @@
 
 	var/start_up_overlay = "lava"
 	var/duration_overlay = "lava"
-	var/overlay_layer = 10 //This is the default area layer, and above everything else. 2 is floors/below walls and mobs.
+	var/overlay_layer = AREA_LAYER //This is the default area layer, and above everything else. TURF_LAYER is floors/below walls and mobs.
 	var/purely_aesthetic = FALSE //If we just want gentle rain that doesn't hurt people
 	var/list/impacted_areas = list()
 	var/immunity_type = "storm"
@@ -95,6 +95,6 @@
 			if(END_STAGE)
 				N.icon_state = initial(N.icon_state)
 				N.icon = 'icons/turf/areas.dmi'
-				N.layer = 10 //Just default back to normal area stuff since I assume setting a var is faster than initial
+				N.layer = AREA_LAYER //Just default back to normal area stuff since I assume setting a var is faster than initial
 				N.invisibility = INVISIBILITY_MAXIMUM
 				N.opacity = 0

code/modules/mining/lavaland/weather_types.dm

@@ -16,7 +16,7 @@
 
 	start_up_overlay = "lava"
 	duration_overlay = "lava"
-	overlay_layer = 2 //Covers floors only
+	overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
 
 	immunity_type = "lava"
 
@@ -50,7 +50,7 @@
 
 	start_up_overlay = ""
 	duration_overlay = ""
-	overlay_layer = 10
+	overlay_layer = AREA_LAYER
 
 /datum/weather/advanced_darkness/update_areas()
 	for(var/area/A in impacted_areas)
@@ -80,7 +80,7 @@
 
 	start_up_overlay = "light_ash"
 	duration_overlay = "ash_storm"
-	overlay_layer = 10
+	overlay_layer = AREA_LAYER
 
 	immunity_type = "ash"
 

code/modules/mining/mine_items.dm

@@ -36,7 +36,6 @@
 
 /obj/structure/closet/secure_closet/miner/New()
 	..()
-	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
 	new /obj/item/weapon/storage/box/emptysandbags(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
@@ -46,6 +45,7 @@
 	new /obj/item/weapon/gun/energy/kinetic_accelerator(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/weapon/survivalcapsule(src)
+	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
 
 
 /**********************Shuttle Computer**************************/
@@ -511,7 +511,7 @@
 /obj/structure/fans/tiny
 	name = "tiny fan"
 	desc = "A tiny fan, releasing a thin gust of air."
-	layer = TURF_LAYER + 0.8
+	layer = ABOVE_NORMAL_TURF_LAYER
 	density = 0
 	icon_state = "fan_tiny"
 	buildstackamount = 2
@@ -547,6 +547,6 @@
 	icon = 'icons/obj/lavaland/survival_pod.dmi'
 	name = "tubes"
 	anchored = 1
-	layer = MOB_LAYER - 0.2
+	layer = BELOW_MOB_LAYER
 	density = 0
 

code/modules/mining/mine_turfs.dm

@@ -12,7 +12,7 @@
 	opacity = 1
 	density = 1
 	blocks_air = 1
-	layer = MOB_LAYER + 0.05
+	layer = EDGED_TURF_LAYER
 	temperature = TCMB
 	var/environment_type = "asteroid"
 	var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless
@@ -179,7 +179,7 @@
 
 /turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
 	if(stage == 0)
-		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = 4.06)
+		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = ON_EDGED_TURF_LAYER)
 		overlays += I
 		activated_image = I
 		name = "gibtonite deposit"
@@ -217,7 +217,7 @@
 /turf/closed/mineral/gibtonite/proc/defuse()
 	if(stage == 1)
 		overlays -= activated_image
-		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = 4.06)
+		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
 		overlays += I
 		desc = "An inactive gibtonite reserve. The ore can be extracted."
 		stage = 2