diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index 879da329629..e4a1286c3cd 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -129,7 +129,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
icon = 'icons/effects/fire.dmi'
icon_state = "wavey_fire"
light_color = LIGHT_COLOR_FIRE
- layer = ABOVE_MOB_LAYER
+ layer = FIRE_LAYER
var/firelevel = 1 //Calculated by gas_mixture.calculate_firelevel()
diff --git a/code/__DEFINES/_layers.dm b/code/__DEFINES/_layers.dm
index cc0a6698011..a693c5e155a 100644
--- a/code/__DEFINES/_layers.dm
+++ b/code/__DEFINES/_layers.dm
@@ -1,71 +1,163 @@
+/*
+ from stddef.dm, planes & layers built into byond.
+
+ FLOAT_LAYER = -1
+ AREA_LAYER = 1
+ TURF_LAYER = 2
+ OBJ_LAYER = 3
+ MOB_LAYER = 4
+ FLY_LAYER = 5
+ EFFECTS_LAYER = 5000
+ TOPDOWN_LAYER = 10000
+ BACKGROUND_LAYER = 20000
+ ------
+
+ FLOAT_PLANE = -32767
+*/
+
+#define CLICKCATCHER_PLANE -100
+
#define PLANE_SPACE_BACKGROUND -99
#define PLANE_SPACE_PARALLAX (PLANE_SPACE_BACKGROUND + 1) // -98
#define PLANE_SKYBOX (PLANE_SPACE_PARALLAX + 1) // -97
#define PLANE_SPACE_DUST (PLANE_SPACE_PARALLAX + 1) // -96
#define PLANE_ABOVE_PARALLAX (PLANE_SPACE_DUST + 1) // -95
-#define PLANE_DEFAULT 0
-#define DECAL_PLATING_LAYER (TURF_LAYER + 0.01)
-// TURF_LAYER 2
-#define LOWER_ON_TURF_LAYER (TURF_LAYER + 0.05) // under the below
-#define ON_TURF_LAYER (TURF_LAYER + 0.1) // sitting on the turf - should be preferred over direct use of TURF_LAYER
-#define DECAL_LAYER (ON_TURF_LAYER + 0.01)
-#define AO_LAYER (ON_TURF_LAYER + 0.1)
-#define UNDER_PIPE_LAYER (PIPE_LAYER - 0.1)
-#define PIPE_LAYER 2.4 //under wires with their 2.44
-#define CABLE_LAYER 2.44
-#define ABOVE_CABLE_LAYER (CABLE_LAYER + 0.1)
-#define LAYER_TABLE 2.8
-#define LAYER_UNDER_TABLE 2.79
-#define LAYER_ABOVE_TABLE 2.81
-#define BELOW_OBJ_LAYER 2.9
-// OBJ_LAYER 3
-#define DOOR_OPEN_LAYER 3
-#define ABOVE_OBJ_LAYER 3.01
-#define UNDERDOOR 3.09 //Just barely under a closed door.
-#define WINDOW_PANE_LAYER 3.2
-#define DOOR_CLOSED_LAYER 3.6 //Above most items if closed
-#define BELOW_MOB_LAYER 3.7
-// MOB_LAYER 4
-#define ABOVE_MOB_LAYER 4.1
-#define ABOVE_ALL_MOB_LAYER 4.5
-#define INGAME_HUD_EFFECT_LAYER 5
-#define LIGHTING_LAYER 11
-#define EFFECTS_ABOVE_LIGHTING_LAYER 12 // For overlays you want to be above light.
-#define UNDER_HUD_LAYER 19
-#define HUD_LAYER 20 //Above lighting, but below obfuscation. For in-game HUD effects (whereas SCREEN_LAYER is for abstract/OOC things like inventory slots)
-#define OBFUSCATION_LAYER 21 //Where images covering the view for eyes are put
-#define SCREEN_LAYER 22 //Mob HUD/effects layer
-#define CINEMA_LAYER 23
+#define DEFAULT_PLANE 0
+ #define PLATING_LAYER 1
+ //ABOVE PLATING
+ #define HOLOMAP_LAYER 1.01
+ #define DECAL_PLATING_LAYER 1.02
+ #define DISPOSALS_PIPE_LAYER 1.03
+ #define LATTICE_LAYER 1.04
+ #define PIPE_LAYER 1.05
+ #define WIRE_LAYER 1.06
+ #define WIRE_TERMINAL_LAYER 1.07
+ #define ABOVE_WIRE_LAYER 1.08
+ //TURF_LAYER 2
+ #define TURF_DETAIL_LAYER 2.01
+ #define TURF_SHADOW_LAYER 2.02
+ //ABOVE TURF
+ #define DECAL_LAYER 2.03
+ #define RUNE_LAYER 2.04
+ #define ABOVE_TILE_LAYER 2.05
+ #define EXPOSED_PIPE_LAYER 2.06
+ #define EXPOSED_WIRE_LAYER 2.07
+ #define EXPOSED_WIRE_TERMINAL_LAYER 2.08
+ #define CATWALK_LAYER 2.09
+ #define ABOVE_CATWALK_LAYER 2.10
+ #define BLOOD_LAYER 2.11
+ #define MOUSETRAP_LAYER 2.12
+ #define PLANT_LAYER 2.13
+ #define AO_LAYER 2.14
+ //HIDING MOB
+ #define HIDING_MOB_LAYER 2.15
+ #define SHALLOW_FLUID_LAYER 2.16
+ #define MOB_SHADOW_LAYER 2.17
+ // OBJ
+ #define BELOW_DOOR_LAYER 2.18
+ #define OPEN_DOOR_LAYER 2.19
+ #define BELOW_TABLE_LAYER 2.20
+ #define TABLE_LAYER 2.21
+ #define ABOVE_TABLE_LAYER 2.22
+ #define BELOW_OBJ_LAYER 2.23
+ #define STRUCTURE_LAYER 2.24
+ //OBJ_LAYER 3
+ #define ABOVE_OBJ_LAYER 3.01
+ #define UNDERDOOR 3.015 //Just barely under a closed door. TODO: Obsolete?
+ #define CLOSED_DOOR_LAYER 3.02
+ #define ABOVE_DOOR_LAYER 3.03
+ #define SIDE_WINDOW_LAYER 3.04
+ #define FULL_WINDOW_LAYER 3.05
+ #define ABOVE_WINDOW_LAYER 3.06
+ #define HOLOMAP_OVERLAY_LAYER 3.061
+ //LYING MOB AND HUMAN
+ #define LYING_MOB_LAYER 3.07
+ #define LYING_HUMAN_LAYER 3.08
+ #define BASE_ABOVE_OBJ_LAYER 3.09
+ //HUMAN
+ #define BASE_HUMAN_LAYER 3.10
+ //MOB_LAYER 4
+ #define MECH_BASE_LAYER 4.01
+ #define MECH_INTERMEDIATE_LAYER 4.02
+ #define MECH_PILOT_LAYER 4.03
+ #define MECH_LEG_LAYER 4.04
+ #define MECH_COCKPIT_LAYER 4.05
+ #define MECH_ARM_LAYER 4.06
+ #define MECH_HEAD_LAYER 4.07
+ #define MECH_GEAR_LAYER 4.08
+ #define MECH_DECAL_LAYER 4.09
+ //ABOVE_HUMAN
+ #define ABOVE_HUMAN_LAYER 4.10
+ #define VEHICLE_LOAD_LAYER 4.11
+ #define CAMERA_LAYER 4.12
+ //BLOB
+ #define BLOB_SHIELD_LAYER 4.13
+ #define BLOB_NODE_LAYER 4.14
+ #define BLOB_CORE_LAYER 4.15
+ //EFFECTS BELOW LIGHTING
+ #define BELOW_PROJECTILE_LAYER 4.16
+ #define DEEP_FLUID_LAYER 4.17
+ #define FIRE_LAYER 4.18
+ #define PROJECTILE_LAYER 4.19
+ #define ABOVE_PROJECTILE_LAYER 4.20
+ #define SINGULARITY_LAYER 4.21
+ #define POINTER_LAYER 4.22
+ #define MIMICED_LIGHTING_LAYER 4.23 // Z-Mimic-managed lighting
+ //FLY_LAYER 5
+ //OBSERVER
+ #define OBSERVER_LAYER 5.1
+ #define OBFUSCATION_LAYER 5.2
+ #define AREA_LAYER 999
-#define OVERMAP_SECTOR_LAYER 3.01
-#define OVERMAP_IMPORTANT_SECTOR_LAYER 3.02
-#define OVERMAP_SHIP_LAYER 3.03
-#define OVERMAP_SHUTTLE_LAYER 3.03
+//FUTURE OVERMAP_PLANE
+ #define OVERMAP_SECTOR_LAYER 3.15
+ #define OVERMAP_IMPORTANT_SECTOR_LAYER 3.16
+ #define OVERMAP_SHIP_LAYER 3.17
+ #define OVERMAP_SHUTTLE_LAYER 3.18
-#define MECH_UNDER_LAYER 4
-#define MECH_BASE_LAYER 4.01
-#define MECH_HATCH_LAYER 4.02
-#define MECH_HEAD_LAYER 4.03
-#define MECH_EYES_LAYER 4.04
-#define MECH_LEG_LAYER 4.05
-#define MECH_ARM_LAYER 4.06
-#define MECH_DECAL_LAYER 4.07
-#define MECH_GEAR_LAYER 4.08
-#define MECH_ABOVE_LAYER 4.09
+//FUTURE LIGHTING PLANE
+ #define LIGHTBULB_LAYER 10
+ #define LIGHTING_LAYER 11
+ #define ABOVE_LIGHTING_LAYER 12
-// Blob Layers
-#define BLOB_SHIELD_LAYER 4.11
-#define BLOB_NODE_LAYER 4.12
-#define BLOB_CORE_LAYER 4.13
+//FUTURE EFFECTS_ABOVE_LIGHTING_PLANE
+ #define EFFECTS_ABOVE_LIGHTING_LAYER 13 // For overlays you want to be above light.
+ #define EYEGLOW_LAYER 14
+ #define BEAM_PROJECTILE_LAYER 15
+ #define SUPERMATTER_WALL_LAYER 16
+ #define SPEECH_INDICATOR_LAYER 17
-#define MIMICED_LIGHTING_LAYER 4.21 // Z-Mimic-managed lighting
+//FUTURE FULLSCREEN_PLANE
+ #define FULLSCREEN_LAYER 18
+ #define DAMAGE_LAYER 19
+ #define IMPAIRED_LAYER 20
+ #define BLIND_LAYER 21
+ #define CRIT_LAYER 22
-#define CLICKCATCHER_PLANE -100
+//FUTURE HUD_PLANE
+ #define UNDER_HUD_LAYER 23
+ #define HUD_BASE_LAYER 24
+ #define HUD_ITEM_LAYER 25
+ #define HUD_ABOVE_ITEM_LAYER 26
+ #define RADIAL_BACKGROUND_LAYER 26.5
+ #define RADIAL_BASE_LAYER 27
+ #define RADIAL_CONTENT_LAYER 28
#define DEFAULT_APPEARANCE_FLAGS (PIXEL_SCALE)
+/atom/proc/hud_layerise()
+ layer = HUD_ITEM_LAYER
+
/image/proc/turf_decal_layerise()
- plane = PLANE_DEFAULT
+ plane = DEFAULT_PLANE
layer = DECAL_LAYER
+
+/image/proc/plating_decal_layerise()
+ plane = DEFAULT_PLANE
+ layer = DECAL_PLATING_LAYER
+
+/atom/proc/reset_plane_and_layer()
+ plane = initial(plane)
+ layer = initial(layer)
diff --git a/code/__DEFINES/icon_layering.dm b/code/__DEFINES/icon_layering.dm
index c56dfba8a6b..9bfd1993b06 100644
--- a/code/__DEFINES/icon_layering.dm
+++ b/code/__DEFINES/icon_layering.dm
@@ -8,7 +8,7 @@
#define TAIL_SOUTH_ACC_LAYER 7
#define SHOES_LAYER_ALT 8
#define UNIFORM_LAYER 9
-#define DAMAGE_LAYER 10
+#define MOB_DAMAGE_LAYER 10
#define ID_LAYER 11
#define BANDAGE_LAYER 12
#define SHOES_LAYER 13
diff --git a/code/__HELPERS/overlay.dm b/code/__HELPERS/overlay.dm
index 8ef01ff8f09..a91ba9104e5 100644
--- a/code/__HELPERS/overlay.dm
+++ b/code/__HELPERS/overlay.dm
@@ -43,7 +43,7 @@
/proc/make_screen_overlay(icon, icon_state, brightness_factor = null, glow_radius = 1)
var/image/overlay = image(icon, icon_state)
- overlay.layer = EFFECTS_ABOVE_LIGHTING_LAYER
+ overlay.layer = ABOVE_LIGHTING_LAYER
var/image/underlay = image(overlay)
underlay.alpha = 128
underlay.filters = filter(type="bloom", offset=glow_radius, size=glow_radius*2, threshold="#000")
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index e04c2c34d83..013f70c38cb 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -3,7 +3,7 @@
var/mob/living/silicon/ai/myai = mymob
myai.computer.screen_loc = ui_ai_crew_monitor
- myai.computer.layer = SCREEN_LAYER
+ myai.computer.layer = HUD_BASE_LAYER
adding = list(
new /obj/screen/ai/core,
diff --git a/code/_onclick/hud/captive_brain_hud.dm b/code/_onclick/hud/captive_brain_hud.dm
index 60148589c21..c8abae4ebc8 100644
--- a/code/_onclick/hud/captive_brain_hud.dm
+++ b/code/_onclick/hud/captive_brain_hud.dm
@@ -9,7 +9,7 @@
resist.icon = 'icons/mob/screen/captive_brain.dmi'
resist.icon_state = "resist"
resist.screen_loc = "EAST-8,BOTTOM:8"
- resist.layer = SCREEN_LAYER
+ resist.layer = HUD_ABOVE_ITEM_LAYER
adding += resist
mymob.client.screen += src.adding
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index 8c256cc7826..31985b0a5cd 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -67,7 +67,7 @@
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- layer = HUD_LAYER - 0.1
+ layer = FULLSCREEN_LAYER
var/severity = 0
var/allstate = 0 //shows if it should show up for dead people too
@@ -77,24 +77,27 @@
/obj/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
+ layer = DAMAGE_LAYER
/obj/screen/fullscreen/oxy
icon_state = "oxydamageoverlay"
+ layer = DAMAGE_LAYER
/obj/screen/fullscreen/crit
icon_state = "passage"
+ layer = CRIT_LAYER
/obj/screen/fullscreen/strong_pain
icon_state = "strong_pain"
- layer = OBFUSCATION_LAYER
+ layer = CRIT_LAYER
/obj/screen/fullscreen/blind
icon_state = "blackimageoverlay"
- layer = OBFUSCATION_LAYER
+ layer = BLIND_LAYER
/obj/screen/fullscreen/blackout
icon_state = "blackout"
- layer = OBFUSCATION_LAYER
+ layer = BLIND_LAYER
/obj/screen/fullscreen/impaired
icon_state = "impairedoverlay"
@@ -143,7 +146,7 @@
/obj/screen/fullscreen/frenzy
icon_state = "frenzyoverlay"
- layer = OBFUSCATION_LAYER
+ layer = BLIND_LAYER
/obj/screen/fullscreen/teleport
icon_state = "teleport"
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index b52062bdf78..52533877624 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -27,7 +27,6 @@ var/list/global_huds
screen.screen_loc = "SOUTHWEST to NORTHEAST" // Will tile up to the whole screen, scaling beyond 15x15 if needed.
screen.icon = 'icons/obj/hud_tiled.dmi'
screen.icon_state = icon_state
- screen.layer = SCREEN_LAYER
screen.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
screen.color = color
@@ -38,7 +37,7 @@ var/list/global_huds
druggy = new /obj/screen()
druggy.screen_loc = ui_entire_screen
druggy.icon_state = "druggy"
- druggy.layer = 17
+ druggy.layer = IMPAIRED_LAYER
druggy.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
druggy.alpha = 127
druggy.blend_mode = BLEND_MULTIPLY
@@ -47,7 +46,7 @@ var/list/global_huds
blurry = new /obj/screen()
blurry.screen_loc = ui_entire_screen
blurry.icon_state = "blurry"
- blurry.layer = 17
+ blurry.layer = IMPAIRED_LAYER
blurry.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blurry.alpha = 100
@@ -98,18 +97,18 @@ var/list/global_huds
for(i = 1, i <= 4, i++)
O = vimpaired[i]
O.icon_state = "dither50"
- O.layer = 17
+ O.layer = IMPAIRED_LAYER
O.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
O = darkMask[i]
O.icon_state = "dither50"
- O.layer = 17
+ O.layer = IMPAIRED_LAYER
O.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
for(i = 5, i <= 8, i++)
O = darkMask[i]
O.icon_state = "black"
- O.layer = 17
+ O.layer = IMPAIRED_LAYER
O.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/*
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 864a28e0b63..95d7b3b7f42 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -28,7 +28,6 @@
hud_type = slot_data["slot_type"]
inv_box = new hud_type()
inv_box.icon = ui_style
- inv_box.layer = SCREEN_LAYER
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.hud = src
@@ -53,7 +52,6 @@
using.icon = ui_style
using.icon_state = "other"
using.screen_loc = ui_inventory
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -68,7 +66,6 @@
using.screen_loc = ui_acti
using.color = ui_color
using.alpha = ui_alpha
- using.layer = SCREEN_LAYER
src.adding += using
action_intent = using
@@ -85,7 +82,6 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
- using.layer = SCREEN_LAYER
src.adding += using
help_intent = using
@@ -97,7 +93,6 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
- using.layer = SCREEN_LAYER
src.adding += using
disarm_intent = using
@@ -109,7 +104,6 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
- using.layer = SCREEN_LAYER
src.adding += using
grab_intent = using
@@ -121,7 +115,6 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
- using.layer = SCREEN_LAYER
src.adding += using
hurt_intent = using
//end intent small hud objects
@@ -141,7 +134,6 @@
using.icon = ui_style
using.icon_state = "act_drop"
using.screen_loc = ui_drop_throw
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
src.hotkeybuttons += using
@@ -153,7 +145,6 @@
using.icon = ui_style
using.icon_state = "act_equip"
using.screen_loc = ui_equip
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -167,7 +158,6 @@
inv_box.icon_state = "r_hand_active"
inv_box.screen_loc = ui_rhand
inv_box.slot_id = slot_r_hand
- inv_box.layer = SCREEN_LAYER
inv_box.color = ui_color
inv_box.alpha = ui_alpha
@@ -183,7 +173,6 @@
inv_box.icon_state = "l_hand_active"
inv_box.screen_loc = ui_lhand
inv_box.slot_id = slot_l_hand
- inv_box.layer = SCREEN_LAYER
inv_box.color = ui_color
inv_box.alpha = ui_alpha
src.l_hand_hud_object = inv_box
@@ -196,7 +185,6 @@
using.icon = ui_style
using.icon_state = "hand1"
using.screen_loc = ui_swaphand1
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
using.hud = src
@@ -207,7 +195,6 @@
using.icon = ui_style
using.icon_state = "hand2"
using.screen_loc = ui_swaphand2
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
using.hud = src
@@ -219,7 +206,6 @@
using.icon = ui_style
using.icon_state = "act_resist"
using.screen_loc = ui_pull_resist
- using.layer = SCREEN_LAYER
using.color = ui_color
using.alpha = ui_alpha
src.hotkeybuttons += using
diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index ec8eb462ef6..f3a1b8a4777 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -20,13 +20,11 @@
blobpwrdisplay.name = "blob power"
blobpwrdisplay.icon_state = "block"
blobpwrdisplay.screen_loc = ui_health
- blobpwrdisplay.layer = SCREEN_LAYER
blobhealthdisplay = new /obj/screen()
blobhealthdisplay.name = "blob health"
blobhealthdisplay.icon_state = "block"
blobhealthdisplay.screen_loc = ui_internal
- blobhealthdisplay.layer = SCREEN_LAYER
mymob.client.screen = null
@@ -47,7 +45,6 @@
using.icon = ui_style
using.icon_state = "intent_"+mymob.a_intent
using.screen_loc = ui_zonesel
- using.layer = SCREEN_LAYER
src.adding += using
action_intent = using
@@ -61,7 +58,6 @@
using.name = "help"
using.icon = ico
using.screen_loc = ui_zonesel
- using.layer = SCREEN_LAYER
src.adding += using
help_intent = using
@@ -72,7 +68,6 @@
using.name = "disarm"
using.icon = ico
using.screen_loc = ui_zonesel
- using.layer = SCREEN_LAYER
src.adding += using
disarm_intent = using
@@ -83,7 +78,6 @@
using.name = "grab"
using.icon = ico
using.screen_loc = ui_zonesel
- using.layer = SCREEN_LAYER
src.adding += using
grab_intent = using
@@ -94,7 +88,6 @@
using.name = I_HURT
using.icon = ico
using.screen_loc = ui_zonesel
- using.layer = SCREEN_LAYER
src.adding += using
hurt_intent = using
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index c007f121b5e..709f7be8b62 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
/obj/screen/radial
icon = 'icons/mob/screen/radial.dmi'
- layer = HUD_LAYER
+ layer = RADIAL_BASE_LAYER
var/datum/radial_menu/parent
/obj/screen/radial/Destroy()
@@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
/datum/radial_menu/proc/extract_image(E)
var/mutable_appearance/MA = new /mutable_appearance(E)
if(MA)
- MA.layer = HUD_LAYER
+ MA.layer = RADIAL_CONTENT_LAYER
MA.appearance_flags |= RESET_TRANSFORM
return MA
@@ -258,7 +258,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
return
current_user = M.client
//Blank
- menu_holder = image(icon = 'icons/effects/effects.dmi', loc = anchor, icon_state = "nothing", layer = HUD_LAYER)
+ menu_holder = image(icon = 'icons/effects/effects.dmi', loc = anchor, icon_state = "nothing", layer = RADIAL_BACKGROUND_LAYER)
menu_holder.appearance_flags |= KEEP_APART|RESET_ALPHA|RESET_COLOR|RESET_TRANSFORM
menu_holder.add_vis_contents(elements + close_button)
current_user.images += menu_holder
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index c3eb5d39cba..1e4e12858ac 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -22,7 +22,6 @@ var/obj/screen/robot_inventory
using.icon = 'icons/mob/screen/robot.dmi'
using.icon_state = "radio"
using.screen_loc = ui_movi
- using.layer = SCREEN_LAYER
src.adding += using
//Module select
@@ -48,7 +47,6 @@ var/obj/screen/robot_inventory
using.icon = 'icons/mob/screen/robot.dmi'
using.icon_state = mymob.a_intent
using.screen_loc = ui_acti
- using.layer = SCREEN_LAYER
src.adding += using
action_intent = using
@@ -94,7 +92,6 @@ var/obj/screen/robot_inventory
using.icon = 'icons/mob/screen/robot.dmi'
using.icon_state = "panel"
using.screen_loc = ui_borg_panel
- using.layer = SCREEN_LAYER
src.adding += using
//Store
@@ -127,7 +124,6 @@ var/obj/screen/robot_inventory
// Computer device hud
if(r.computer)
r.computer.screen_loc = ui_oxygen
- r.computer.layer = SCREEN_LAYER
//Handle the gun settings buttons
@@ -225,8 +221,7 @@ var/obj/screen/robot_inventory
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
- A.layer = SCREEN_LAYER
-
+ A.hud_layerise()
x++
if(x == 4)
x = -4
diff --git a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
index f5abd78b3f7..69cc930186b 100644
--- a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
+++ b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
@@ -34,7 +34,6 @@
/obj/screen/ai
icon = 'icons/mob/screen/ai.dmi'
- layer = SCREEN_LAYER
/obj/screen/ai/core
name = "AI Core"
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 5c21866f2f6..9a14ebb63b8 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -9,7 +9,7 @@
/obj/screen
name = ""
icon = 'icons/mob/screen/generic.dmi'
- layer = SCREEN_LAYER
+ layer = HUD_BASE_LAYER
unacidable = 1
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
var/datum/hud/hud = null // A reference to the owner HUD, if any.
@@ -137,7 +137,6 @@
/obj/screen/storage
name = "storage"
- layer = SCREEN_LAYER
screen_loc = "7,7 to 10,8"
/obj/screen/storage/Click()
@@ -153,7 +152,7 @@
/obj/screen/storage/background
name = "background storage"
- layer = SCREEN_LAYER+0.01
+ layer = HUD_BASE_LAYER
/obj/screen/storage/background/Initialize(mapload, var/obj/set_master, var/set_icon_state)
. = ..()
@@ -221,7 +220,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
alpha = 128
anchored = TRUE
- layer = SCREEN_LAYER + 0.1
+ plane = HUD_ITEM_LAYER
/obj/screen/zone_sel/MouseExited(location, control, params)
if(!isobserver(usr) && hovering_choice)
@@ -453,7 +452,6 @@
/obj/screen/movement_intent
name = "mov_intent"
screen_loc = ui_movi
- layer = SCREEN_LAYER
//This updates the run/walk button on the hud
/obj/screen/movement_intent/proc/update_move_icon(var/mob/living/user)
diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm
index 61d4aebce3f..1f2f4ba0811 100644
--- a/code/controllers/subsystems/evacuation/evacuation_pods.dm
+++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm
@@ -176,7 +176,6 @@
screen_loc = "WEST,SOUTH to EAST,NORTH"
color = "#ff9900"
blend_mode = BLEND_SUBTRACT
- layer = SCREEN_LAYER
#undef EVAC_OPT_ABANDON_SHIP
#undef EVAC_OPT_BLUESPACE_JUMP
diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 2e98e1472fa..da8fa88d0e3 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -860,7 +860,7 @@ SUBSYSTEM_DEF(jobs)
T.icon_state = "nothing"
T.maptext_height = 64
T.maptext_width = 512
- T.layer = SCREEN_LAYER+1
+ T.layer = HUD_ABOVE_ITEM_LAYER
T.plane = FLOAT_PLANE
T.screen_loc = "LEFT+1,BOTTOM+2"
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 02b72fb220f..1f4ad87ffd9 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -639,7 +639,7 @@ var/datum/controller/subsystem/ticker/SSticker
cinematic = new /obj/screen{
icon = 'icons/effects/station_explosion.dmi';
icon_state = "station_intact";
- layer = CINEMA_LAYER;
+ layer = HUD_ABOVE_ITEM_LAYER;
mouse_opacity = MOUSE_OPACITY_TRANSPARENT;
screen_loc = "1,0"
}
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 0965879fdf6..cf502d0d01a 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -206,7 +206,7 @@
/obj/effect/ebeam
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = 1
- layer = EFFECTS_ABOVE_LIGHTING_LAYER
+ layer = BEAM_PROJECTILE_LAYER
blend_mode = BLEND_ADD
var/datum/beam/owner
diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm
index 125cb03fc55..590dfc3cb03 100644
--- a/code/game/antagonist/antagonist_update.dm
+++ b/code/game/antagonist/antagonist_update.dm
@@ -38,7 +38,7 @@
if(!antag_indicator || !other.current || !recipient.current)
return
var/indicator = (faction_indicator && (other in faction_members)) ? faction_indicator : antag_indicator
- return image('icons/mob/mob.dmi', loc = other.current, icon_state = indicator, layer = LIGHTING_LAYER+0.1)
+ return image('icons/mob/mob.dmi', loc = other.current, icon_state = indicator, layer = ABOVE_HUMAN_LAYER)
/datum/antagonist/proc/update_all_icons()
if(!antag_indicator)
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index e921f5ccbb6..b9b0c82d232 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -24,7 +24,7 @@ var/global/list/area_blurb_stated_to = list()
name = "Unknown"
icon = 'icons/turf/areas.dmi'
icon_state = "unknown"
- layer = 10
+ layer = AREA_LAYER
luminosity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -89,7 +89,6 @@ var/global/list/area_blurb_stated_to = list()
/area/Initialize(mapload)
icon_state = "white"
- layer = 10
blend_mode = BLEND_MULTIPLY
diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm
index 35dc74e9af2..116231785b6 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -11,7 +11,7 @@
var/update_icon_on_init = FALSE // Default to 'no'.
- layer = 2
+ layer = TURF_LAYER
var/level = 2
var/atom_flags = 0
var/init_flags = 0
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index ab60ec6a844..eccf2098335 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -1,5 +1,5 @@
/atom/movable
- layer = 3
+ layer = OBJ_LAYER
glide_size = 6
animate_movement = SLIDE_STEPS
diff --git a/code/game/gamemodes/changeling/implements/powers/body.dm b/code/game/gamemodes/changeling/implements/powers/body.dm
index 059b5ea7937..3ea264b3a3c 100644
--- a/code/game/gamemodes/changeling/implements/powers/body.dm
+++ b/code/game/gamemodes/changeling/implements/powers/body.dm
@@ -114,7 +114,7 @@
effect.density = FALSE
effect.anchored = TRUE
effect.icon = 'icons/effects/effects.dmi'
- effect.layer = 3
+ effect.layer = LYING_HUMAN_LAYER
flick("summoning", effect)
QDEL_IN(effect, 10)
H.forceMove(ling)
@@ -579,7 +579,7 @@
effect.density = FALSE
effect.anchored = TRUE
effect.icon = 'icons/effects/effects.dmi'
- effect.layer = 3
+ effect.layer = LYING_HUMAN_LAYER
flick("summoning", effect)
QDEL_IN(effect, 10)
M.forceMove(ling) //move inside the new dude to hide him.
diff --git a/code/game/gamemodes/cult/runes/rune.dm b/code/game/gamemodes/cult/runes/rune.dm
index 2845e6dc6d3..d8ce8fb04f5 100644
--- a/code/game/gamemodes/cult/runes/rune.dm
+++ b/code/game/gamemodes/cult/runes/rune.dm
@@ -5,7 +5,7 @@
icon_state = "1"
anchored = TRUE
unacidable = TRUE
- layer = AO_LAYER
+ layer = RUNE_LAYER
mouse_opacity = MOUSE_OPACITY_OPAQUE
var/datum/rune/rune
diff --git a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
index 47c80fd192d..b4de122e27d 100644
--- a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
+++ b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
@@ -131,4 +131,3 @@
color = "#ff9900"
alpha = 100
blend_mode = BLEND_SUBTRACT
- layer = SCREEN_LAYER
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
index c1a17a7df3a..6f0c1eb0da6 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
@@ -6,7 +6,7 @@
icon = 'icons/turf/space.dmi'
icon_state = "bluespace-n"
- layer = EFFECTS_ABOVE_LIGHTING_LAYER
+ layer = SUPERMATTER_WALL_LAYER
light_color = COLOR_CYAN_BLUE
light_power = 6
light_range = 8
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 31b7556e21c..d5c784c9445 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -2,7 +2,6 @@
name = "\improper AI Liquid Dispenser"
icon = 'icons/obj/device.dmi'
icon_state = "motion0"
- layer = 3
anchored = 1.0
idle_power_usage = 10
var/uses = 20
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 8ad1e00e43f..9570b0c337e 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -6,7 +6,7 @@
use_power = POWER_USE_ACTIVE
idle_power_usage = 5
active_power_usage = 10
- layer = 5
+ layer = CAMERA_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/list/network = list(NETWORK_STATION)
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index c195ec4285e..e97ff28a9d2 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -69,13 +69,13 @@
/obj/machinery/computer/update_icon()
switch(dir)
if(NORTH)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(SOUTH)
- layer = initial(layer)
+ reset_plane_and_layer()
if(EAST)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(WEST)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
cut_overlays()
if(stat & NOPOWER)
set_light(0)
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 96b8d51f8cc..481cfa800e2 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -22,7 +22,7 @@
icon_state = "pod_preview"
density = TRUE
anchored = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
interact_offline = TRUE
var/on = 0
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 29b22f6fdf4..a9986232479 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -263,24 +263,20 @@ GLOBAL_LIST_EMPTY(frozen_crew)
/obj/machinery/cryopod/living_quarters/update_icon()
cut_overlays()
var/image/I = image(icon, "pod_top")
- I.layer = 5.021
add_overlay(I)
if(occupant)
I = image(icon, "pod_back")
- I.layer = 5
add_overlay(I)
name = "[name] ([occupant])"
I = image(occupant.icon, occupant.icon_state, dir = SOUTH)
I.overlays = occupant.overlays
- I.layer = 5
I.pixel_z = 11
add_overlay(I)
I = image(icon, "pod_door")
- I.layer = 5
add_overlay(I)
else
name = initial(name)
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 4d0baa6a5e6..d09be308bbb 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -161,7 +161,6 @@
name = "airlock sensor"
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
- layer = OBJ_LAYER
anchored = 1
power_channel = ENVIRON
@@ -242,7 +241,6 @@
name = "access button"
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby"
- layer = OBJ_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
anchored = 1
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index 8c87b31eb5d..ff4e8a6a596 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -15,9 +15,9 @@
icon = 'icons/obj/doors/rapid_pdoor.dmi'
icon_state = null
dir = 1
- closed_layer = DOOR_CLOSED_LAYER + 0.1
+ closed_layer = ABOVE_DOOR_LAYER
explosion_resistance = 25
- open_layer = 2.7
+ open_layer = BELOW_TABLE_LAYER
/// Most blast doors are infrequently toggled and sometimes used with regular doors anyways.
/// Turning this off prevents awkward zone geometry in places like medbay lobby, for example.
@@ -31,6 +31,7 @@
var/open_sound = 'sound/machines/blastdooropen.ogg'
var/close_sound = 'sound/machines/blastdoorclose.ogg'
var/damage = BLAST_DOOR_CRUSH_DAMAGE
+ closed_layer = ABOVE_DOOR_LAYER
var/id = 1.0
var/_wifi_id
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index df8aa427626..ec055180cdd 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -12,7 +12,7 @@
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
req_access = list(ACCESS_BRIG)
- layer = OBJ_LAYER
+ layer = ABOVE_WINDOW_LAYER
anchored = TRUE
density = FALSE
var/id = null // id of door it controls.
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 71e4d3ef92c..24baa050b8e 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -9,10 +9,10 @@
anchored = 1
opacity = 1
density = 1
- layer = DOOR_OPEN_LAYER
+ layer = CLOSED_DOOR_LAYER
dir = SOUTH
- var/open_layer = DOOR_OPEN_LAYER
- var/closed_layer = DOOR_CLOSED_LAYER
+ var/open_layer = OPEN_DOOR_LAYER
+ var/closed_layer = CLOSED_DOOR_LAYER
/// Boolean. Whether or not the door blocks vision.
var/visible = TRUE
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index c617f8e8ebb..9e25deb5e3a 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -14,9 +14,9 @@
req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP, ACCESS_FIRST_RESPONDER)
opacity = 0
density = 0
- layer = LAYER_UNDER_TABLE
- open_layer = LAYER_UNDER_TABLE // Just below doors when open
- closed_layer = DOOR_CLOSED_LAYER + 0.2 // Just above doors when closed
+ layer = OPEN_DOOR_LAYER
+ open_layer = OPEN_DOOR_LAYER // Just below doors when open
+ closed_layer = CLOSED_DOOR_LAYER + 0.2 // Just above doors when closed
//These are frequenly used with windows, so make sure zones can pass.
//Generally if a firedoor is at a place where there should be a zone boundery then there will be a regular door underneath it.
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 5eb7de192d8..72e34d94444 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -5,7 +5,7 @@
icon_state = "left"
var/base_state = "left"
alpha = 196
- layer = WINDOW_PANE_LAYER
+ layer = SIDE_WINDOW_LAYER
min_force = 4
hitsound = 'sound/effects/glass_hit.ogg'
maxhealth = 150 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 7dcea6efd5b..8f13b07ddec 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -3,7 +3,6 @@
name = "Embedded Controller"
anchored = 1
- layer = OBJ_LAYER
idle_power_usage = 10
var/checks_for_access = FALSE
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index e7cb3075c46..96eb2496410 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -5,7 +5,6 @@
desc = "A mounted flash. Disorientates anyone caught in its range."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "mflash1"
- layer = OBJ_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/id = null
var/range = 2 //this is roughly the size of brig cell
@@ -23,7 +22,6 @@
name = "portable flasher"
desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements."
icon_state = "pflash1"
- layer = OBJ_LAYER - 0.01
strength = 8
anchored = 0
base_state = "pflash"
diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm
index b92515d37d4..55fe98647c0 100644
--- a/code/game/machinery/floor_light.dm
+++ b/code/game/machinery/floor_light.dm
@@ -5,7 +5,7 @@ var/list/floor_light_cache = list()
icon = 'icons/obj/machinery/floor_light.dmi'
icon_state = "base"
desc = "A backlit floor panel."
- layer = TURF_LAYER+0.001
+ layer = ABOVE_TILE_LAYER
anchored = 0
use_power = POWER_USE_ACTIVE
idle_power_usage = 2
diff --git a/code/game/machinery/gumball.dm b/code/game/machinery/gumball.dm
index f5afb57ef9f..31fc1077408 100644
--- a/code/game/machinery/gumball.dm
+++ b/code/game/machinery/gumball.dm
@@ -3,7 +3,6 @@
desc = "A lithe device with a glass globe on top, which can be operated to dispense various candies."
icon = 'icons/obj/vending.dmi'
icon_state = "gumball_100"
- layer = 2.9
anchored = 1
density = 1
idle_power_usage = 10
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index a5d06012f36..d2b66280c3d 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -36,7 +36,7 @@ Possible to do for anyone motivated enough:
icon_state = "holopad0"
var/icon_state_suffix = ""
- layer = DECAL_LAYER + 0.1 //Preventing rats and drones from sneaking under them.
+ layer = ABOVE_TILE_LAYER
var/power_per_hologram = 500 //per usage per hologram
idle_power_usage = 5
diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm
index dec5a025008..978e2056dfe 100644
--- a/code/game/machinery/holosign.dm
+++ b/code/game/machinery/holosign.dm
@@ -4,7 +4,7 @@
desc = "Small wall-mounted holographic projector"
icon = 'icons/obj/holosign.dmi'
icon_state = "sign_off"
- layer = 4
+ layer = ABOVE_DOOR_LAYER
idle_power_usage = 2
active_power_usage = 4
anchored = 1
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 7c77a8b42b9..054d380828f 100755
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -70,7 +70,6 @@
var/disable = 0
var/last_spark = 0
var/base_state = "migniter"
- layer = 3.3
anchored = 1
idle_power_usage = 2
active_power_usage = 4
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index d87704a3f20..37c3f318c6b 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -84,7 +84,7 @@ Class Procs:
name = "machinery"
icon = 'icons/obj/stationobjs.dmi'
w_class = ITEMSIZE_IMMENSE
- layer = OBJ_LAYER - 0.1
+ layer = STRUCTURE_LAYER
init_flags = INIT_MACHINERY_PROCESS_SELF
var/stat = 0
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index e5b3572f1c2..08316333be9 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -11,7 +11,6 @@
name = "Electromagnetic Generator"
desc = "A device that uses station power to create points of magnetic energy."
level = 1 // underfloor
- layer = 2.5
anchored = 1
idle_power_usage = 50
diff --git a/code/game/machinery/mech_recharger.dm b/code/game/machinery/mech_recharger.dm
index 2eb32bc5525..9150f8f04d1 100644
--- a/code/game/machinery/mech_recharger.dm
+++ b/code/game/machinery/mech_recharger.dm
@@ -4,7 +4,7 @@
icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_floor"
density = FALSE
- layer = TURF_LAYER + 0.1
+ layer = ABOVE_TILE_LAYER
anchored = TRUE
idle_power_usage = 300 // Some electronics, passive drain.
active_power_usage = 90 KILOWATTS // When charging
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 6a7870eb9b9..2e3b4f7471c 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -8,7 +8,7 @@
name = "navigation beacon"
desc = "A radio beacon used for bot navigation."
level = 1 // underfloor
- layer = 2.5
+ layer = ABOVE_WIRE_LAYER
anchored = 1
var/open = 0 // true if cover is open
diff --git a/code/game/machinery/stargazer.dm b/code/game/machinery/stargazer.dm
index 04441f224e3..1523e3a1397 100644
--- a/code/game/machinery/stargazer.dm
+++ b/code/game/machinery/stargazer.dm
@@ -4,7 +4,7 @@
icon_state = "stargazer_off"
anchored = TRUE
density = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+ layer = CAMERA_LAYER
pixel_x = -32
pixel_y = -24
var/image/star_system_image
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 9008e125fda..3653fe9e145 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -13,7 +13,7 @@
name = "status display"
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
- layer = OBJ_LAYER
+ layer = ABOVE_WINDOW_LAYER
anchored = 1
density = 0
idle_power_usage = 10
diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm
index 11d607ff1d0..fe4a10db493 100644
--- a/code/game/machinery/suit_cycler.dm
+++ b/code/game/machinery/suit_cycler.dm
@@ -111,16 +111,16 @@
var/image/occupant_image = image(occupant.icon, occupant.icon_state)
occupant_image.overlays = occupant.overlays
add_overlay(occupant_image)
- var/image/overbase = image(icon, "overbase", layer = ABOVE_ALL_MOB_LAYER)
+ var/image/overbase = image(icon, "overbase", layer = ABOVE_HUMAN_LAYER)
add_overlay(overbase)
if(locked || active)
- var/image/closed = image(icon, "closed", layer = ABOVE_ALL_MOB_LAYER)
+ var/image/closed = image(icon, "closed", layer = ABOVE_HUMAN_LAYER)
add_overlay(closed)
else
- var/image/open = image(icon, "open", layer = ABOVE_ALL_MOB_LAYER)
+ var/image/open = image(icon, "open", layer = ABOVE_HUMAN_LAYER)
add_overlay(open)
if(panel_open)
- var/image/panel = image(icon, "panel", layer = ABOVE_ALL_MOB_LAYER)
+ var/image/panel = image(icon, "panel", layer = ABOVE_HUMAN_LAYER)
add_overlay(panel)
if(irradiating)
diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm
index 8a542b1c0ac..42399e38a99 100644
--- a/code/game/machinery/supplybeacon.dm
+++ b/code/game/machinery/supplybeacon.dm
@@ -28,7 +28,6 @@
anchored = 0
density = 1
- layer = MOB_LAYER - 0.1
stat = 0
var/target_drop_time
diff --git a/code/game/machinery/tesla_beacon.dm b/code/game/machinery/tesla_beacon.dm
index 31604cb4a49..cb34f706fa6 100644
--- a/code/game/machinery/tesla_beacon.dm
+++ b/code/game/machinery/tesla_beacon.dm
@@ -9,7 +9,6 @@
icon_state = "beacon_off"
anchored = FALSE
density = TRUE
- layer = MOB_LAYER - 0.1
var/active = FALSE
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index c65a9509ba4..08f8dfebb7f 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -45,7 +45,7 @@
desc = "A generic vending machine."
icon = 'icons/obj/vending.dmi'
icon_state = "generic"
- layer = 2.99
+ layer = BELOW_OBJ_LAYER
anchored = 1
density = 1
clicksound = /singleton/sound_category/button_sound
diff --git a/code/game/objects/auras/radiant_aura.dm b/code/game/objects/auras/radiant_aura.dm
index 77e51091e7b..a5295340be3 100644
--- a/code/game/objects/auras/radiant_aura.dm
+++ b/code/game/objects/auras/radiant_aura.dm
@@ -3,7 +3,7 @@
icon = 'icons/effects/effects.dmi'
icon_state = "at_shield1"
alpha = 75
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_WINDOW_LAYER
/obj/aura/radiant_aura/added_to(mob/living/user)
..()
diff --git a/code/game/objects/effects/burnt_wall.dm b/code/game/objects/effects/burnt_wall.dm
index c7c496af687..0225ece8842 100644
--- a/code/game/objects/effects/burnt_wall.dm
+++ b/code/game/objects/effects/burnt_wall.dm
@@ -40,7 +40,6 @@
icon = 'icons/effects/fire.dmi'
icon_state = "2"
anchored = TRUE
- layer = 5
/obj/effect/overlay/burnt_wall/steel/Initialize(mapload)
. = ..(mapload, "wall", MATERIAL_STEEL)
diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm
index 660cd4839a2..97c573dbe0e 100644
--- a/code/game/objects/effects/chem/chemsmoke.dm
+++ b/code/game/objects/effects/chem/chemsmoke.dm
@@ -4,7 +4,7 @@
/obj/effect/effect/smoke/chem
icon = 'icons/effects/chemsmoke.dmi'
opacity = 0
- layer = 6
+ layer = ABOVE_PROJECTILE_LAYER
time_to_live = 300
pass_flags = PASSTABLE | PASSGRILLE | PASSGLASS //PASSGLASS is fine here, it's just so the visual effect can "flow" around glass
var/splash_amount = 10 //atoms moving through a smoke cloud get splashed with up to 10 units of reagent
diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm
index cdf2e149de0..8c0509c3468 100644
--- a/code/game/objects/effects/chem/foam.dm
+++ b/code/game/objects/effects/chem/foam.dm
@@ -8,7 +8,7 @@
opacity = 0
anchored = 1
density = 0
- layer = TURF_LAYER + 0.2
+ layer = ABOVE_OBJ_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
animate_movement = 0
var/solid_time = 120
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index e7f9fce5847..f2675897a4a 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -4,7 +4,7 @@
desc = "Some kind of sticky, flammable liquid."
icon = 'icons/effects/effects.dmi'
icon_state = "fuel"
- layer = TURF_LAYER+0.2
+ layer = BLOOD_LAYER
anchored = 1
var/amount = 1
@@ -115,7 +115,6 @@
gender = PLURAL
density = 0
anchored = 1
- layer = 2
icon = 'icons/effects/effects.dmi'
icon_state = "white_foam"
var/amount = 1
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index fa0f067995a..05e1543759e 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -199,7 +199,6 @@
gender = PLURAL
density = 0
anchored = 1
- layer = 2
icon = 'icons/effects/blood.dmi'
icon_state = "gib1"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5")
@@ -262,7 +261,6 @@
gender = PLURAL
density = 0
anchored = 1
- layer = 2
icon = 'icons/effects/blood.dmi'
icon_state = "mucus"
random_icon_states = null
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index 87d51858367..dbdc9839576 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -81,7 +81,7 @@
desc = "Somebody should remove that."
density = FALSE
anchored = TRUE
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb1"
@@ -90,7 +90,7 @@
desc = "Somebody should remove that."
density = FALSE
anchored = TRUE
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb2"
@@ -99,7 +99,7 @@
desc = "It looks like a melted... something."
density = FALSE
anchored = TRUE
- layer = 3
+ layer = OBJ_LAYER
icon = 'icons/obj/chemical.dmi'
icon_state = "molten"
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index a495be821cb..0a529a6c66c 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -1,14 +1,13 @@
/obj/effect/decal/cleanable
- layer = ABOVE_CABLE_LAYER
mouse_opacity = MOUSE_OPACITY_ICON
var/list/random_icon_states
var/swept_away
/obj/effect/decal/cleanable/attack_hand(mob/user)
- if(!swept_away && layer == ABOVE_CABLE_LAYER) // have to check layer otherwise more vars need to be added to determine whether it CAN be sweeped
+ if(!swept_away && layer == DECAL_LAYER) // have to check layer otherwise more vars need to be added to determine whether it CAN be sweeped
if((locate(/obj/machinery/atmospherics) in get_turf(src)) || (locate(/obj/machinery/hologram/holopad) in get_turf(src)))
to_chat(user, SPAN_NOTICE("You brush \the [src] away with your hand."))
- layer = LOWER_ON_TURF_LAYER
+ layer = TURF_DETAIL_LAYER
swept_away = TRUE
post_sweep(user)
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 0757ee2667f..c3a878a3700 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -2,7 +2,6 @@
name = "rune"
desc = "A rune drawn in crayon."
icon = 'icons/obj/rune.dmi'
- layer = 2.1
anchored = 1
/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", shade = "#000000", var/type = "rune")
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 7c0c8879014..2ee5ad5eb8d 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -1,3 +1,6 @@
+/obj/effect/decal
+ layer = DECAL_LAYER
+
/obj/effect/decal/tesla_act()
return
@@ -6,7 +9,7 @@
desc = "It's an arrow hanging in mid-air. There may be a wizard about."
icon = 'icons/mob/screen/generic.dmi'
icon_state = "arrow"
- layer = 16.0
+ layer = POINTER_LAYER
anchored = 1
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -14,7 +17,7 @@
/obj/effect/decal/spraystill
density = 0
anchored = 1
- layer = 50
+ layer = PROJECTILE_LAYER
//Used for imitating an object's sprite for decorative purposes.
/obj/effect/decal/fake_object
@@ -23,7 +26,7 @@
icon_state = "ladder11"
density = 0
anchored = 1
- layer = 3
+ layer = OBJ_LAYER
/obj/effect/decal/fake_object/Initialize(mapload)
.=..()
diff --git a/code/game/objects/effects/decals/warning_stripes.dm b/code/game/objects/effects/decals/warning_stripes.dm
index e3dcd387394..9ac82e4e801 100644
--- a/code/game/objects/effects/decals/warning_stripes.dm
+++ b/code/game/objects/effects/decals/warning_stripes.dm
@@ -1,6 +1,6 @@
/obj/effect/decal/warning_stripes
icon = 'icons/effects/warning_stripes.dmi'
- layer = 2
+ layer = DECAL_LAYER
/obj/effect/decal/warning_stripes/Initialize()
. = ..()
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index bc093ee57ef..c743ffee4ca 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -264,7 +264,6 @@ steam.start() -- spawns the effect
if(holder)
src.location = get_turf(holder)
var/obj/effect/effect/smoke/smoke = new smoke_type(src.location)
- smoke.layer = ABOVE_MOB_LAYER
src.total_smoke++
var/direction = src.direction
if(!direction)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 49f8fc5e2e4..b33611bde0b 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -7,7 +7,7 @@
simulated = 0
invisibility = 101
var/delete_me = 0
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/effect/landmark/New()
..()
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 4391015dfb8..47f7aa22d7c 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -41,7 +41,7 @@
/obj/effect/constructing_effect
icon = 'icons/effects/effects_rfd.dmi'
icon_state = ""
- layer = ABOVE_ALL_MOB_LAYER
+ layer = BASE_ABOVE_OBJ_LAYER
anchored = TRUE
var/delay = 0
var/status = 0
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 24b2ff25ac2..24b19a42ab8 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -24,7 +24,7 @@
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
density = 1
- layer = 5
+ layer = ABOVE_HUMAN_LAYER
anchored = 1
@@ -33,7 +33,7 @@
icon = 'icons/misc/beach2.dmi'
icon_state = "palm2"
density = 1
- layer = 5
+ layer = ABOVE_HUMAN_LAYER
anchored = 1
@@ -47,15 +47,7 @@
name = "bluespace"
icon = 'icons/turf/space.dmi'
icon_state = "bluespacify"
- layer = 10
-
-/obj/effect/overlay/snow
- name = "snow"
- icon = 'icons/turf/overlays.dmi'
- icon_state = "snowfloor"
- density = 0
- anchored = 1
- layer = 3
+ layer = SUPERMATTER_WALL_LAYER
/obj/effect/overlay/temp
icon_state = "nothing"
diff --git a/code/game/objects/effects/projectile/projectile_effects.dm b/code/game/objects/effects/projectile/projectile_effects.dm
index adb536f145e..4b2fb055155 100644
--- a/code/game/objects/effects/projectile/projectile_effects.dm
+++ b/code/game/objects/effects/projectile/projectile_effects.dm
@@ -2,7 +2,7 @@
name = "pew"
icon = 'icons/obj/projectiles.dmi'
icon_state = null
- layer = 4.5
+ layer = PROJECTILE_LAYER
anchored = TRUE
unacidable = TRUE
light_power = 1
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index fd9e8ed4838..dcb75fdc26a 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -61,7 +61,7 @@
icon_state = "stickyweb2"
if(prob(75))
- var/image/web_overlay = image(icon, icon_state = "[initial(icon_state)]-overlay[pick(1, 2, 3)]", layer = ABOVE_MOB_LAYER)
+ var/image/web_overlay = image(icon, icon_state = "[initial(icon_state)]-overlay[pick(1, 2, 3)]", layer = ABOVE_HUMAN_LAYER)
add_overlay(web_overlay)
/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
diff --git a/code/game/objects/effects/temporary_visuals/blood_splatter.dm b/code/game/objects/effects/temporary_visuals/blood_splatter.dm
index 21961a3c856..bd290be4fa3 100644
--- a/code/game/objects/effects/temporary_visuals/blood_splatter.dm
+++ b/code/game/objects/effects/temporary_visuals/blood_splatter.dm
@@ -3,7 +3,7 @@
icon_state = null
duration = 5
randomdir = FALSE
- layer = BELOW_MOB_LAYER
+ layer = LYING_HUMAN_LAYER
var/splatter_type = "splatter"
/obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, _color)
@@ -22,7 +22,7 @@
target_pixel_y = 16
if(SOUTH)
target_pixel_y = -16
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(EAST)
target_pixel_x = 16
if(WEST)
@@ -36,9 +36,9 @@
if(SOUTHEAST)
target_pixel_x = 16
target_pixel_y = -16
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(SOUTHWEST)
target_pixel_x = -16
target_pixel_y = -16
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
diff --git a/code/game/objects/effects/temporary_visuals/incorporeal_mech.dm b/code/game/objects/effects/temporary_visuals/incorporeal_mech.dm
index 5d5fd91fba9..7bc04094a28 100644
--- a/code/game/objects/effects/temporary_visuals/incorporeal_mech.dm
+++ b/code/game/objects/effects/temporary_visuals/incorporeal_mech.dm
@@ -1,5 +1,5 @@
/obj/effect/temp_visual/incorporeal_mech
- layer = BELOW_MOB_LAYER
+ layer = LYING_HUMAN_LAYER
randomdir = FALSE
/obj/effect/temp_visual/incorporeal_mech/Initialize(mapload, new_dir, var/mob/living/heavy_vehicle/HV)
diff --git a/code/game/objects/effects/temporary_visuals/teleport_visuals.dm b/code/game/objects/effects/temporary_visuals/teleport_visuals.dm
index 3a62f64eb83..32e874b5748 100644
--- a/code/game/objects/effects/temporary_visuals/teleport_visuals.dm
+++ b/code/game/objects/effects/temporary_visuals/teleport_visuals.dm
@@ -1,7 +1,7 @@
/obj/effect/temp_visual/phase
icon = 'icons/mob/mob.dmi'
icon_state = "phasein"
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
duration = 15
@@ -11,7 +11,7 @@
/obj/effect/temp_visual/phase/rift
icon = 'icons/obj/rig_modules.dmi'
icon_state = "rift"
- layer = BELOW_MOB_LAYER
+ layer = LYING_HUMAN_LAYER
alpha = 125
/obj/effect/temp_visual/phase/rift/Initialize(mapload, dir)
diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm
index abe657a0c47..fb72ccf96c7 100644
--- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm
+++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm
@@ -2,7 +2,7 @@
/obj/effect/temp_visual
icon_state = "nothing"
anchored = TRUE
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/duration = 10 //in deciseconds
var/randomdir = TRUE
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 481dd78f62e..63614bbe277 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -527,7 +527,7 @@
// for items that can be placed in multiple slots
/obj/item/proc/equipped(var/mob/user, var/slot)
SHOULD_CALL_PARENT(TRUE)
- layer = SCREEN_LAYER+0.01
+ hud_layerise()
equip_slot = slot
if(user.client) user.client.screen |= src
if(user.pulling == src) user.stop_pulling()
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 56060c3d61e..e402271db8c 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -22,7 +22,7 @@ pixel_x = 8;
Otherwise, you would likely just use a handheld shortwave radio instead."
icon = 'icons/obj/machinery/wall/terminals.dmi'
icon_state = "intercom"
- layer = 2.99
+ layer = ABOVE_WINDOW_LAYER
anchored = TRUE
appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall
w_class = ITEMSIZE_LARGE
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index a33804459bc..cbd771b97e9 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "eshield0"
item_state = "nothing"
- layer = TURF_LAYER+0.2
+ layer = BELOW_TABLE_LAYER
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 11
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 939f0f8b0e9..97a090ca134 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -94,7 +94,7 @@
if(scanned in overlay_cache)
. = overlay_cache[scanned]
else
- var/image/I = image(scanned.icon, scanned.loc, scanned.icon_state, HUD_LAYER, scanned.dir)
+ var/image/I = image(scanned.icon, scanned.loc, scanned.icon_state, UNDER_HUD_LAYER, scanned.dir)
//Pipes are special
if(istype(scanned, /obj/machinery/atmospherics/pipe))
diff --git a/code/game/objects/items/draftingchalk.dm b/code/game/objects/items/draftingchalk.dm
index 019917719cd..bacf1e9df53 100644
--- a/code/game/objects/items/draftingchalk.dm
+++ b/code/game/objects/items/draftingchalk.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/smooth/chalkline-smooth.dmi'
icon_state = "preview"
color = "#FFFFFF"
- layer = 2.1
anchored = TRUE
smoothing_flags = SMOOTH_TRUE
diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm
index 72a57cd3a00..7324d2c0126 100644
--- a/code/game/objects/items/weapons/landmines.dm
+++ b/code/game/objects/items/weapons/landmines.dm
@@ -22,7 +22,7 @@
if(use_check_and_message(usr, USE_DISALLOW_SILICONS))
return
- layer = TURF_LAYER + 0.2
+ layer = ABOVE_TILE_LAYER
to_chat(usr, "You hide \the [src].")
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index c36ffc2919d..6c9f333d389 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -25,7 +25,7 @@ var/list/tape_roll_applications = list()
name = "tape"
icon = 'icons/obj/policetape.dmi'
anchored = 1
- layer = 3.1 // Above closed airlocks.
+ layer = BASE_ABOVE_OBJ_LAYER
var/lifted = 0
var/list/crumplers
var/crumpled = 0
@@ -181,7 +181,7 @@ var/list/tape_roll_applications = list()
var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)
P.forceMove(locate(T.x,T.y,T.z))
P.icon_state = "[src.icon_base]_door"
- P.layer = 3.2
+ P.layer = ABOVE_DOOR_LAYER
to_chat(user, SPAN_NOTICE("You finish placing the [src]."))
if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
@@ -235,8 +235,10 @@ var/list/tape_roll_applications = list()
crumple(user)
if(lifted)
animate(src, 1 SECOND, alpha = 150)
+ layer = ABOVE_HUMAN_LAYER
else
animate(src, 1 SECOND, alpha = initial(alpha))
+ reset_plane_and_layer()
else
breaktape(null, user)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 3d674b2c978..a085dd9efec 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -946,7 +946,7 @@
/obj/item/storage/backpack/cloak/get_mob_overlay(var/mob/living/carbon/human/human, var/mob_icon, var/mob_state, var/slot)
var/image/I = ..()
- var/image/cape_backing = image(mob_icon, null, "[icon_state]_backing", BELOW_MOB_LAYER)
+ var/image/cape_backing = image(mob_icon, null, "[icon_state]_backing", MOB_SHADOW_LAYER)
I.add_overlay(cape_backing)
return I
diff --git a/code/game/objects/items/weapons/storage/cell_backpack.dm b/code/game/objects/items/weapons/storage/cell_backpack.dm
index c5bbae99bad..b813969ea5a 100644
--- a/code/game/objects/items/weapons/storage/cell_backpack.dm
+++ b/code/game/objects/items/weapons/storage/cell_backpack.dm
@@ -45,7 +45,7 @@
if(-INFINITY to 1)
maptext_color = COLOR_RED
C.maptext = "[current_charge]%"
- C.layer = SCREEN_LAYER + 0.01
+ C.hud_layerise()
cx++
if (cx > (4+cols))
cx = 4
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 4102526d646..69bbd190a18 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -10,7 +10,7 @@
#define STORAGE_SPACE_CAP 200
/obj/storage_bullshit
- layer = SCREEN_LAYER
+ layer = HUD_BASE_LAYER
/obj/item/storage
name = "storage"
@@ -340,7 +340,7 @@
src.boxes.screen_loc = "[tx]:,[ty] to [mx],[my]"
for(var/obj/O in src.contents)
O.screen_loc = "[cx],[cy]"
- O.layer = SCREEN_LAYER+0.01
+ O.hud_layerise()
cx++
if (cx > mx)
cx = tx
@@ -358,7 +358,7 @@
for(var/datum/numbered_display/ND in display_contents)
ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
ND.sample_object.maptext = SMALL_FONTS(7, "[(ND.number > 1)? "[ND.number]" : ""]")
- ND.sample_object.layer = SCREEN_LAYER+0.01
+ ND.sample_object.hud_layerise()
if(display_contents_initials)
ND.sample_object.cut_overlays() // a limitation of this code is that overlays get blasted off the item, since we need to add one to add the second maptext. woe is me
var/object_initials = handle_name_initials(ND.sample_object.name)
@@ -374,7 +374,7 @@
for(var/obj/O in contents)
O.screen_loc = "[cx]:16,[cy]:16"
O.maptext = ""
- O.layer = SCREEN_LAYER+0.01
+ O.hud_layerise()
cx++
if (cx > (4+cols))
cx = 4
@@ -436,7 +436,7 @@
O.screen_loc = "4:[round((startpoint+endpoint)/2)+2],2:16"
O.maptext = ""
- O.layer = SCREEN_LAYER+0.02
+ O.hud_layerise()
if (!defer_overlays)
storage_start.compile_overlays()
@@ -640,9 +640,9 @@
if(ismob(loc))
W.dropped(usr)
if(ismob(new_location))
- W.layer = SCREEN_LAYER + 0.01
+ W.hud_layerise()
else
- W.layer = initial(W.layer)
+ W.reset_plane_and_layer()
W.forceMove(new_location)
else
W.forceMove(get_turf(src))
@@ -673,9 +673,9 @@
if(ismob(loc))
W.dropped(user)
if(ismob(new_location))
- W.layer = SCREEN_LAYER + 0.01
+ W.hud_layerise()
else
- W.layer = initial(W.layer)
+ W.reset_plane_and_layer()
W.forceMove(new_location)
else
W.forceMove(get_turf(src))
@@ -844,18 +844,21 @@
storage_start = new /obj/screen/storage{icon_state = "storage_start"}
storage_start.master = src
+ storage_start.layer = HUD_BASE_LAYER
storage_continue = new /obj/screen/storage{icon_state = "storage_continue"}
storage_continue.master = src
+ storage_continue.layer = HUD_BASE_LAYER
storage_end = new /obj/screen/storage{icon_state = "storage_end"}
storage_end.master = src
+ storage_end.layer = HUD_BASE_LAYER
closer = new /obj/screen/close{
icon_state = "x";
- layer = SCREEN_LAYER
}
closer.master = src
+ closer.layer = HUD_BASE_LAYER
orient2hud(null, mapload)
if (defer_shrinkwrap) // Caller wants to defer shrinkwrapping until after the current callstack; probably putting something in.
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 6cce6374949..3a2ad64550b 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -93,7 +93,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "tape"
w_class = ITEMSIZE_TINY
- layer = 4
+ layer = ABOVE_OBJ_LAYER
anchored = 1 //it's sticky, no you cant move it
drop_sound = null
var/obj/item/stuck = null
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 946d35c69d1..8efeb2c9397 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -26,7 +26,7 @@
var/turf/T = get_turf(M)
if(T)
var/obj/effect/energy_net/net = new net_type(T)
- net.layer = M.layer + 1
+ net.layer = ABOVE_HUMAN_LAYER
M.captured = TRUE
M.update_canmove()
net.affecting = M
diff --git a/code/game/objects/merge_conflict_marker.dm b/code/game/objects/merge_conflict_marker.dm
index 0e56e818331..ee857e33ca9 100644
--- a/code/game/objects/merge_conflict_marker.dm
+++ b/code/game/objects/merge_conflict_marker.dm
@@ -2,4 +2,4 @@
name = "MERGE CONFLICT MARKER"
icon = 'icons/effects/map_effects.dmi'
icon_state = "portal_projection_side_b"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = AREA_LAYER
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 1961f1578ae..8159f5f1d76 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -1,4 +1,5 @@
/obj
+ layer = OBJ_LAYER
animate_movement = 2
var/list/matter //Used to store information about the contents of the object.
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 210ec7d59f4..109450eada5 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -366,7 +366,7 @@
desc = "75% chance of spawning dirt, otherwise nothing."
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
- layer = ABOVE_CABLE_LAYER // just so it appears under structures in map editor
+ layer = BELOW_OBJ_LAYER // just so it appears under structures in map editor
spawn_nothing_percentage = 25
spawnlist = list(
/obj/effect/decal/cleanable/dirt
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 6046f7f8b8a..0e831dd0755 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,7 +1,7 @@
/obj/structure
icon = 'icons/obj/structures.dmi'
w_class = ITEMSIZE_IMMENSE
- layer = OBJ_LAYER - 0.01
+ layer = STRUCTURE_LAYER
var/material_alteration = MATERIAL_ALTERATION_ALL // Overrides for material shit. Set them manually if you don't want colors etc. See wood chairs/office chairs.
var/climbable
diff --git a/code/game/objects/structures/ECD.dm b/code/game/objects/structures/ECD.dm
index 5c3318dd9da..a2f51a3ce07 100644
--- a/code/game/objects/structures/ECD.dm
+++ b/code/game/objects/structures/ECD.dm
@@ -11,7 +11,7 @@
density = TRUE
var/state = ECD_WELDED
slowdown = 10
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/ecd/examine(mob/living/user, distance)
. = ..()
diff --git a/code/game/objects/structures/barricades/_barricade.dm b/code/game/objects/structures/barricades/_barricade.dm
index db5016f9769..2d7b3c5dbd9 100644
--- a/code/game/objects/structures/barricades/_barricade.dm
+++ b/code/game/objects/structures/barricades/_barricade.dm
@@ -4,7 +4,6 @@
anchored = TRUE
density = TRUE
throwpass = TRUE //You can throw objects over this, despite its density.
- layer = BELOW_OBJ_LAYER
atom_flags = ATOM_FLAG_CHECKS_BORDER
var/stack_type //The type of stack the barricade dropped when disassembled if any.
@@ -55,13 +54,13 @@
icon_state = "[barricade_type]"
switch(dir)
if(SOUTH)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(NORTH)
layer = initial(layer) - 0.01
else
- layer = initial(layer)
+ reset_plane_and_layer()
if(!anchored)
- layer = initial(layer)
+ reset_plane_and_layer()
else
if(can_change_dmg_state)
icon_state = "[barricade_type]_closed_[damage_state]"
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 5497f844a77..8352c730cba 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -1,7 +1,6 @@
/obj/structure/sign/double/barsign
icon = 'icons/obj/barsigns.dmi'
icon_state = "Off"
- layer = 2.99
anchored = TRUE
req_access = list(ACCESS_BAR) //Has to initalize at first, this is updated by instance's req_access
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index b19d9eb12cd..90543497ba0 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -16,7 +16,7 @@ LINEN BINS
slot_r_hand_str = 'icons/mob/items/righthand_bedsheet.dmi',
)
slot_flags = SLOT_BACK
- layer = 4.0
+ layer = BASE_ABOVE_OBJ_LAYER
throwforce = 1
throw_speed = 1
throw_range = 2
@@ -95,7 +95,7 @@ LINEN BINS
if(M.loc == src.loc)
return
else
- layer = initial(layer)
+ reset_plane_and_layer()
/obj/item/bedsheet/verb/fold_verb()
set name = "Fold Bedsheet"
@@ -125,7 +125,7 @@ LINEN BINS
fold = TRUE
slot_flags = null
w_class = ITEMSIZE_SMALL
- layer = initial(layer)
+ layer = reset_plane_and_layer()
else
fold = FALSE
slot_flags = SLOT_BACK
@@ -159,7 +159,7 @@ LINEN BINS
roll = TRUE
slot_flags = null
w_class = ITEMSIZE_NORMAL
- layer = initial(layer)
+ layer = reset_plane_and_layer()
if(user.resting && get_turf(src) == get_turf(user)) // Make them rest
user.lay_down()
else
@@ -167,7 +167,7 @@ LINEN BINS
slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE
if(layer == initial(layer))
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
if(!user.resting && get_turf(src) == get_turf(user)) // Make them get up
user.lay_down()
update_icon()
diff --git a/code/game/objects/structures/coatrack.dm b/code/game/objects/structures/coatrack.dm
index 1d38bd541f0..1e2f6ecb400 100644
--- a/code/game/objects/structures/coatrack.dm
+++ b/code/game/objects/structures/coatrack.dm
@@ -3,7 +3,7 @@
desc = "Rack that holds coats, or hats, if you're so inclined."
icon = 'icons/obj/coatrack.dmi'
icon_state = "coatrack"
- layer = ABOVE_MOB_LAYER //Hide behind coat racks. Because funny.
+ layer = ABOVE_HUMAN_LAYER
var/obj/item/clothing/coat
var/obj/item/clothing/head/hat
var/list/custom_sprites = list(/obj/item/clothing/head/beret/security, /obj/item/clothing/accessory/poncho/tajarancloak) // Custom manual sprite override.
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 892e70079e3..771c86888be 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -594,7 +594,7 @@
var/angle = door_anim_angle * (closing ? 1 - (I/num_steps) : (I/num_steps))
var/matrix/M = get_door_transform(angle)
var/door_state = angle >= 90 ? "[icon_door_override ? icon_door : icon_state]_back" : "[icon_door || icon_state]_door"
- var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_MOB_LAYER
+ var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_HUMAN_LAYER
if(I == 0)
door_obj.transform = M
@@ -625,7 +625,7 @@
var/angle = door_anim_angle * (closing ? 1 - (I/num_steps) : (I/num_steps))
var/matrix/M = get_door_transform(angle, TRUE)
var/door_state = angle >= 90 ? "[icon_door_override ? icon_door : icon_state]_back_alt" : "[icon_door || icon_state]_door_alt"
- var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_MOB_LAYER
+ var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_HUMAN_LAYER
if(I == 0)
door_obj_alt.transform = M
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index ddb405e2364..b188b8d526d 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -50,7 +50,7 @@
var/list/animation_math_list = animation_math["[door_anim_time]-[door_anim_angle]-[azimuth_angle_2]-[radius_2]-[door_hinge]"]
for(var/I in 0 to num_steps)
var/door_state = I == (closing ? num_steps : 0) ? "[icon_door || icon_state]_door" : animation_math_list[closing ? 2 * num_steps - I : num_steps + I] <= 0 ? "[icon_door_override ? icon_door : icon_state]_back" : "[icon_door || icon_state]_door"
- var/door_layer = I == (closing ? num_steps : 0) ? ABOVE_MOB_LAYER : animation_math_list[closing ? 2 * num_steps - I : num_steps + I] <= 0 ? FLOAT_LAYER : ABOVE_MOB_LAYER
+ var/door_layer = I == (closing ? num_steps : 0) ? ABOVE_HUMAN_LAYER : animation_math_list[closing ? 2 * num_steps - I : num_steps + I] <= 0 ? FLOAT_LAYER : ABOVE_HUMAN_LAYER
var/matrix/M = get_door_transform(I == (closing ? num_steps : 0) ? 0 : animation_math_list[closing ? num_steps - I : I], I == (closing ? num_steps : 0) ? 1 : animation_math_list[closing ? 2 * num_steps - I : num_steps + I])
if(I == 0)
door_obj.transform = M
@@ -124,13 +124,13 @@
spawn(3)//Short spawn prevents things popping up where they shouldnt
switch (target)
if (ABOVE_TABLE)
- layer = LAYER_ABOVE_TABLE
+ layer = ABOVE_TABLE_LAYER
pixel_y = 8
if (FALSE)
layer = initial(layer)
pixel_y = 0
if (UNDER_TABLE)
- layer = LAYER_UNDER_TABLE
+ layer = BELOW_TABLE_LAYER
pixel_y = -4
//For putting on tables
diff --git a/code/game/objects/structures/crystals.dm b/code/game/objects/structures/crystals.dm
index 2005c3383a0..0d6bba68bfe 100644
--- a/code/game/objects/structures/crystals.dm
+++ b/code/game/objects/structures/crystals.dm
@@ -5,7 +5,6 @@
icon_state = "scattered"
anchored = TRUE
density = FALSE
- layer = ABOVE_CABLE_LAYER
var/singleton/reagent/reagent_id
var/state = 0
var/health = 100
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index 56db9fa6d22..ee855e0c029 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -1,11 +1,8 @@
-#define SHOWER_OPEN_LAYER OBJ_LAYER + 0.4
-#define SHOWER_CLOSED_LAYER MOB_LAYER + 0.1
-
/obj/structure/curtain
name = "curtain"
icon = 'icons/obj/curtain.dmi'
icon_state = "closed"
- layer = SHOWER_OPEN_LAYER
+ layer = ABOVE_WINDOW_LAYER
opacity = 1
density = 0
anchored = TRUE //curtains start secured in place
@@ -20,7 +17,7 @@
/obj/structure/curtain/open
icon_state = "open"
- layer = SHOWER_CLOSED_LAYER
+ layer = ABOVE_HUMAN_LAYER
opacity = 0
/obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
@@ -67,10 +64,10 @@
src.set_opacity(!src.opacity)
if(opacity)
icon_state = "closed"
- layer = SHOWER_CLOSED_LAYER
+ layer = ABOVE_HUMAN_LAYER
else
icon_state = "open"
- layer = SHOWER_OPEN_LAYER
+ layer = ABOVE_WINDOW_LAYER
/obj/structure/curtain/black
name = "black curtain"
@@ -109,6 +106,3 @@
/obj/structure/curtain/open/shower/security
color = "#AA0000"
-
-#undef SHOWER_OPEN_LAYER
-#undef SHOWER_CLOSED_LAYER
diff --git a/code/game/objects/structures/full_window_frame.dm b/code/game/objects/structures/full_window_frame.dm
index b7ba4014f72..34a260729f1 100644
--- a/code/game/objects/structures/full_window_frame.dm
+++ b/code/game/objects/structures/full_window_frame.dm
@@ -5,7 +5,7 @@
icon_state = "window_frame"
color = COLOR_GRAY20
build_amt = 4
- layer = LAYER_ABOVE_TABLE
+ layer = ABOVE_TABLE_LAYER
anchored = TRUE
density = TRUE
climbable = TRUE
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e330c032a80..46f6f2f8da0 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -7,7 +7,7 @@
icon_state = "girder"
anchored = 1
density = 1
- layer = ABOVE_CABLE_LAYER
+ layer = BELOW_OBJ_LAYER
w_class = ITEMSIZE_HUGE
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/state = 0
diff --git a/code/game/objects/structures/gore/core.dm b/code/game/objects/structures/gore/core.dm
index fa9823aa4a4..4e0a96891fc 100644
--- a/code/game/objects/structures/gore/core.dm
+++ b/code/game/objects/structures/gore/core.dm
@@ -2,7 +2,6 @@
name = "alien thing"
desc = "There's something alien about this."
icon = 'icons/obj/gore_structures.dmi'
- layer = ABOVE_CABLE_LAYER + 0.1
anchored = TRUE
density = FALSE
var/destroy_message = "THE STRUCTURE collapses in on itself!"
diff --git a/code/game/objects/structures/gore/tendrils.dm b/code/game/objects/structures/gore/tendrils.dm
index a06fe29a9d3..c43be3f3a19 100644
--- a/code/game/objects/structures/gore/tendrils.dm
+++ b/code/game/objects/structures/gore/tendrils.dm
@@ -18,7 +18,6 @@
desc = "Clumped up flesh, pulsating in rhythm with the tendrils that surround it."
icon_state = "tendril_node"
density = TRUE
- layer = ABOVE_CABLE_LAYER + 0.2
maxHealth = 150
light_range = NODERANGE
light_color = LIGHT_COLOR_EMERGENCY
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index e8974f14693..1a4d10bf134 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -10,7 +10,7 @@
anchored = TRUE
obj_flags = OBJ_FLAG_CONDUCTABLE
explosion_resistance = 1
- layer = 2.98
+ layer = BELOW_OBJ_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/health = 10
var/destroyed = 0
diff --git a/code/game/objects/structures/hadii_statue.dm b/code/game/objects/structures/hadii_statue.dm
index eeecf4a7460..eee93ea7618 100644
--- a/code/game/objects/structures/hadii_statue.dm
+++ b/code/game/objects/structures/hadii_statue.dm
@@ -5,7 +5,7 @@
icon_state = "bronze"
density = TRUE
anchored = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
var/toppled = FALSE
var/outside = FALSE
var/already_toppled = FALSE
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 686f691c569..55a15fc8303 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -8,7 +8,7 @@
density = FALSE
anchored = TRUE
w_class = ITEMSIZE_NORMAL
- layer = UNDER_PIPE_LAYER //under pipes
+ layer = LATTICE_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
@@ -85,7 +85,7 @@
/obj/structure/lattice/catwalk/indoor
desc = "A floor-mounted catwalk designed to protect pipes & station wiring from passing feet."
can_be_unanchored = TRUE
- layer = 2.7 // Above wires.
+ layer = CATWALK_LAYER
/obj/structure/lattice/catwalk/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.iswelder())
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 4799e051beb..166a6eadac8 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -142,7 +142,7 @@
density = TRUE
anchored = TRUE
throwpass = TRUE
- layer = TURF_LAYER
+ layer = BELOW_OBJ_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/obj/structure/morgue/connected = null
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 0a72b1fe605..f8f0a077ece 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -5,7 +5,7 @@
icon_state = "plasticflaps_preview"
density = 0
anchored = 1
- layer = 4
+ layer = ABOVE_HUMAN_LAYER
explosion_resistance = 5
build_amt = 4
color = COLOR_GRAY20 // ideally this would get_step() the material color from nearby walls but this works for now.
@@ -118,7 +118,6 @@
/obj/structure/plasticflaps/airtight
name = "airtight plastic flaps"
desc = "Heavy duty, airtight, plastic flaps."
- layer = 3
airtight = TRUE
/obj/structure/plasticflaps/airtight/Initialize()
diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
index 3c5e8c19005..4972136f8d5 100644
--- a/code/game/objects/structures/railing.dm
+++ b/code/game/objects/structures/railing.dm
@@ -149,7 +149,7 @@
NeighborsCheck(update_neighbors)
overlays.Cut()
if(dir == SOUTH)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
else
layer = initial(layer)
if(!neighbor_status || !anchored)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 3fab4824e8c..0bdaa093d55 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -264,7 +264,7 @@ FLOOR SAFES
icon_state = "floorsafe"
density = 0
level = 1 //underfloor
- layer = 2.5
+ layer = BELOW_OBJ_LAYER
drill_x_offset = -1
drill_y_offset = 20
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 889c3d81b6f..244141fb95e 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -9,7 +9,7 @@
anchored = TRUE
density = FALSE
opacity = FALSE
- layer = 3.5
+ layer = ABOVE_WINDOW_LAYER
w_class = ITEMSIZE_NORMAL
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
diff --git a/code/game/objects/structures/statue.dm b/code/game/objects/structures/statue.dm
index 5dfa91fbf80..18324e5199b 100644
--- a/code/game/objects/structures/statue.dm
+++ b/code/game/objects/structures/statue.dm
@@ -5,4 +5,4 @@
icon_state = "rredouane"
density = TRUE
anchored = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 8ef57c05765..cc6e74ee492 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -225,7 +225,7 @@
/obj/structure/bed/stool/chair/shuttle/update_icon()
..()
if(!buckled)
- generate_overlay_cache(material, CACHE_TYPE_SPECIAL, ABOVE_MOB_LAYER)
+ generate_overlay_cache(material, CACHE_TYPE_SPECIAL, ABOVE_HUMAN_LAYER)
/obj/structure/bed/stool/chair/cockpit
name = "cockpit seating"
@@ -245,7 +245,7 @@
/obj/structure/bed/stool/chair/cockpit/update_icon()
..()
if(buckled)
- generate_overlay_cache(material, CACHE_TYPE_SPECIAL, ABOVE_MOB_LAYER)
+ generate_overlay_cache(material, CACHE_TYPE_SPECIAL, ABOVE_HUMAN_LAYER)
// pool chair, to sit with your feet in the water. only works when facing south, because water overlays weirdly otherwise
/obj/structure/bed/stool/chair/pool
diff --git a/code/game/objects/structures/urban.dm b/code/game/objects/structures/urban.dm
index afded0eb589..523eebe5dd4 100644
--- a/code/game/objects/structures/urban.dm
+++ b/code/game/objects/structures/urban.dm
@@ -189,7 +189,6 @@
desc = "An emergency water hydrant for emergency watering of things."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "hydrant"
- layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
/obj/structure/urban_grate
@@ -205,7 +204,6 @@
desc = "A parking meter that seems to be turned off."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "parking"
- layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
/obj/structure/television
@@ -220,7 +218,6 @@
desc = "A divider for an environment where you're probably swapping clothes, made with your privacy in mind."
icon = 'icons/obj/structure/urban/tailoring.dmi'
icon_state = "divider1"
- layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
/obj/structure/neon_sign
@@ -229,7 +226,7 @@
icon = 'icons/obj/structure/urban/konyang_neon.dmi'
icon_state = "sign1"
anchored = TRUE
- layer = 7
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/shipping_container
name = "freight container"
@@ -238,13 +235,13 @@
icon_state = "blue1"
anchored = TRUE
density = TRUE
- layer = 7
+ layer = ABOVE_HUMAN_LAYER
/obj/effect/overlay/container_logo
name = "Hephaestus Industries emblem"
icon = 'icons/obj/structure/industrial/shipping_containers.dmi'
icon_state = "heph1"
- layer = 7.01
+ layer = ABOVE_HUMAN_LAYER + 0.01
/obj/effect/overlay/container_logo/einstein
name = "Einstein Engines emblem"
@@ -263,7 +260,6 @@
density = TRUE
throwpass = TRUE
climbable = TRUE
- layer = 4.01
anchored = TRUE
/obj/structure/rod_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -294,7 +290,6 @@
density = TRUE
throwpass = TRUE
anchored = TRUE
- layer = 4.01
/obj/structure/road_barrier
name = "roadway barrier"
@@ -305,7 +300,6 @@
throwpass = TRUE
climbable = TRUE
anchored = TRUE
- layer = 4.01
//smoothing these things would suck so here you go. i have no idea why you would want these buildable. map them manually
/obj/structure/road_barrier/bot_in
@@ -349,7 +343,6 @@
color = null
anchored = TRUE
can_be_unanchored = FALSE
- layer = ABOVE_ALL_MOB_LAYER
/obj/structure/chainlink_fence/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff.
if(air_group || (height==0))
@@ -385,7 +378,6 @@
color = null
anchored = TRUE
can_be_unanchored = FALSE
- layer = 3.01
/obj/structure/rope_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover,/obj/item/projectile))
@@ -414,7 +406,6 @@
icon_state = "post"
density = FALSE
anchored = TRUE
- layer = 3
/obj/structure/statue
name = "statue of Neopolymus"
@@ -423,7 +414,7 @@
icon_state = "neopolymus"
density = TRUE
anchored = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+
/obj/structure/statue/buddha
name = "buddha statue"
@@ -440,7 +431,7 @@
desc = "A sign indicating where you should probably go in a hurry."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "exit"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/sign/billboard
name = "commercial billboard"
@@ -448,14 +439,13 @@
icon = 'icons/obj/structure/urban/billboard.dmi'
icon_state = "board-l"
density = TRUE
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/sign/billboard/advert
name = "billboard advertisement"
desc = null
icon_state = "sign"
density = TRUE
- layer = 4.6
/obj/structure/sign/billboard/advert/random/Initialize(mapload)
. = ..()
@@ -486,7 +476,6 @@
icon = 'icons/obj/structure/urban/restaurant.dmi'
icon_state = "menu_off"
density = 1
- layer = ABOVE_ALL_MOB_LAYER
light_color = LIGHT_COLOR_CYAN
light_range = 1.8
var/menu_text = ""
@@ -592,7 +581,7 @@
//basestate = "wall_half"
health = 200
maxhealth = 200
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/blocker/exterior_wall/red
color = COLOR_PALE_RED_GRAY
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index d026b68ce67..4839f955994 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -12,7 +12,7 @@
alpha = 196
density = TRUE
w_class = ITEMSIZE_NORMAL
- layer = WINDOW_PANE_LAYER
+ layer = SIDE_WINDOW_LAYER
anchored = TRUE
atom_flags = ATOM_FLAG_CHECKS_BORDER
obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
@@ -62,9 +62,9 @@
/obj/structure/window/update_icon()
if(!full)
if(dir == SOUTH)
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
else
- layer = WINDOW_PANE_LAYER
+ layer = SIDE_WINDOW_LAYER
SSicon_smooth.add_to_queue(src)
/obj/structure/window/proc/take_damage(var/damage = 0, var/sound_effect = 1, message = TRUE)
@@ -546,7 +546,7 @@
dir = 5
smoothing_flags = SMOOTH_TRUE
can_be_unanchored = TRUE
- layer = 2.99
+ layer = FULL_WINDOW_LAYER
/obj/structure/window/shuttle/legion
name = "reinforced cockpit window"
@@ -621,7 +621,7 @@
glasstype = /obj/item/stack/material/glass
shardtype = /obj/item/material/shard
full = TRUE
- layer = 2.99
+ layer = FULL_WINDOW_LAYER
base_frame = /obj/structure/window_frame
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
@@ -773,7 +773,7 @@
reinf = TRUE
maximal_heat = T0C + 750
glasstype = /obj/item/stack/material/glass/reinforced
- layer = 2.99
+ layer = FULL_WINDOW_LAYER
base_frame = /obj/structure/window_frame
smoothing_flags = SMOOTH_MORE
diff --git a/code/game/turfs/flooring/flooring_decals_.dm b/code/game/turfs/flooring/flooring_decals_.dm
index 99df24c7c35..00561b02893 100644
--- a/code/game/turfs/flooring/flooring_decals_.dm
+++ b/code/game/turfs/flooring/flooring_decals_.dm
@@ -5,7 +5,7 @@
/obj/effect/floor_decal
name = "floor decal"
icon = 'icons/turf/decals/decals.dmi'
- layer = ON_TURF_LAYER
+ layer = DECAL_LAYER
appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
var/outline = TRUE //whether it applies the tile outline to shading.
var/supplied_dir
@@ -16,7 +16,7 @@
var/turf/T = get_turf(src)
var/list/floor_decals = SSicon_cache.floor_decals
if(istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor))
- layer = T.is_plating() ? DECAL_PLATING_LAYER : ON_TURF_LAYER
+ layer = T.is_plating() ? DECAL_PLATING_LAYER : DECAL_LAYER
var/cache_key = "[name]-[alpha]-[color]-[dir]-[icon_state]-[layer]-[blend_state ? blend_state : ""]-[blend_process]-[T.icon]-[T.icon_state]-[T.tile_outline ? T.tile_outline : ""]-[T.tile_outline_blend_process]"
if(!floor_decals[cache_key])
var/icon/decal_icon
diff --git a/code/game/turfs/flooring/urban.dm b/code/game/turfs/flooring/urban.dm
index 242b5194034..6668777009c 100644
--- a/code/game/turfs/flooring/urban.dm
+++ b/code/game/turfs/flooring/urban.dm
@@ -91,7 +91,7 @@
name = "roof ledge"
desc = "A basic roofing ledge to mark the edge of a rooftop. Don't trip!"
icon_state = "roof_ledge"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/ledge/roof/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover,/obj/item/projectile))
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 30612dc6b38..425c31b4a85 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -94,6 +94,10 @@
/turf/simulated/floor/levelupdate()
for(var/obj/O in src)
O.hide(O.hides_under_flooring() && src.flooring)
+ if(flooring)
+ layer = TURF_LAYER
+ else
+ layer = PLATING_LAYER
/turf/simulated/floor/is_floor()
return TRUE
diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm
index b52a7b0d571..3cd96167c7f 100644
--- a/code/game/turfs/simulated/shuttle_turfs.dm
+++ b/code/game/turfs/simulated/shuttle_turfs.dm
@@ -446,7 +446,7 @@
desc = "The strong glass face of a Jester-type shuttle cockpit."
icon = 'icons/turf/shuttles_unique/scc/scout_shuttle/cockpit_windows.dmi'
icon_state = "4,1"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
//Intrepid pieces
/turf/simulated/wall/shuttle/unique/scc/research
@@ -476,7 +476,7 @@
desc = "The strong glass face of a Pathfinder class shuttle cockpit."
icon = 'icons/turf/shuttles_unique/scc/research_shuttle/cockpit_windows.dmi'
icon_state = "2,1"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
//Spark pieces
/turf/simulated/wall/shuttle/unique/scc/mining
diff --git a/code/game/turfs/simulated/wall_rot.dm b/code/game/turfs/simulated/wall_rot.dm
index 407688ac513..2c9ba80a2d1 100644
--- a/code/game/turfs/simulated/wall_rot.dm
+++ b/code/game/turfs/simulated/wall_rot.dm
@@ -5,7 +5,7 @@
icon_state = "wallrot"
anchored = TRUE
density = TRUE
- layer = 5
+ layer = ABOVE_TILE_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/effect/overlay/wallrot/Initialize(mapload, ...)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 7737047c69f..e27135bc451 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -2,6 +2,8 @@
icon = 'icons/turf/floors.dmi'
level = 1
+ layer = TURF_LAYER
+
var/turf_flags
var/holy = 0
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 19eb2fe4106..a5c5dd286eb 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -42,7 +42,7 @@
/obj/effect/bmode//Cleaning up the tree a bit
density = 1
anchored = 1
- layer = SCREEN_LAYER + 1
+ layer = HUD_BASE_LAYER
dir = NORTH
icon = 'icons/misc/buildmode.dmi'
mouse_opacity = MOUSE_OPACITY_OPAQUE
diff --git a/code/modules/atmospherics/atmospherics.dm b/code/modules/atmospherics/atmospherics.dm
index 22bc949ee16..b2e6b460528 100644
--- a/code/modules/atmospherics/atmospherics.dm
+++ b/code/modules/atmospherics/atmospherics.dm
@@ -17,7 +17,7 @@ Pipelines + Other Objects -> Pipe network
var/nodealert = 0
var/power_rating //the maximum amount of power the machine can use to do work, affects how powerful the machine is, in Watts
- layer = 2.4 //under wires with their 2.44
+ layer = EXPOSED_PIPE_LAYER
var/connect_types = CONNECT_TYPE_REGULAR
var/icon_connect_type = "" //"-supply" or "-scrubbers"
diff --git a/code/modules/atmospherics/components/binary_devices/binary_atmos_base.dm b/code/modules/atmospherics/components/binary_devices/binary_atmos_base.dm
index 1099704f6ea..ace3f4c5398 100644
--- a/code/modules/atmospherics/components/binary_devices/binary_atmos_base.dm
+++ b/code/modules/atmospherics/components/binary_devices/binary_atmos_base.dm
@@ -1,6 +1,7 @@
/obj/machinery/atmospherics/binary
dir = SOUTH
initialize_directions = SOUTH|NORTH
+ layer = ABOVE_CATWALK_LAYER
var/datum/gas_mixture/air1
var/datum/gas_mixture/air2
diff --git a/code/modules/atmospherics/components/omni_devices/omni_base.dm b/code/modules/atmospherics/components/omni_devices/omni_base.dm
index df0dd862159..5a77abd79cd 100644
--- a/code/modules/atmospherics/components/omni_devices/omni_base.dm
+++ b/code/modules/atmospherics/components/omni_devices/omni_base.dm
@@ -7,6 +7,7 @@
icon_state = "base"
initialize_directions = 0
level = 1
+ layer = ABOVE_CATWALK_LAYER
var/configuring = 0
//var/target_pressure = ONE_ATMOSPHERE //a base type as abstract as this should NOT be making these kinds of assumptions
diff --git a/code/modules/atmospherics/components/unary/outlet_injector.dm b/code/modules/atmospherics/components/unary/outlet_injector.dm
index 2097d1009c6..c1f8fbaeee0 100644
--- a/code/modules/atmospherics/components/unary/outlet_injector.dm
+++ b/code/modules/atmospherics/components/unary/outlet_injector.dm
@@ -9,7 +9,6 @@
A green light on it means it is on."
icon = 'icons/atmos/injector.dmi'
icon_state = "map_injector"
- layer = 3
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
diff --git a/code/modules/atmospherics/components/unary/unary_base.dm b/code/modules/atmospherics/components/unary/unary_base.dm
index e383919727b..18964334c5f 100644
--- a/code/modules/atmospherics/components/unary/unary_base.dm
+++ b/code/modules/atmospherics/components/unary/unary_base.dm
@@ -1,7 +1,8 @@
/obj/machinery/atmospherics/unary
dir = SOUTH
initialize_directions = SOUTH
- //layer = TURF_LAYER+0.1
+
+ layer = ABOVE_TILE_LAYER
var/datum/gas_mixture/air_contents
diff --git a/code/modules/atmospherics/he_pipes.dm b/code/modules/atmospherics/he_pipes.dm
index d7c3ffd31bf..bb926dc8547 100644
--- a/code/modules/atmospherics/he_pipes.dm
+++ b/code/modules/atmospherics/he_pipes.dm
@@ -6,7 +6,6 @@
color = "#404040"
level = 2
connect_types = CONNECT_TYPE_HE
- layer = 2.41
var/initialize_directions_he
var/surface = 2 //surface area in m^2
var/icon_temperature = T20C //stop small changes in temperature causing an icon refresh
diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm
index d5cd7a8b53d..86ffb4c5db1 100644
--- a/code/modules/atmospherics/pipes.dm
+++ b/code/modules/atmospherics/pipes.dm
@@ -353,7 +353,6 @@
a Universal Adapter pipe."
icon_state = "intact-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -364,7 +363,6 @@
a Universal Adapter pipe."
icon_state = "intact-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -423,7 +421,6 @@
a Universal Adapter pipe."
icon_state = "intact-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -434,7 +431,6 @@
a Universal Adapter pipe."
icon_state = "intact-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -496,7 +492,6 @@
var/obj/machinery/atmospherics/node3
level = 1
- layer = 2.4 //under wires with their 2.44
gfi_layer_rotation = GFI_ROTATION_OVERDIR
@@ -683,7 +678,6 @@
a Universal Adapter pipe."
icon_state = "map-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -694,7 +688,6 @@
a Universal Adapter pipe."
icon_state = "map-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -753,7 +746,6 @@
a Universal Adapter pipe."
icon_state = "map-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -764,7 +756,6 @@
a Universal Adapter pipe."
icon_state = "map-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -827,7 +818,6 @@
var/obj/machinery/atmospherics/node4
level = 1
- layer = 2.4 //under wires with their 2.44
/obj/machinery/atmospherics/pipe/manifold4w/Initialize(mapload)
if(mapload)
@@ -1015,7 +1005,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -1026,7 +1015,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -1085,7 +1073,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -1096,7 +1083,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-supply"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -1150,7 +1136,6 @@
icon = 'icons/atmos/pipes.dmi'
icon_state = ""
level = 2
- layer = 2.4 //under wires with their 2.44
volume = 35
@@ -1232,7 +1217,6 @@
name = "scrubbers pipe endcap"
desc = "An endcap for scrubbers pipes"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -1240,7 +1224,6 @@
name = "supply pipe endcap"
desc = "An endcap for supply pipes"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
@@ -1269,7 +1252,6 @@
name = "scrubbers pipe endcap"
desc = "An endcap for scrubbers pipes"
connect_types = CONNECT_TYPE_SCRUBBER
- layer = 2.38
icon_connect_type = "-scrubbers"
color = PIPE_COLOR_RED
@@ -1277,7 +1259,6 @@
name = "supply pipe endcap"
desc = "An endcap for supply pipes"
connect_types = CONNECT_TYPE_SUPPLY
- layer = 2.39
icon_connect_type = "-supply"
color = PIPE_COLOR_BLUE
diff --git a/code/modules/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm
index 70b93a8de50..8098aa3bb4c 100644
--- a/code/modules/balloon_alert/balloon_alert.dm
+++ b/code/modules/balloon_alert/balloon_alert.dm
@@ -42,7 +42,7 @@
var/atom/movable/movable_source = src
bound_width = movable_source.bound_width
- var/image/balloon_alert = image(loc = isturf(src) ? src : get_atom_on_turf(src), layer = ABOVE_MOB_LAYER)
+ var/image/balloon_alert = image(loc = isturf(src) ? src : get_atom_on_turf(src), layer = ABOVE_HUMAN_LAYER)
balloon_alert.alpha = 0
balloon_alert.appearance_flags = RESET_ALPHA|RESET_COLOR|RESET_TRANSFORM
balloon_alert.maptext = MAPTEXT("[text]")
diff --git a/code/modules/battlemonsters/items/furniture/dueling_area.dm b/code/modules/battlemonsters/items/furniture/dueling_area.dm
index 37f63a94e23..fca3ebd95d0 100644
--- a/code/modules/battlemonsters/items/furniture/dueling_area.dm
+++ b/code/modules/battlemonsters/items/furniture/dueling_area.dm
@@ -10,7 +10,7 @@
density = 0
/obj/structure/dueling_table/no_collide/above_layer
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/effect/decal/battlemonsters_logo
name = "battlemonsters logo"
diff --git a/code/modules/compass/compass_waypoint.dm b/code/modules/compass/compass_waypoint.dm
index 3b1fc6885ca..19158c289a3 100644
--- a/code/modules/compass/compass_waypoint.dm
+++ b/code/modules/compass/compass_waypoint.dm
@@ -17,7 +17,7 @@
compass_overlay.loc = src
compass_overlay.maptext = "|\n[name]"
compass_overlay.filters = filter(type="drop_shadow", color = "[color]" + "aa", size = 2, offset = 1,x = 0, y = 0)
- compass_overlay.layer = HUD_LAYER
+ compass_overlay.layer = RADIAL_BASE_LAYER
/datum/compass_waypoint/proc/recalculate_heading(var/cx, var/cy)
var/matrix/M = matrix()
diff --git a/code/modules/detectivework/tools/scene_cards.dm b/code/modules/detectivework/tools/scene_cards.dm
index f3210bec213..d16bc5824c6 100644
--- a/code/modules/detectivework/tools/scene_cards.dm
+++ b/code/modules/detectivework/tools/scene_cards.dm
@@ -27,7 +27,7 @@
w_class = ITEMSIZE_TINY
item_flags = ITEM_FLAG_NO_BLUDGEON
randpixel = 1
- layer = ABOVE_MOB_LAYER //so you can mark bodies
+ layer = ABOVE_HUMAN_LAYER //so you can mark bodies
var/number = 1
/obj/item/csi_marker/afterattack(atom/A, mob/user, proximity)
diff --git a/code/modules/effects/map_effects/door_helper.dm b/code/modules/effects/map_effects/door_helper.dm
index 02b032be69d..68a85d41eaa 100644
--- a/code/modules/effects/map_effects/door_helper.dm
+++ b/code/modules/effects/map_effects/door_helper.dm
@@ -1,5 +1,5 @@
/obj/effect/map_effect/door_helper
- layer = DOOR_CLOSED_LAYER + 0.1
+ layer = CLOSED_DOOR_LAYER + 0.01
/obj/effect/map_effect/door_helper/Initialize(mapload, ...)
..()
diff --git a/code/modules/effects/map_effects/map_helpers.dm b/code/modules/effects/map_effects/map_helpers.dm
index 0d86ee4014d..9271332dbab 100644
--- a/code/modules/effects/map_effects/map_helpers.dm
+++ b/code/modules/effects/map_effects/map_helpers.dm
@@ -2,7 +2,7 @@
name = "some non-descript map helper (abstract type def)"
desc = ""
icon = 'icons/effects/map_effects.dmi'
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/effect/map_effect/map_helper/Initialize(mapload)
..()
diff --git a/code/modules/effects/map_effects/portal.dm b/code/modules/effects/map_effects/portal.dm
index 9f92fdbd914..d5bd2bdb52b 100644
--- a/code/modules/effects/map_effects/portal.dm
+++ b/code/modules/effects/map_effects/portal.dm
@@ -39,7 +39,6 @@ when portals are shortly lived, or when portals are made to be obvious with spec
name = "portal subtype"
invisibility = 0
opacity = TRUE
- layer = ON_TURF_LAYER
appearance_flags = PIXEL_SCALE|KEEP_TOGETHER // Removed TILE_BOUND so things not visible on the other side stay hidden from the viewer.
var/obj/effect/map_effect/portal/counterpart = null // The portal line or master that this is connected to, on the 'other side'.
diff --git a/code/modules/effects/particles/native_particles.dm b/code/modules/effects/particles/native_particles.dm
index cb3bb58dd66..2b09f151eba 100644
--- a/code/modules/effects/particles/native_particles.dm
+++ b/code/modules/effects/particles/native_particles.dm
@@ -39,5 +39,5 @@
/obj/effect/map_effect/particle_emitter/bar_smoke
particle_type = /particles/bar_smoke
- layer = LAYER_UNDER_TABLE
+ layer = BELOW_TABLE_LAYER
alpha = 128
diff --git a/code/modules/effects/shuttle_landing_warning.dm b/code/modules/effects/shuttle_landing_warning.dm
index 37a71020032..3998f85f98e 100644
--- a/code/modules/effects/shuttle_landing_warning.dm
+++ b/code/modules/effects/shuttle_landing_warning.dm
@@ -5,4 +5,4 @@
anchored = TRUE
simulated = FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- layer = INGAME_HUD_EFFECT_LAYER
+ layer = UNDER_HUD_LAYER
diff --git a/code/modules/heavy_vehicle/components/frame.dm b/code/modules/heavy_vehicle/components/frame.dm
index d78bffffdee..7a5472aa39d 100644
--- a/code/modules/heavy_vehicle/components/frame.dm
+++ b/code/modules/heavy_vehicle/components/frame.dm
@@ -96,7 +96,7 @@
density = FALSE
if(head)
new_overlays += get_mech_image("[head.icon_state]", head.on_mech_icon, head.color, MECH_HEAD_LAYER)
- new_overlays += get_mech_image("[head.icon_state]_eyes", head.on_mech_icon, null, MECH_EYES_LAYER)
+ new_overlays += get_mech_image("[head.icon_state]_eyes", head.on_mech_icon, null, EYEGLOW_LAYER)
if(arms)
new_overlays += get_mech_image(arms.icon_state, arms.on_mech_icon, arms.color, MECH_ARM_LAYER)
if(legs)
diff --git a/code/modules/heavy_vehicle/equipment/combat.dm b/code/modules/heavy_vehicle/equipment/combat.dm
index 21dc5ccd3f9..cdd3ee67596 100644
--- a/code/modules/heavy_vehicle/equipment/combat.dm
+++ b/code/modules/heavy_vehicle/equipment/combat.dm
@@ -325,9 +325,9 @@
aura.toggle()
aura.dir = owner.dir
if(aura.dir == NORTH)
- aura.layer = MECH_UNDER_LAYER
+ aura.layer = MOB_LAYER
else
- aura.layer = ABOVE_MOB_LAYER
+ aura.layer = ABOVE_HUMAN_LAYER
playsound(owner,'sound/weapons/flash.ogg', 35, TRUE)
update_icon()
if(aura.active)
@@ -372,7 +372,7 @@
name = "mechshield"
var/obj/item/mecha_equipment/shield/shields
var/active = FALSE
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
pixel_x = 8
pixel_y = 4
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm
index 3d33fe60637..89a1588760d 100644
--- a/code/modules/heavy_vehicle/equipment/utility.dm
+++ b/code/modules/heavy_vehicle/equipment/utility.dm
@@ -190,7 +190,7 @@
desc = "An exosuit-mounted light."
icon_state = "mech_floodlight"
restricted_hardpoints = list(HARDPOINT_HEAD)
- mech_layer = MECH_DECAL_LAYER
+ mech_layer = MECH_GEAR_LAYER
var/on = 0
var/brightness_on = 12 //can't remember what the maxed out value is
diff --git a/code/modules/heavy_vehicle/mech_construction.dm b/code/modules/heavy_vehicle/mech_construction.dm
index 10b10dcbd3f..f86d23156e8 100644
--- a/code/modules/heavy_vehicle/mech_construction.dm
+++ b/code/modules/heavy_vehicle/mech_construction.dm
@@ -152,7 +152,7 @@
H.holding = system
system.screen_loc = H.screen_loc
- system.layer = H.layer+0.1
+ system.hud_layerise()
hud_elements |= system
refresh_hud()
diff --git a/code/modules/heavy_vehicle/mech_icon.dm b/code/modules/heavy_vehicle/mech_icon.dm
index efe2876fba4..a9dc1d0cebc 100644
--- a/code/modules/heavy_vehicle/mech_icon.dm
+++ b/code/modules/heavy_vehicle/mech_icon.dm
@@ -23,14 +23,14 @@ GLOBAL_LIST_EMPTY(mecha_icon_cache)
//As mech icons uses a caching system, any changes here, particularly to layers, must be reflected in /obj/structure/heavy_vehicle_frame/update_icon().
var/list/new_overlays = get_mech_icon(list(body), MECH_BASE_LAYER)
if(body && !hatch_closed)
- new_overlays += get_mech_image("[body.icon_state]_cockpit", body.on_mech_icon, MECH_BASE_LAYER)
+ new_overlays += get_mech_image("[body.icon_state]_cockpit", body.on_mech_icon, MECH_INTERMEDIATE_LAYER)
if(LAZYLEN(pilot_overlays))
new_overlays += pilot_overlays
if(body)
- new_overlays += get_mech_image("[body.icon_state]_overlay[hatch_closed ? "" : "_open"]", body.on_mech_icon, body.color, MECH_HATCH_LAYER)
+ new_overlays += get_mech_image("[body.icon_state]_overlay[hatch_closed ? "" : "_open"]", body.on_mech_icon, body.color, MECH_COCKPIT_LAYER)
if(head)
new_overlays += get_mech_image("[head.icon_state]", head.on_mech_icon, head.color, MECH_HEAD_LAYER)
- new_overlays += get_mech_image("[head.icon_state]_eyes", head.on_mech_icon, null, MECH_EYES_LAYER)
+ new_overlays += get_mech_image("[head.icon_state]_eyes", head.on_mech_icon, null, EYEGLOW_LAYER)
if(arms)
new_overlays += get_mech_image(arms.icon_state, arms.on_mech_icon, arms.color, MECH_ARM_LAYER)
if(legs)
@@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(mecha_icon_cache)
new_overlays += get_mech_image(use_icon_state, 'icons/mecha/mecha_weapon_overlays.dmi', null, hardpoint_object.mech_layer)
var/far_icon_state = "[use_icon_state]_far"
if(far_icon_state in mecha_weapon_overlays)
- new_overlays += get_mech_image(far_icon_state, 'icons/mecha/mecha_weapon_overlays.dmi', null, MECH_UNDER_LAYER)
+ new_overlays += get_mech_image(far_icon_state, 'icons/mecha/mecha_weapon_overlays.dmi', null, MOB_LAYER)
overlays = new_overlays
diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index 38908f654ec..56fd2afeb7e 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -298,9 +298,9 @@
if(S.aura)
S.aura.dir = direction
if(S.aura.dir == NORTH)
- S.aura.layer = MECH_UNDER_LAYER
+ S.aura.layer = MOB_LAYER
else
- S.aura.layer = ABOVE_MOB_LAYER
+ S.aura.layer = ABOVE_HUMAN_LAYER
update_icon()
if(!turn_only)
diff --git a/code/modules/maps/planet_types/desert.dm b/code/modules/maps/planet_types/desert.dm
index 5dc12eec5be..3d0bcd28adf 100644
--- a/code/modules/maps/planet_types/desert.dm
+++ b/code/modules/maps/planet_types/desert.dm
@@ -132,7 +132,7 @@
if(buckled)
overlays += buckled
var/image/I = image(icon,icon_state="overlay")
- I.layer = ABOVE_MOB_LAYER
+ I.layer = ABOVE_HUMAN_LAYER
overlays += I
/obj/structure/quicksand/proc/expose()
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index b3325553d65..989f290fd0b 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -27,7 +27,6 @@ var/list/mineral_can_smooth_with = list(
desc = "It's a greyish rock. Exciting."
gender = PLURAL
var/icon/actual_icon = 'icons/turf/smooth/rock_dense.dmi'
- layer = ON_TURF_LAYER
color = "#6e632f"
// canSmoothWith is set in Initialize().
diff --git a/code/modules/mining/ore_detector.dm b/code/modules/mining/ore_detector.dm
index 36a6755deb1..aac1b308507 100644
--- a/code/modules/mining/ore_detector.dm
+++ b/code/modules/mining/ore_detector.dm
@@ -121,7 +121,7 @@
found_ores = TRUE
if(found_ores)
- var/image/ore_ping = image(icon = 'icons/obj/item/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
+ var/image/ore_ping = image(icon = 'icons/obj/item/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = UNDER_HUD_LAYER)
ore_ping.pixel_x = rand(-6, 6)
ore_ping.pixel_y = rand(-6, 6)
ore_ping.alpha = rand(180, 255)
diff --git a/code/modules/mob/abstract/freelook/chunk.dm b/code/modules/mob/abstract/freelook/chunk.dm
index 8b9715934f4..648e50063da 100644
--- a/code/modules/mob/abstract/freelook/chunk.dm
+++ b/code/modules/mob/abstract/freelook/chunk.dm
@@ -24,7 +24,7 @@
if(!obfuscation)
obfuscation = image(icon, T, icon_state)
obfuscation.layer = OBFUSCATION_LAYER
- obfuscation.plane = PLANE_DEFAULT
+ obfuscation.plane = DEFAULT_PLANE
if(!obfuscation_underlay)
// Creating a new icon of a fairly common icon state, adding some random color to prevent address searching, and hoping being static kills memory locality
var/turf/floor = /turf/simulated/floor/tiled
diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm
index a6ab847ce8f..a85797f550c 100644
--- a/code/modules/mob/abstract/new_player/menu.dm
+++ b/code/modules/mob/abstract/new_player/menu.dm
@@ -54,7 +54,7 @@
/obj/screen/new_player
icon = 'icons/misc/hudmenu/hudmenu.dmi'
- layer = HUD_LAYER
+ layer = HUD_BASE_LAYER
/obj/screen/new_player/Initialize()
set_sector_things()
diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm
index 0711e9fa88c..f8249e21a4a 100644
--- a/code/modules/mob/abstract/observer/observer.dm
+++ b/code/modules/mob/abstract/observer/observer.dm
@@ -3,7 +3,7 @@
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
- layer = 4
+ layer = OBSERVER_LAYER
stat = DEAD
density = 0
canmove = 0
diff --git a/code/modules/mob/floating_messages.dm b/code/modules/mob/floating_messages.dm
index 04d801672bd..a8e928748be 100644
--- a/code/modules/mob/floating_messages.dm
+++ b/code/modules/mob/floating_messages.dm
@@ -98,10 +98,13 @@ var/list/floating_chat_colors = list()
return FALSE
var/atom/movable/attached_holder = get_last_atom_before_turf(src)
- var/image/I = image(null, attached_holder, layer = OBFUSCATION_LAYER-0.01)
+ var/image/I = image(null, attached_holder, layer = FLY_LAYER)
I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA | KEEP_APART | PIXEL_SCALE
I.plane = FLOAT_PLANE
+ I.layer = UNDER_HUD_LAYER
+ I.pixel_x = (-round(I.maptext_width/2) + 16) + attached_holder.get_floating_chat_x_offset()
+ I.appearance_flags = RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM
I.alpha = 0
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 7d81c48a2c1..9e3b9bf7872 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -202,7 +202,7 @@ var/list/slot_equipment_priority = list( \
W.forceMove(get_turf(src))
else
W.forceMove(get_turf(W))
- W.layer = initial(W.layer)
+ W.reset_plane_and_layer()
W.dropped(src)
return 0
@@ -316,7 +316,7 @@ var/list/slot_equipment_priority = list( \
src.u_equip(I)
if (src.client)
src.client.screen -= I
- I.layer = initial(I.layer)
+ I.reset_plane_and_layer()
I.screen_loc = null
I.on_slotmove(src)
@@ -329,7 +329,7 @@ var/list/slot_equipment_priority = list( \
src.u_equip(O)
if (src.client)
src.client.screen -= O
- O.layer = initial(O.layer)
+ O.reset_plane_and_layer()
O.screen_loc = null
if(istype(O, /obj/item))
var/obj/item/I = O
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 6ca8fafbeed..06f89a2ed49 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -288,7 +288,6 @@ This saves us from having to call add_fingerprint() any time something is put in
var/obj/item/clothing/ears/offear/O = new /obj/item/clothing/ears/offear(src)
O.copy_ear(W)
src.r_ear = O
- O.layer = SCREEN_LAYER+0.01
W.equipped(src, slot, assisted_equip)
update_inv_l_ear(redraw_mob)
if(slot_r_ear)
@@ -301,7 +300,6 @@ This saves us from having to call add_fingerprint() any time something is put in
var/obj/item/clothing/ears/offear/O = new /obj/item/clothing/ears/offear(src)
O.copy_ear(W)
src.l_ear = O
- O.layer = SCREEN_LAYER+0.01
W.equipped(src, slot, assisted_equip)
update_inv_r_ear(redraw_mob)
if(slot_glasses)
@@ -374,7 +372,7 @@ This saves us from having to call add_fingerprint() any time something is put in
src.r_hand = null
update_inv_r_hand()
- W.layer = SCREEN_LAYER+0.01
+ W.hud_layerise()
for(var/s in species.hud.gear)
var/list/gear = species.hud.gear[s]
if(gear["slot"] == slot)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 2aab84af033..70e5e17bf5f 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -239,7 +239,7 @@ There are several things that need to be remembered:
LAZYADD(ovr, DI)
- overlays_raw[DAMAGE_LAYER] = ovr
+ overlays_raw[MOB_DAMAGE_LAYER] = ovr
update_bandages(update_icons)
if(update_icons)
update_icon()
@@ -250,7 +250,7 @@ There are several things that need to be remembered:
return
var/list/ovr
- if(overlays_raw[DAMAGE_LAYER])
+ if(overlays_raw[MOB_DAMAGE_LAYER])
for(var/obj/item/organ/external/O in organs)
if(O.is_stump())
continue
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index ae1b8fa7fd8..6eb1fb98a05 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -8,7 +8,7 @@
speak_emote = list("chirps")
mob_size = 4
composition_reagent = /singleton/reagent/slimejelly
- layer = 5
+ layer = MOB_LAYER
maxHealth = 150
health = 150
gender = NEUTER
diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm
index 2d3e15e25a2..db76b444d78 100644
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -6,8 +6,8 @@
if(stat == DEAD || paralysis || weakened || stunned || restrained())
return
- if (layer != 2.45)
- layer = 2.45 //Just above cables with their 2.44
+ if (layer != HIDING_MOB_LAYER)
+ layer = HIDING_MOB_LAYER //Just above cables with their 2.44
to_chat(src, text("You are now hiding."))
else
layer = MOB_LAYER
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index e16e7f16acd..aaeeee8d6ff 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -211,19 +211,19 @@
return
if(!module_state_1)
module_state_1 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
O.screen_loc = inv1.screen_loc
contents += O
O.on_module_hotbar(src)
else if(!module_state_2)
module_state_2 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
O.screen_loc = inv2.screen_loc
contents += O
O.on_module_hotbar(src)
else if(!module_state_3)
module_state_3 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
O.screen_loc = inv3.screen_loc
contents += O
O.on_module_hotbar(src)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d47b2f1d9ba..0486f3dd8b4 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -147,7 +147,7 @@
robot_modules_background = new()
robot_modules_background.icon_state = "block"
- robot_modules_background.layer = SCREEN_LAYER //Objects that appear on screen are on layer 20, UI should be just below it.
+ robot_modules_background.layer = HUD_BASE_LAYER
updatename(mod_type)
if(!client)
@@ -921,19 +921,19 @@
return TRUE
if(!module_state_1)
module_state_1 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
contents += O
if(istype(module_state_1,/obj/item/borg/sight))
sight_mode |= module_state_1:sight_mode
else if(!module_state_2)
module_state_2 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
contents += O
if(istype(module_state_2,/obj/item/borg/sight))
sight_mode |= module_state_2:sight_mode
else if(!module_state_3)
module_state_3 = O
- O.layer = SCREEN_LAYER
+ O.hud_layerise()
contents += O
if(istype(module_state_3,/obj/item/borg/sight))
sight_mode |= module_state_3:sight_mode
diff --git a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm
index 850d27e5386..cd4ee8c8ae3 100644
--- a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm
+++ b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm
@@ -118,7 +118,7 @@
speed = -1
update_icon()
pass_flags = PASSTABLE | PASSMOB
- layer = ON_TURF_LAYER
+ layer = TURF_DETAIL_LAYER
density = FALSE
visible_message(SPAN_DANGER("\The [src] burrows into the ground!"))
diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm
index 1ec95d3feaa..421ce785e75 100644
--- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm
+++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm
@@ -110,7 +110,6 @@
min_n2 = 0
max_n2 = 0
minbodytemp = 0
- layer = 2.1
var/eating = 0
var/sated = 0
var/asleep = 0
@@ -406,7 +405,6 @@
icon_state = "sarlaccend"
anchored = 1
density = 0
- layer = 2.1
/obj/structure/greatworm/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm
index 1c60785f8be..4677f5d3564 100644
--- a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm
@@ -103,7 +103,7 @@
M.speed = -1
M.update_icon()
M.pass_flags = PASSTABLE | PASSMOB
- M.layer = BELOW_MOB_LAYER
+ M.layer = LYING_MOB_LAYER
addtimer(CALLBACK(src, PROC_REF(do_landing), M), 1 MINUTE)
return TRUE
else
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index a522e4ab751..6e3c88fb8bf 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -1,6 +1,6 @@
/mob
density = 1
- layer = 4.0
+ layer = MOB_LAYER
animate_movement = 2
movable_flags = MOVABLE_FLAG_PROXMOVE
sight = DEFAULT_SIGHT
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 87c29261dce..4c77046cf3b 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -30,7 +30,7 @@
var/obj/item/grab/linked_grab
var/wielded = FALSE
- layer = SCREEN_LAYER
+ layer = HUD_ABOVE_ITEM_LAYER
abstract = 1
item_state = "nothing"
w_class = ITEMSIZE_HUGE
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index 61589c97930..5f9a5ad6a24 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -227,7 +227,7 @@
desc = "Stairs leading to another floor. Not too useful if the gravity goes out."
icon = 'icons/obj/stairs.dmi'
icon_state = "stairs_3d"
- layer = TURF_LAYER
+ layer = RUNE_LAYER
density = FALSE
opacity = FALSE
anchored = TRUE
diff --git a/code/modules/overmap/exoplanets/decor/flora/crystal.dm b/code/modules/overmap/exoplanets/decor/flora/crystal.dm
index 88a72dc24e2..d5798da9c3e 100644
--- a/code/modules/overmap/exoplanets/decor/flora/crystal.dm
+++ b/code/modules/overmap/exoplanets/decor/flora/crystal.dm
@@ -18,7 +18,7 @@
icon = 'icons/obj/flora/crystal_trees.dmi'
icon_state = "spire"
pixel_x = -32
- layer = ABOVE_ALL_MOB_LAYER // this is basically a tree
+ layer = ABOVE_HUMAN_LAYER // this is basically a tree
/obj/structure/flora/rock/spire/Initialize(mapload)
. = ..()
diff --git a/code/modules/overmap/exoplanets/decor/flora/jungle.dm b/code/modules/overmap/exoplanets/decor/flora/jungle.dm
index 5e4879609af..0be162fdf55 100644
--- a/code/modules/overmap/exoplanets/decor/flora/jungle.dm
+++ b/code/modules/overmap/exoplanets/decor/flora/jungle.dm
@@ -35,7 +35,7 @@
icon_state = "bush"
pixel_x = -16
pixel_y = -16
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
/obj/structure/flora/bush/jungle/large/random/Initialize()
. = ..()
diff --git a/code/modules/overmap/exoplanets/decor/flora/konyang.dm b/code/modules/overmap/exoplanets/decor/flora/konyang.dm
index 44e53f33347..457af9080f9 100644
--- a/code/modules/overmap/exoplanets/decor/flora/konyang.dm
+++ b/code/modules/overmap/exoplanets/decor/flora/konyang.dm
@@ -11,7 +11,7 @@
/obj/effect/overlay/konyang_tree//shadow underlay
icon = 'icons/obj/flora/konyang/beet_tree.dmi'
icon_state = "shadow"
- layer = ON_TURF_LAYER
+ layer = TURF_SHADOW_LAYER
/obj/structure/flora/tree/konyang/spring/Initialize(mapload)
. = ..()
@@ -103,7 +103,7 @@
desc = "Thin and tall grass stalks, easy to sway to the wind and harsh to the touch."
icon = 'icons/obj/flora/konyang/grass.dmi'
icon_state = "stalks"
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
anchored = 1
/obj/structure/flora/bush/konyang_reeds/Initialize(mapload)
diff --git a/code/modules/overmap/exoplanets/decor/objs/monolith.dm b/code/modules/overmap/exoplanets/decor/objs/monolith.dm
index fe50b81fa05..7b0d5fa8b75 100644
--- a/code/modules/overmap/exoplanets/decor/objs/monolith.dm
+++ b/code/modules/overmap/exoplanets/decor/objs/monolith.dm
@@ -3,7 +3,7 @@
desc = "An obviously artifical structure of unknown origin."
icon = 'icons/obj/monolith.dmi'
icon_state = "jaggy1"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
density = TRUE
anchored = TRUE
var/active = FALSE
diff --git a/code/modules/overmap/exoplanets/decor/objs/pit.dm b/code/modules/overmap/exoplanets/decor/objs/pit.dm
index cd76f5b71e9..2a7ac5579df 100644
--- a/code/modules/overmap/exoplanets/decor/objs/pit.dm
+++ b/code/modules/overmap/exoplanets/decor/objs/pit.dm
@@ -145,7 +145,7 @@
/obj/structure/pit/closed/grave/Initialize()
var/obj/structure/closet/crate/coffin/C = new(src.loc)
var/obj/effect/decal/remains/human/bones = new(C)
- bones.layer = BELOW_MOB_LAYER
+ bones.layer = LYING_MOB_LAYER
var/obj/structure/gravemarker/random/R = new(src.loc)
R.generate()
. = ..()
diff --git a/code/modules/overmap/exoplanets/decor/turfs/snow.dm b/code/modules/overmap/exoplanets/decor/turfs/snow.dm
index 7adca62f17f..88e780362b7 100644
--- a/code/modules/overmap/exoplanets/decor/turfs/snow.dm
+++ b/code/modules/overmap/exoplanets/decor/turfs/snow.dm
@@ -3,7 +3,6 @@
icon = 'icons/turf/smooth/snow40.dmi'
icon_state = "snow"
dirt_color = "#e3e7e8"
- layer = LOWER_ON_TURF_LAYER
footstep_sound = /singleton/sound_category/snow_footstep
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
diff --git a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm
index 28ee8ad131a..e64dc2fd9c1 100644
--- a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm
+++ b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm
@@ -12,7 +12,7 @@
caliber = SHIP_CALIBER_ZTA
firing_effects = FIRING_EFFECT_FLAG_THROW_MOBS|FIRING_EFFECT_FLAG_EXTREMELY_LOUD
screenshake_type = SHIP_GUN_SCREENSHAKE_ALL_MOBS
- layer = ABOVE_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
use_power = POWER_USE_OFF //Start off.
idle_power_usage = 100 KILOWATTS
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 45f78158a2c..04efbd56a87 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -576,6 +576,6 @@
icon = 'icons/obj/machinery/sensors_venator.dmi'
deep_scan_range = 12
deep_scan_sensor_name = "Venator-Class Ultra-High Depth Sensors"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
pixel_x = -32
pixel_y = -32
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index ac0ff739e59..90b1308687a 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -16,7 +16,7 @@
w_class = ITEMSIZE_TINY
throw_range = 1
throw_speed = 1
- layer = 4
+ layer = ABOVE_OBJ_LAYER
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
attack_verb = list("bapped")
@@ -610,13 +610,13 @@
else if (h_user.l_store == src)
h_user.drop_from_inventory(src)
B.forceMove(h_user)
- B.layer = SCREEN_LAYER+0.01
+ B.hud_layerise()
h_user.l_store = B
h_user.update_inv_pockets()
else if (h_user.r_store == src)
h_user.drop_from_inventory(src)
B.forceMove(h_user)
- B.layer = SCREEN_LAYER+0.01
+ B.hud_layerise()
h_user.r_store = B
h_user.update_inv_pockets()
else if (h_user.head == src)
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 9ee9b4631db..93db85fde04 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -8,7 +8,7 @@
w_class = ITEMSIZE_SMALL
throw_range = 2
throw_speed = 1
- layer = 4
+ layer = ABOVE_OBJ_LAYER
attack_verb = list("bapped")
var/page = 1 // current page
var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents.
@@ -254,7 +254,7 @@
to_chat(usr, "You loosen the bundle.")
for(var/obj/O in src)
O.forceMove(usr.loc)
- O.layer = initial(O.layer)
+ O.reset_plane_and_layer()
O.add_fingerprint(usr)
qdel(src)
return
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index addedebdd68..4c4cda9cc75 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -9,7 +9,7 @@
w_class = ITEMSIZE_HUGE
throw_speed = 3
throw_range = 7
- layer = OBJ_LAYER - 0.1
+ layer = BELOW_OBJ_LAYER
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 50900d23dfd..7399988978c 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -32,7 +32,7 @@ By design, d1 is the smallest direction and d2 is the highest
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/d1 = 0
var/d2 = 1
- layer = CABLE_LAYER //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
+ layer = EXPOSED_WIRE_LAYER
color = COLOR_RED
var/obj/machinery/power/breakerbox/breaker_box
@@ -1063,7 +1063,7 @@ By design, d1 is the smallest direction and d2 is the highest
M.pixel_y = initial(M.pixel_y) + 8 //rise them up a bit
M.dir = SOUTH
else
- layer = initial(layer)
+ reset_plane_and_layer()
cut_overlay(over)
STOP_PROCESSING(SSprocessing, src)
pixel_x = initial(pixel_x)
diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm
index a4d374b8da1..1432c9a94b9 100644
--- a/code/modules/power/fusion/core/_core.dm
+++ b/code/modules/power/fusion/core/_core.dm
@@ -6,7 +6,7 @@
desc = "An enormous solenoid for generating extremely high power electromagnetic fields. It includes a kinetic energy harvester."
icon = 'icons/obj/machinery/fusion_core.dmi'
icon_state = "core0"
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
density = TRUE
use_power = POWER_USE_IDLE
idle_power_usage = 50
diff --git a/code/modules/power/lights/construction.dm b/code/modules/power/lights/construction.dm
index 1de81758975..afd45be4544 100644
--- a/code/modules/power/lights/construction.dm
+++ b/code/modules/power/lights/construction.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/machinery/light.dmi'
icon_state = "tube-construct-stage1"
anchored = TRUE
- layer = 5
+ layer = ABOVE_HUMAN_LAYER
var/stage = 1
var/fixture_type = "tube"
var/sheets_refunded = 2
@@ -196,7 +196,6 @@
icon = 'icons/obj/machinery/light.dmi'
icon_state = "bulb-construct-stage1"
anchored = TRUE
- layer = 5
stage = 1
fixture_type = "bulb"
sheets_refunded = 1
diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm
index e2250c1b611..d1f90ab13e7 100644
--- a/code/modules/power/lights/fixtures.dm
+++ b/code/modules/power/lights/fixtures.dm
@@ -12,7 +12,7 @@
desc = "A lighting fixture."
desc_info = "Use grab intent when interacting with a working light to take it out of its fixture."
anchored = TRUE
- layer = 5 // They were appearing under mobs which is a little weird - Ostaf
+ layer = ABOVE_HUMAN_LAYER
use_power = POWER_USE_ACTIVE
idle_power_usage = 2
active_power_usage = 20
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 16c560a8774..b8c133701f9 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -7,7 +7,7 @@
icon_state = "singularity_s1"
anchored = 1
density = 1
- layer = 6
+ layer = SINGULARITY_LAYER
light_power = -100 //eats all light
unacidable = 1 //Don't comment this out.
appearance_flags = NO_CLIENT_COLOR
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index daeaa7ddd31..cb996a2145a 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -8,10 +8,9 @@
icon_state = "term"
desc = "It's an underfloor wiring terminal for power equipment."
level = 1
- layer = TURF_LAYER
+ layer = EXPOSED_WIRE_TERMINAL_LAYER
var/obj/machinery/power/master = null
anchored = 1
- layer = 2.6 // a bit above wires
/obj/machinery/power/terminal/Initialize()
diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm
index 0c7669d170b..c17df2fa1bd 100644
--- a/code/modules/projectiles/targeting/targeting_overlay.dm
+++ b/code/modules/projectiles/targeting/targeting_overlay.dm
@@ -6,7 +6,7 @@
anchored = 1
density = 0
opacity = 0
- layer = FLY_LAYER
+ layer = ABOVE_HUMAN_LAYER
appearance_flags = NO_CLIENT_COLOR
simulated = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm
index 4a8c43248b8..8bac31cb5ee 100644
--- a/code/modules/random_map/automata/diona.dm
+++ b/code/modules/random_map/automata/diona.dm
@@ -12,7 +12,7 @@
anchored = TRUE
density = TRUE
opacity = FALSE
- layer = TURF_LAYER + 0.01
+ layer = ABOVE_TILE_LAYER
var/max_health = 50
var/health
var/destroy_spawntype = /mob/living/carbon/alien/diona
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index e058c2561d6..0884693f860 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -17,7 +17,7 @@
icon_state = "mixer0"
use_power = POWER_USE_IDLE
idle_power_usage = 20
- layer = 2.9
+ layer = BELOW_OBJ_LAYER
clicksound = /singleton/sound_category/button_sound
var/obj/item/reagent_containers/glass/beaker = null
@@ -328,7 +328,7 @@
name = "All-In-One Grinder"
icon = 'icons/obj/machinery/cooking_machines.dmi'
icon_state = "juicer1"
- layer = 2.99
+ layer = BELOW_OBJ_LAYER
density = 0
anchored = 0
use_power = POWER_USE_IDLE
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 5918ff3ac3d..2a85aa9ccad 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -7,7 +7,7 @@
icon_state = "conveyor0"
name = "conveyor belt"
desc = "A conveyor belt."
- layer = 2.4 // so they appear above pipes but under doors, objects etc
+ layer = BELOW_OBJ_LAYER
anchored = 1
var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off
var/operable = 1 // true if can operate (no broken segments in this belt run)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 4f26fbe68c4..afaf852b94d 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -786,7 +786,7 @@
var/dpdir = 0 // bitmask of pipe directions
dir = 0 // dir will contain dominant direction for junction pipes
var/health = 10 // health points 0-10
- layer = 2.3 // slightly lower than wires and other pipes
+ layer = DISPOSALS_PIPE_LAYER
var/sortType = ""
var/subtype = 0
// new pipe, set the icon_state as on map
diff --git a/code/modules/shieldgen/energy_field.dm b/code/modules/shieldgen/energy_field.dm
index 6459c3966ff..8275cb95277 100644
--- a/code/modules/shieldgen/energy_field.dm
+++ b/code/modules/shieldgen/energy_field.dm
@@ -9,7 +9,7 @@
alpha = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = 1
- layer = 4.1 //just above mobs
+ layer = ABOVE_HUMAN_LAYER
density = 0
var/strength = 0
var/ticks_recovering = 10
diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm
index 7f488541256..aa45f28bb27 100644
--- a/code/modules/shuttles/landmarks.dm
+++ b/code/modules/shuttles/landmarks.dm
@@ -7,7 +7,7 @@
unacidable = TRUE
simulated = 0
invisibility = 101
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
pixel_x = -32
pixel_y = -32
diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm
index eb800d1c878..22e8ef033d2 100644
--- a/code/modules/supermatter/supermatter.dm
+++ b/code/modules/supermatter/supermatter.dm
@@ -56,7 +56,7 @@
anchored = FALSE
light_range = 4
light_power = 1
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
var/gasefficency = 0.25
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index d823f2a7e77..9ad2cd9ca36 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -6,7 +6,7 @@
density = 1
anchored = 1
climbable = TRUE
- layer = LAYER_TABLE
+ layer = TABLE_LAYER
throwpass = 1
breakable = TRUE
var/flipped = 0
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index affcbbe47c6..f7be4e7f71f 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -316,7 +316,7 @@ GLOBAL_LIST_EMPTY(gps_list)
desc = "A static global positioning system."
anchored = TRUE
unacidable = TRUE
- layer = 2.1
+ layer = BASE_ABOVE_OBJ_LAYER
gpstag = "STAT0"
/obj/item/device/gps/stationary/Initialize()
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 565cd4c0785..17354064123 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -352,7 +352,7 @@
var/mutable_appearance/MA = new(C)
MA.pixel_x += load_offset_x
MA.pixel_y += load_offset_y
- MA.layer = FLOAT_LAYER
+ MA.layer = VEHICLE_LOAD_LAYER
add_overlay(MA)
diff --git a/code/modules/vehicles/droppod.dm b/code/modules/vehicles/droppod.dm
index c8450272326..a28f290636e 100644
--- a/code/modules/vehicles/droppod.dm
+++ b/code/modules/vehicles/droppod.dm
@@ -8,7 +8,6 @@
icon = 'icons/obj/vehicles.dmi'
icon_state = "droppod"
dir = SOUTH
- layer = MOB_LAYER - 0.1
light_range = 0
load_item_visible = 0
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 5cb802f97cb..8e989091076 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -7,7 +7,7 @@
/obj/vehicle
name = "vehicle"
icon = 'icons/obj/vehicles.dmi'
- layer = MOB_LAYER + 0.1 //so it sits above objects including mobs
+ layer = MECH_BASE_LAYER
density = 1
anchored = 1
animate_movement=1
@@ -315,7 +315,7 @@
load = C
- C.layer = src.layer + 0.1
+ C.layer = VEHICLE_LOAD_LAYER
if(load_item_visible)
C.pixel_x += load_offset_x
if(ismob(C))
diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm
index 7f96ef520fa..18e7654b81f 100644
--- a/code/modules/ventcrawl/ventcrawl.dm
+++ b/code/modules/ventcrawl/ventcrawl.dm
@@ -130,7 +130,7 @@ var/global/list/can_enter_vent_with = list(
else
return
-/mob/living/var/ventcrawl_layer = 3
+/mob/living/var/ventcrawl_layer = OBJ_LAYER
/mob/living/proc/handle_ventcrawl(var/atom/clicked_on)
@@ -228,12 +228,12 @@ var/global/list/can_enter_vent_with = list(
for(var/datum/pipeline/pipeline in network.line_members)
for(var/obj/machinery/atmospherics/A in (pipeline.members || pipeline.edges)) // Adds pipe and manifold images
if(!A.pipe_image)
- A.pipe_image = image(A, A.loc, layer = SCREEN_LAYER+0.01, dir = A.dir)
+ A.pipe_image = image(A, A.loc, layer = ABOVE_LIGHTING_LAYER, dir = A.dir)
pipes_shown += A.pipe_image
client.images += A.pipe_image
for (var/obj/machinery/atmospherics/V in network.normal_members) // Adds vent and scrubber images
if (!V.pipe_image || istype(V, /obj/machinery/atmospherics/unary/vent_pump/))
- V.pipe_image = image(V, V.loc, layer = SCREEN_LAYER+0.01, dir = V.dir)
+ V.pipe_image = image(V, V.loc, layer = ABOVE_LIGHTING_LAYER, dir = V.dir)
pipes_shown += V.pipe_image
client.images += V.pipe_image
diff --git a/code/modules/weather/_weather.dm b/code/modules/weather/_weather.dm
index 098e7a0a2cc..e9432b108af 100644
--- a/code/modules/weather/_weather.dm
+++ b/code/modules/weather/_weather.dm
@@ -23,8 +23,8 @@
*/
/obj/abstract/weather_system
- plane = PLANE_DEFAULT
- layer = ABOVE_ALL_MOB_LAYER
+ plane = DEFAULT_PLANE
+ layer = ABOVE_PROJECTILE_LAYER
icon = 'icons/effects/weather.dmi'
icon_state = "blank"
invisibility = 0
@@ -91,8 +91,8 @@
// Dummy object for lightning flash animation.
/obj/abstract/lightning_overlay
- plane = PLANE_DEFAULT + 1
- layer = EFFECTS_ABOVE_LIGHTING_LAYER
+ plane = DEFAULT_PLANE + 1 //Future EMISSIVE_PLANE
+ layer = ABOVE_LIGHTING_LAYER
icon = 'icons/effects/weather.dmi'
icon_state = "full"
alpha = 0
diff --git a/code/modules/xgm/xgm_gas_data.dm b/code/modules/xgm/xgm_gas_data.dm
index eb8aa6d84bb..14e06cbcbf5 100644
--- a/code/modules/xgm/xgm_gas_data.dm
+++ b/code/modules/xgm/xgm_gas_data.dm
@@ -60,7 +60,7 @@
desc = DESC_PARENT
icon = 'icons/effects/tile_effects.dmi'
icon_state = "generic"
- layer = LIGHTING_LAYER - 1
+ layer = FIRE_LAYER
appearance_flags = RESET_COLOR
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/html/changelogs/GeneralCamo - Relayering.yml b/html/changelogs/GeneralCamo - Relayering.yml
new file mode 100644
index 00000000000..03aa97e0d93
--- /dev/null
+++ b/html/changelogs/GeneralCamo - Relayering.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: GeneralCamo
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - refactor: "Changed the layers of every object in the game, and added a long list of defines, for eventual movement into render planes."
\ No newline at end of file
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 841a35e2306..ddcf33a5406 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -32,7 +32,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/obj/structure/closet/crate/loot{
@@ -204,12 +203,10 @@
"aat" = (
/obj/structure/bed/stool/chair/shuttle,
/obj/machinery/recharger/wallcharger{
- layer = 3;
pixel_x = 4;
pixel_y = 28
},
/obj/machinery/recharger/wallcharger{
- layer = 3;
pixel_x = 4;
pixel_y = 19
},
@@ -323,7 +320,6 @@
/obj/machinery/button/remote/blast_door{
dir = 1;
id = "burglar_blast";
- layer = 3;
name = "blast door";
pixel_y = -21;
req_access = list(150)
@@ -397,12 +393,10 @@
/area/antag/wizard)
"aaJ" = (
/obj/item/gun/energy/pistol{
- layer = 2.99;
pixel_x = 2;
pixel_y = 3
},
/obj/item/gun/energy/pistol{
- layer = 2.99;
pixel_x = 2;
pixel_y = 3
},
@@ -4042,7 +4036,6 @@
/area/centcom/holding)
"avo" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/effect/floor_decal/spline/plain/black,
@@ -4186,7 +4179,6 @@
"ayM" = (
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/machinery/door/airlock/centcom{
icon = 'icons/obj/doors/Doorglass.dmi';
@@ -4377,7 +4369,6 @@
"aCs" = (
/obj/structure/bed/stool/chair/shuttle,
/obj/machinery/vending/wallmed1{
- layer = 3.3;
name = "Emergency NanoMed";
pixel_x = -12;
pixel_y = 28;
@@ -6531,7 +6522,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor{
@@ -7014,7 +7004,6 @@
dir = 8
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/structure/bed/stool/chair/shuttle{
@@ -7027,7 +7016,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/structure/bed/stool/chair/shuttle{
@@ -7752,7 +7740,6 @@
desc = "A secure supply crate, It carries the insignia of the Tau Ceti Foreign Legion. It appears quite scuffed.";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.01;
name = "foreign legion supply crate";
pixel_x = 3;
pixel_y = 8
@@ -7761,14 +7748,12 @@
desc = "A secure supply crate, It carries the insignia of the Tau Ceti Foreign Legion. It appears quite scuffed.";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "foreign legion supply crate"
},
/obj/effect/decal/fake_object{
desc = "A secure supply crate, It carries the insignia of the Tau Ceti Foreign Legion. It appears quite scuffed.";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "foreign legion supply crate";
pixel_x = 2;
pixel_y = 19
@@ -8033,7 +8018,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor,
@@ -8065,7 +8049,6 @@
/obj/machinery/light/small,
/obj/structure/toilet{
dir = 4;
- layer = 2.6;
pixel_y = 1
},
/turf/simulated/floor/tiled/freezer,
@@ -8114,7 +8097,6 @@
desc = "A crate of military supplies.";
icon = 'icons/obj/crate.dmi';
icon_state = "dropcrate";
- layer = 3.02;
name = "metal crate";
pixel_x = 1;
pixel_y = 4
@@ -8135,7 +8117,6 @@
"bsS" = (
/obj/structure/table/standard,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/unsimulated/floor{
@@ -8373,12 +8354,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -8989,7 +8968,6 @@
"bXx" = (
/obj/structure/table/reinforced/wood,
/obj/machinery/chemical_dispenser/coffee/full{
- layer = 3.1;
pixel_y = 2;
spawn_cartridges = list(/obj/item/reagent_containers/chem_disp_cartridge/coffee,/obj/item/reagent_containers/chem_disp_cartridge/milk,/obj/item/reagent_containers/chem_disp_cartridge/cream,/obj/item/reagent_containers/chem_disp_cartridge/sugar)
},
@@ -9071,13 +9049,11 @@
/area/antag/ninja)
"cbz" = (
/obj/item/storage/bag/money{
- layer = 2.99;
pixel_x = -11;
pixel_y = 5
},
/obj/item/storage/bag/money,
/obj/item/spacecash/c1{
- layer = 2.99;
pixel_x = -9;
pixel_y = -13
},
@@ -10079,7 +10055,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/structure/table/reinforced,
@@ -10197,7 +10172,6 @@
desc = "A dusty, stuffed parrot. It's firmly nailed to the table.";
icon = 'icons/mob/npc/pets.dmi';
icon_state = "parrot_sit";
- layer = 3.4;
name = "Hootie";
pixel_x = 9;
pixel_y = 1
@@ -10570,7 +10544,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter1";
- layer = 2.4;
name = "shutter";
opacity = 1
},
@@ -10580,7 +10553,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/door/blast/odin/open{
_wifi_id = "tcfl_droppod_3";
- layer = 2.8;
name = "Droppod C"
},
/turf/unsimulated/floor{
@@ -10632,10 +10604,8 @@
tag_door = "arrival_shuttle_hatch"
},
/obj/structure/flora/ausbushes/sparsegrass{
- layer = 2.97
},
/obj/structure/flora/ausbushes/fullgrass{
- layer = 2.97
},
/obj/structure/flora/pottedplant{
icon_state = "plant-01";
@@ -10685,7 +10655,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/door/blast/odin/open{
_wifi_id = "tcfl_droppod_4";
- layer = 2.8;
name = "Droppod D"
},
/turf/unsimulated/floor{
@@ -10864,7 +10833,6 @@
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/pipe/tank/air{
dir = 8;
- layer = 3.5
},
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
@@ -11000,7 +10968,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor{
@@ -11056,7 +11023,6 @@
/area/shuttle/escape)
"dmM" = (
/obj/structure/sink/kitchen{
- layer = 3.5;
name = "sink";
pixel_y = 23
},
@@ -11390,7 +11356,6 @@
"dBX" = (
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_4";
- layer = 2.8;
name = "Pod D"
},
/obj/effect/floor_decal/industrial/loading/yellow,
@@ -11432,7 +11397,6 @@
/obj/item/rfd_ammo,
/obj/item/rfd_ammo,
/obj/item/rfd/construction{
- layer = 3.01
},
/turf/unsimulated/floor{
icon_state = "tiled_preview"
@@ -11539,7 +11503,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK"
},
/turf/unsimulated/wall/darkshuttlewall,
@@ -11955,7 +11918,6 @@
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "centcom_shuttle";
- layer = 3.3;
pixel_x = 6;
pixel_y = 27;
tag_door = "centcom_shuttle_hatch"
@@ -12078,7 +12040,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/item/storage/firstaid/toxin{
@@ -12086,7 +12047,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/structure/sign/nosmoking_1{
pixel_y = 30
@@ -12173,12 +12133,10 @@
pixel_y = -1
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 2.99;
pixel_x = -9;
pixel_y = -1
},
/obj/item/storage/box/fancy/cookiesnack{
- layer = 2.98;
pixel_x = -1;
pixel_y = 4
},
@@ -12385,7 +12343,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/structure/window/reinforced/crescent{
@@ -12537,7 +12494,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor/plating,
@@ -12588,7 +12544,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -12621,7 +12576,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor{
@@ -12913,7 +12867,6 @@
pixel_x = 6
},
/obj/item/storage/box/syndie_kit/clerical{
- layer = 2.99;
pixel_x = 1;
pixel_y = 7
},
@@ -12975,7 +12928,6 @@
/area/shuttle/skipjack)
"eBh" = (
/obj/structure/sink/kitchen{
- layer = 3.5;
pixel_y = 27
},
/turf/unsimulated/floor{
@@ -14033,7 +13985,6 @@
},
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_5";
- layer = 2.8;
name = "Pod E"
},
/turf/unsimulated/floor{
@@ -14118,7 +14069,6 @@
dir = 8;
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/obj/effect/floor_decal/corner/red{
@@ -14199,7 +14149,6 @@
"fqq" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/plain/black{
@@ -14273,7 +14222,6 @@
/area/antag/mercenary)
"fso" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/table/glass{
@@ -14388,7 +14336,6 @@
icon_state = "tube_empty"
},
/obj/item/storage/firstaid/toxin{
- layer = 3.1;
pixel_x = 1;
pixel_y = 1
},
@@ -14804,22 +14751,18 @@
pixel_y = 11
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
- layer = 3.01;
pixel_x = 6;
pixel_y = 8
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
- layer = 3.01;
pixel_x = 14;
pixel_y = 8
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
- layer = 3.01;
pixel_x = 22;
pixel_y = 8
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
- layer = 3.01;
pixel_x = 30;
pixel_y = 8
},
@@ -14856,7 +14799,6 @@
/obj/structure/table/standard,
/obj/machinery/light{
dir = 1;
- layer = 2.9;
name = "adjusted light fixture";
icon_state = "tube_empty"
},
@@ -14925,12 +14867,10 @@
pixel_y = 9
},
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9;
pixel_y = -14
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -15011,7 +14951,6 @@
/area/shuttle/arrival)
"fQc" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/bed/stool/chair/padded/blue{
@@ -15180,7 +15119,6 @@
/area/centcom/legion)
"fTt" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/bed/stool/chair/padded/blue{
@@ -15464,14 +15402,12 @@
"gbM" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/wood,
/area/merchant_station)
"gcj" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/item/flame/lighter/zippo/gold{
@@ -15681,11 +15617,9 @@
pixel_y = -1
},
/obj/item/gun/projectile/automatic/wt550/lethal{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/automatic/wt550/lethal{
- layer = 2.99;
pixel_y = 6
},
/obj/structure/table/reinforced/steel,
@@ -15803,7 +15737,6 @@
desc = "A nondescript coat.";
icon = 'icons/obj/coatrack.dmi';
icon_state = "coat_lilith_coat";
- layer = 3.01;
name = "coat";
pixel_x = 8
},
@@ -15837,7 +15770,6 @@
desc = "This one looks particularly heavy.";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "legion supply crate";
pixel_x = 1;
pixel_y = 3
@@ -15935,7 +15867,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.01;
name = "inconveniently placed crate";
pixel_x = 3;
pixel_y = 8
@@ -15944,7 +15875,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "inconveniently placed crate";
pixel_x = 2;
pixel_y = 19
@@ -15953,7 +15883,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "inconveniently placed crate";
pixel_x = 1
},
@@ -15961,7 +15890,6 @@
/area/centcom/legion)
"gpo" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/machinery/light{
@@ -16122,7 +16050,6 @@
},
/obj/machinery/door/blast/odin/open{
_wifi_id = "loner_droppod_1";
- layer = 2.8;
name = "Pod L"
},
/turf/unsimulated/floor{
@@ -16136,7 +16063,6 @@
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "centcom_dock";
- layer = 3.5;
name = "docking port controller";
pixel_x = 25;
req_one_access = list(13);
@@ -16299,7 +16225,6 @@
},
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_7";
- layer = 2.8;
name = "Pod G"
},
/turf/unsimulated/floor{
@@ -16524,7 +16449,6 @@
pixel_y = 6
},
/obj/item/gun/projectile/pistol{
- layer = 3.01;
pixel_x = 2;
pixel_y = 2
},
@@ -16533,7 +16457,6 @@
"gGx" = (
/obj/structure/bed/stool/chair/office/bridge/pilot,
/obj/structure/extinguisher_cabinet/north{
- layer = 3
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/distress)
@@ -16962,15 +16885,12 @@
pixel_y = -5
},
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = -10
},
/obj/item/storage/firstaid/fire{
- layer = 2.99;
pixel_x = 4
},
/obj/item/storage/firstaid/toxin{
- layer = 2.98;
pixel_x = 5;
pixel_y = 5
},
@@ -17252,7 +17172,6 @@
"gYQ" = (
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/effect/decal/fake_object{
density = 1;
@@ -17277,7 +17196,6 @@
"gYV" = (
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/effect/decal/fake_object{
density = 1;
@@ -17658,7 +17576,6 @@
"hmF" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/snacks/blt{
- layer = 2.99;
pixel_x = 4;
pixel_y = 14
},
@@ -17950,7 +17867,6 @@
"hyy" = (
/obj/structure/table/reinforced/wood,
/obj/machinery/chemical_dispenser/coffee/full{
- layer = 3.1;
pixel_y = 2;
spawn_cartridges = list(/obj/item/reagent_containers/chem_disp_cartridge/coffee,/obj/item/reagent_containers/chem_disp_cartridge/milk,/obj/item/reagent_containers/chem_disp_cartridge/cream,/obj/item/reagent_containers/chem_disp_cartridge/sugar)
},
@@ -18237,7 +18153,6 @@
"hMb" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp/green{
- layer = 4.1;
pixel_y = 4
},
/turf/simulated/floor/carpet,
@@ -18469,7 +18384,6 @@
pixel_y = -11
},
/obj/item/reagent_containers/hypospray/cmo{
- layer = 2.99;
pixel_x = -2;
pixel_y = -3
},
@@ -18706,7 +18620,6 @@
/area/antag/raider)
"ibx" = (
/obj/structure/plasticflaps{
- layer = 2.6;
opacity = 1
},
/obj/effect/floor_decal/industrial/warning{
@@ -19460,7 +19373,6 @@
dir = 1;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.7;
name = "conveyor belt";
pixel_x = 1
},
@@ -19718,12 +19630,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -19770,7 +19680,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/turf/unsimulated/floor{
@@ -19817,7 +19726,6 @@
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/toilet{
dir = 1;
- layer = 4.1
},
/obj/machinery/light/small{
dir = 8;
@@ -19910,7 +19818,6 @@
"iMq" = (
/obj/structure/railing/mapped,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner_wide/paleblue/diagonal{
dir = 8
@@ -20065,7 +19972,6 @@
desc = "A heavy armored vehicle. Commonly produced by the Sol Alliance and fielded by the forces of the Tau Ceti Foreign Legion. This one has suffered too much damage to be operational.";
icon = 'icons/mecha/mecha_114x59.dmi';
icon_state = "jotun-broken";
- layer = 3.3;
name = "Jotun";
pixel_x = -42;
pixel_y = -10
@@ -20074,7 +19980,6 @@
/area/centcom/legion/hangar5)
"iQG" = (
/obj/structure/sink/kitchen{
- layer = 3.5;
pixel_y = 28
},
/turf/unsimulated/floor{
@@ -20087,17 +19992,14 @@
},
/obj/structure/table/rack,
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
@@ -20150,7 +20052,6 @@
"iRX" = (
/obj/structure/table/rack,
/obj/item/storage/box/smokebombs{
- layer = 2.99;
pixel_x = 6;
pixel_y = 6
},
@@ -20598,7 +20499,6 @@
icon_state = "tube_empty"
},
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/effect/decal/fake_object{
@@ -20622,7 +20522,6 @@
name = "pipe"
},
/obj/structure/lattice/catwalk/indoor{
- layer = 3.5
},
/turf/unsimulated/floor/plating,
/area/centcom/checkpoint/fore)
@@ -20920,7 +20819,6 @@
dir = 1
},
/obj/item/device/flashlight/lamp/green{
- layer = 4.1;
pixel_x = -2;
pixel_y = 6
},
@@ -20977,7 +20875,6 @@
desc = "It's used to monitor rooms.";
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/unsimulated/floor{
@@ -21203,7 +21100,6 @@
pixel_x = 5
},
/obj/item/storage/firstaid/o2{
- layer = 2.8;
pixel_x = 4;
pixel_y = 6
},
@@ -21211,7 +21107,6 @@
/obj/item/storage/box/gloves,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/fire{
- layer = 2.9;
pixel_x = 2;
pixel_y = 3
},
@@ -21298,7 +21193,6 @@
dir = 1;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.7;
name = "conveyor belt";
pixel_x = 1
},
@@ -21717,7 +21611,6 @@
},
/obj/structure/table/reinforced/steel,
/obj/structure/closet/crate/freezer/rations{
- layer = 2.79;
pixel_y = -4;
tablestatus = -1
},
@@ -21877,7 +21770,6 @@
pixel_y = 8
},
/obj/item/storage/belt/utility/very_full{
- layer = 2.99;
pixel_y = 13
},
/obj/item/clothing/glasses/welding/superior{
@@ -22092,7 +21984,6 @@
color = "#545c68";
icon = 'icons/obj/railing.dmi';
icon_state = "mcorneroverlay1";
- layer = 4.1;
name = "railing"
},
/obj/effect/floor_decal/corner/paleblue/full,
@@ -22539,7 +22430,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -22601,7 +22491,6 @@
"kFK" = (
/obj/machinery/computer/security/telescreen{
desc = "Connects to a station's emergency camera networks after the station sends out a distress signal.";
- layer = 4;
name = "Emergency Dock Uplink";
network = list("Emergency Dock","TCFL");
pixel_y = 28
@@ -22676,7 +22565,6 @@
/area/centcom/holding)
"kIY" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/machinery/light{
@@ -22863,7 +22751,6 @@
/area/centcom/bar)
"kOI" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -23079,11 +22966,9 @@
"kWc" = (
/obj/structure/table/rack,
/obj/item/gun/energy/gun{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/gun{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/gun,
@@ -23119,7 +23004,6 @@
"kWN" = (
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_3";
- layer = 2.8;
name = "Pod C"
},
/obj/effect/floor_decal/industrial/loading/yellow,
@@ -23218,7 +23102,6 @@
dir = 10
},
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/turf/unsimulated/floor{
@@ -23290,7 +23173,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/structure/window/reinforced/crescent{
@@ -23316,7 +23198,6 @@
pixel_y = 7
},
/obj/item/gun/custom_ka/frame01/illegal{
- layer = 3.01;
pixel_y = -1
},
/obj/item/device/flash{
@@ -23433,7 +23314,6 @@
dir = 6;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.7;
name = "conveyor belt";
pixel_x = 1
},
@@ -23564,7 +23444,6 @@
/area/antag/mercenary)
"lnh" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/railing/mapped{
@@ -23599,7 +23478,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/structure/table/reinforced,
@@ -24281,7 +24159,6 @@
desc = "It's used to monitor rooms.";
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/unsimulated/floor{
@@ -24343,7 +24220,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor,
@@ -24531,7 +24407,6 @@
"lSi" = (
/obj/structure/table/rack,
/obj/item/gun/energy/rifle/ionrifle{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/rifle/ionrifle{
@@ -24679,7 +24554,6 @@
dir = 8
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/effect/floor_decal/spline/plain/black,
@@ -24798,7 +24672,6 @@
icon_state = "tube_empty"
},
/obj/machinery/vending/wallmed1{
- layer = 3.3;
name = "Emergency NanoMed";
pixel_x = -28;
req_access = null
@@ -24812,11 +24685,9 @@
"maM" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/automatic/c20r{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/automatic/c20r{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/automatic/c20r,
@@ -25019,7 +24890,6 @@
},
/obj/structure/table/reinforced/steel,
/obj/item/storage/firstaid/o2{
- layer = 2.8;
pixel_x = 4;
pixel_y = 6
},
@@ -25272,14 +25142,12 @@
density = 1;
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutterhalf";
- layer = 2.4;
name = "shutter"
},
/obj/effect/decal/fake_object{
density = 1;
icon = 'icons/obj/item/inflatables.dmi';
icon_state = "wall";
- layer = 2.3;
name = "inflatable wall"
},
/turf/unsimulated/floor{
@@ -25335,7 +25203,6 @@
"mrd" = (
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_1";
- layer = 2.8;
name = "Pod A"
},
/obj/effect/floor_decal/industrial/loading/yellow{
@@ -25376,7 +25243,6 @@
/area/antag/raider)
"mrG" = (
/obj/item/gun/projectile/automatic/rifle/z8{
- layer = 2.99;
pixel_y = 10
},
/obj/item/gun/projectile/automatic/rifle/z8{
@@ -25589,7 +25455,6 @@
"mxm" = (
/obj/structure/toilet{
dir = 4;
- layer = 2.6;
pixel_y = 1
},
/turf/unsimulated/floor{
@@ -25629,7 +25494,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/door/blast/odin/open{
_wifi_id = "tcfl_droppod_1";
- layer = 2.8;
name = "Droppod A"
},
/turf/unsimulated/floor{
@@ -25655,7 +25519,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/door/blast/odin/open{
_wifi_id = "tcfl_droppod_2";
- layer = 2.8;
name = "Droppod B"
},
/turf/unsimulated/floor{
@@ -26068,7 +25931,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/obj/machinery/light{
@@ -26082,11 +25944,9 @@
"mPL" = (
/obj/structure/table/rack,
/obj/item/storage/briefcase/aluminium{
- layer = 2.99;
pixel_y = 6
},
/obj/item/storage/briefcase/aluminium{
- layer = 2.99;
pixel_y = 6
},
/obj/item/storage/lockbox/cciaa/bssb{
@@ -26161,11 +26021,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/machinery/light{
@@ -26173,7 +26031,6 @@
icon_state = "tube_empty"
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/simulated/floor/tiled/dark,
@@ -26333,7 +26190,6 @@
"mYG" = (
/obj/structure/table/reinforced/wood,
/obj/machinery/chemical_dispenser/coffee/full{
- layer = 3.1;
pixel_y = 2;
spawn_cartridges = list(/obj/item/reagent_containers/chem_disp_cartridge/coffee,/obj/item/reagent_containers/chem_disp_cartridge/milk,/obj/item/reagent_containers/chem_disp_cartridge/cream,/obj/item/reagent_containers/chem_disp_cartridge/sugar)
},
@@ -26361,7 +26217,6 @@
pixel_y = 7
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/item/flame/lighter,
@@ -26667,7 +26522,6 @@
desc = "It controls the shuttle shutter.";
dir = 1;
id = "merchant_airlock";
- layer = 3;
name = "airlock shutter controller";
pixel_x = -3;
pixel_y = -21;
@@ -26682,7 +26536,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "merchant_shuttle_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
req_access = list(110);
@@ -26736,7 +26589,6 @@
name = "pipe"
},
/obj/structure/lattice/catwalk/indoor{
- layer = 3.5
},
/turf/unsimulated/floor/plating,
/area/centcom/checkpoint/aft)
@@ -26774,7 +26626,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "merchant_shuttle_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
req_access = list(110);
@@ -27001,7 +26852,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/turf/simulated/floor/shuttle/dark_blue,
@@ -27344,7 +27194,6 @@
dir = 8;
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera";
pixel_y = -18
},
@@ -27378,7 +27227,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/mercenary)
@@ -27419,11 +27267,9 @@
"nES" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/pistol{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/pistol{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/pistol,
@@ -27679,7 +27525,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/item/reagent_containers/glass/rag{
@@ -27726,7 +27571,6 @@
},
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/effect/floor_decal/corner/paleblue{
@@ -28595,14 +28439,12 @@
"opB" = (
/obj/machinery/vending/cola{
density = 0;
- layer = 2.99;
name = "Free Robust Softdrinks";
pixel_x = -7;
pixel_y = 20;
prices = list()
},
/obj/structure/sign/poster{
- layer = 2.98;
pixel_y = 32
},
/turf/unsimulated/floor{
@@ -28629,7 +28471,6 @@
},
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_6";
- layer = 2.8;
name = "Pod F"
},
/turf/unsimulated/floor{
@@ -28916,7 +28757,6 @@
/obj/effect/floor_decal/industrial/warning,
/obj/structure/table/rack,
/obj/item/gun/energy/rifle/ionrifle{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/rifle/ionrifle{
@@ -29165,7 +29005,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor/plating,
@@ -29181,7 +29020,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor/plating,
@@ -29252,7 +29090,6 @@
icon_state = "tube_empty"
},
/obj/structure/railing/mapped{
- layer = 6;
name = "adjusted railing"
},
/obj/structure/table/steel,
@@ -29447,7 +29284,6 @@
},
/obj/structure/railing/mapped{
dir = 4;
- layer = 6;
name = "adjusted railing"
},
/obj/effect/floor_decal/spline/plain/black{
@@ -29780,7 +29616,6 @@
"pmg" = (
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_2";
- layer = 2.8;
name = "Pod B"
},
/obj/effect/floor_decal/industrial/loading/yellow{
@@ -29930,17 +29765,14 @@
"psh" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/snacks/sushi_serve{
- layer = 3.5;
pixel_x = -6;
pixel_y = 4
},
/obj/item/reagent_containers/food/snacks/sushi_serve{
- layer = 3.6;
pixel_x = 3;
pixel_y = 2
},
/obj/item/reagent_containers/food/snacks/breakfast_wrap{
- layer = 2.99;
pixel_x = 29;
pixel_y = 8
},
@@ -30192,7 +30024,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/turf/simulated/floor/tiled/dark,
/area/centcom/bar)
@@ -30294,7 +30125,6 @@
/obj/structure/flora/rock/pile{
density = 0;
icon_state = "basalt2";
- layer = 3;
pixel_x = -8;
pixel_y = 16
},
@@ -30338,7 +30168,6 @@
dir = 1
},
/obj/structure/railing/mapped{
- layer = 6;
name = "adjusted railing"
},
/obj/effect/floor_decal/spline/plain/black,
@@ -30365,11 +30194,9 @@
},
/obj/structure/railing/mapped{
dir = 4;
- layer = 6;
name = "adjusted railing"
},
/obj/structure/railing/mapped{
- layer = 6;
name = "adjusted railing"
},
/obj/effect/floor_decal/spline/plain/black{
@@ -30750,7 +30577,6 @@
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1332;
id_tag = "pirate_hideout";
- layer = 3.5;
pixel_x = 28;
pixel_y = -28;
tag_door = "pirate_hideout_door"
@@ -31141,7 +30967,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/turf/unsimulated/floor,
@@ -31292,7 +31117,6 @@
dir = 8
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/turf/simulated/floor/shuttle/dark_blue,
@@ -31899,7 +31723,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/turf/unsimulated/floor{
@@ -31908,7 +31731,6 @@
/area/antag/mercenary)
"qHR" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/flora/pottedplant{
@@ -32130,7 +31952,6 @@
desc = "A fizzing drink that looks like a really great time.";
icon = 'icons/obj/drinks.dmi';
icon_state = "rixulin_sundae";
- layer = 3.1;
name = "Rixulin Sundae";
pixel_x = -6;
pixel_y = 7
@@ -32328,7 +32149,6 @@
"qXO" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/automatic/rifle/sts35{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/projectile/automatic/rifle/sts35{
@@ -32448,7 +32268,6 @@
pixel_y = 2
},
/obj/structure/closet/walllocker/emerglocker/north{
- layer = 3;
pixel_x = -1;
pixel_y = 29
},
@@ -33095,12 +32914,10 @@
/area/centcom/spawning)
"rDZ" = (
/obj/machinery/recharger/wallcharger{
- layer = 3.3;
pixel_x = -1;
pixel_y = 25
},
/obj/machinery/vending/wallmed1{
- layer = 3.3;
name = "Emergency NanoMed";
pixel_x = -28;
req_access = null
@@ -33267,17 +33084,14 @@
/area/centcom/legion/hangar5)
"rKH" = (
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 2.99;
pixel_x = -6;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 2.99;
pixel_x = 1;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 2.99;
pixel_x = 8;
pixel_y = 10
},
@@ -33453,17 +33267,14 @@
"rRr" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/snacks/taco{
- layer = 2.98;
pixel_x = -4;
pixel_y = 7
},
/obj/item/reagent_containers/food/snacks/taco{
- layer = 2.99;
pixel_x = -4;
pixel_y = 2
},
/obj/item/reagent_containers/food/snacks/burger/nt_muffin{
- layer = 2.99;
pixel_x = 13;
pixel_y = 8
},
@@ -33768,7 +33579,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/turf/unsimulated/floor/plating,
@@ -33868,7 +33678,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/obj/machinery/door/airlock/external{
@@ -33883,7 +33692,6 @@
/area/antag/raider)
"sio" = (
/obj/item/gun/energy/rifle{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/rifle{
@@ -34048,15 +33856,12 @@
"snL" = (
/obj/structure/table/rack,
/obj/item/ammo_magazine/c762{
- layer = 2.99;
pixel_x = 5
},
/obj/item/ammo_magazine/c762{
- layer = 2.99;
pixel_x = 5
},
/obj/item/ammo_magazine/c762{
- layer = 2.99;
pixel_x = 5
},
/obj/item/ammo_magazine/c762{
@@ -34249,7 +34054,6 @@
dir = 8;
icon = 'icons/obj/furniture.dmi';
icon_state = "chair_armrest";
- layer = 5;
name = "leather chair"
},
/turf/simulated/floor/carpet,
@@ -34347,7 +34151,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/effect/floor_decal/spline/plain/black,
@@ -35132,7 +34935,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/turf/unsimulated/floor/plating,
@@ -35143,7 +34945,6 @@
},
/obj/machinery/door/blast/odin/open{
_wifi_id = "merc_droppod_8";
- layer = 2.8;
name = "Pod G"
},
/turf/unsimulated/floor{
@@ -35195,7 +34996,6 @@
dir = 1
},
/obj/item/reagent_containers/food/drinks/bottle/brandy{
- layer = 3.1;
pixel_x = 10;
pixel_y = -1
},
@@ -35298,7 +35098,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/obj/machinery/light{
@@ -35690,7 +35489,6 @@
/area/antag/mercenary)
"twH" = (
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3;
pixel_y = 1
},
/obj/structure/bed/stool/chair/shuttle{
@@ -35820,14 +35618,12 @@
"tBi" = (
/obj/machinery/vending/snack{
density = 0;
- layer = 2.99;
name = "Free Chocolate Corp";
pixel_x = -14;
pixel_y = 20;
prices = list()
},
/obj/structure/sign/poster{
- layer = 2.98;
pixel_y = 32
},
/turf/unsimulated/floor{
@@ -36098,7 +35894,6 @@
dir = 1;
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/turf/unsimulated/floor,
@@ -36126,12 +35921,10 @@
},
/obj/structure/table/rack,
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = 2;
pixel_y = 5
},
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = 2;
pixel_y = 5
},
@@ -36335,7 +36128,6 @@
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/toilet{
dir = 1;
- layer = 4.1
},
/obj/machinery/light/small{
dir = 8;
@@ -36393,7 +36185,6 @@
"tUa" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/structure/grille,
@@ -36456,7 +36247,6 @@
pixel_y = 7
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -37000,11 +36790,9 @@
},
/obj/structure/table/standard,
/obj/item/reagent_containers/food/condiment/shaker/salt{
- layer = 3.01;
pixel_y = 1
},
/obj/item/reagent_containers/food/condiment/shaker/peppermill{
- layer = 3.01;
pixel_x = 6;
pixel_y = 1
},
@@ -37086,7 +36874,6 @@
dir = 4;
icon = 'icons/obj/furniture.dmi';
icon_state = "chair_armrest";
- layer = 5;
name = "leather chair"
},
/turf/simulated/floor/carpet,
@@ -37500,7 +37287,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/turf/unsimulated/floor{
@@ -37614,7 +37400,6 @@
/area/shuttle/mercenary)
"uNJ" = (
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/effect/floor_decal/corner/paleblue{
@@ -37675,7 +37460,6 @@
/area/shuttle/administration)
"uPw" = (
/obj/item/flame/candle{
- layer = 3.6;
pixel_x = -4;
pixel_y = 21
},
@@ -37683,7 +37467,6 @@
desc = "A worn-down wooden table covered in a blue cloth.";
icon = 'icons/obj/furniture.dmi';
icon_state = "memorial1";
- layer = 2.99;
name = "memorial Table";
pixel_y = 20
},
@@ -37692,7 +37475,6 @@
dir = 1;
icon = 'icons/obj/drinks.dmi';
icon_state = "cognacbottle";
- layer = 3.1;
name = "sealed cognac bottle";
pixel_x = 4;
pixel_y = 34
@@ -37714,7 +37496,6 @@
},
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/turf/unsimulated/floor,
@@ -37774,7 +37555,6 @@
desc = "A worn-down wooden table covered in a blue cloth.";
icon = 'icons/obj/furniture.dmi';
icon_state = "memorial2";
- layer = 2.99;
name = "memorial Table";
pixel_y = 20
},
@@ -37803,14 +37583,12 @@
/area/centcom/control)
"uSA" = (
/obj/item/flame/candle{
- layer = 3.6;
pixel_x = 5;
pixel_y = 21
},
/obj/structure/flora/pottedplant{
anchored = 1;
icon_state = "plant-27";
- layer = 3;
pixel_x = -8;
pixel_y = 33
},
@@ -37818,7 +37596,6 @@
desc = "A worn-down wooden table covered in a blue cloth.";
icon = 'icons/obj/furniture.dmi';
icon_state = "memorial3";
- layer = 2.99;
name = "memorial Table";
pixel_y = 20
},
@@ -37896,7 +37673,6 @@
icon_state = "tube_empty"
},
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3;
pixel_y = 1
},
/turf/simulated/floor/shuttle/black,
@@ -38069,7 +37845,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/structure/bed/stool/chair/shuttle{
@@ -38209,7 +37984,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor-broken";
- layer = 2.4;
name = "conveyor"
},
/turf/unsimulated/floor{
@@ -38358,7 +38132,6 @@
/area/centcom/shared_dream)
"vkb" = (
/obj/item/storage/box/fancy/cigarettes/cigar{
- layer = 3.01;
pixel_x = -5;
pixel_y = 6
},
@@ -38520,7 +38293,6 @@
opened = 1
},
/obj/item/trash/koisbar{
- layer = 3.01
},
/obj/item/device/paicard,
/obj/random/junk,
@@ -38863,7 +38635,6 @@
/area/antag/mercenary)
"vKf" = (
/obj/item/storage/box/zipties{
- layer = 2.99;
pixel_x = 6;
pixel_y = 6
},
@@ -38978,7 +38749,6 @@
dir = 4;
icon = 'icons/obj/recycling.dmi';
icon_state = "conveyor0";
- layer = 2.4;
name = "conveyor"
},
/obj/structure/closet/crate/loot{
@@ -39140,19 +38910,15 @@
/area/centcom/control)
"vOb" = (
/obj/item/clothing/mask/gas/syndicate{
- layer = 2.99;
pixel_y = 6
},
/obj/item/clothing/mask/gas/syndicate{
- layer = 2.99;
pixel_y = 6
},
/obj/item/clothing/mask/gas/syndicate{
- layer = 2.99;
pixel_y = 6
},
/obj/item/clothing/mask/gas/syndicate{
- layer = 2.99;
pixel_y = 6
},
/obj/item/clothing/mask/gas/tactical{
@@ -39259,32 +39025,26 @@
/area/centcom/control)
"vSR" = (
/obj/item/clothing/accessory/storage/pouches/black{
- layer = 2.99;
pixel_x = -12;
pixel_y = 8
},
/obj/item/clothing/accessory/storage/pouches/brown{
- layer = 2.99;
pixel_x = -2;
pixel_y = 8
},
/obj/item/clothing/accessory/storage/pouches/brown{
- layer = 2.99;
pixel_x = -2;
pixel_y = 8
},
/obj/item/clothing/accessory/storage/pouches/white{
- layer = 2.99;
pixel_x = 8;
pixel_y = 8
},
/obj/item/clothing/accessory/storage/pouches/white{
- layer = 2.99;
pixel_x = 8;
pixel_y = 8
},
/obj/item/clothing/accessory/storage/pouches/black{
- layer = 2.99;
pixel_x = -12;
pixel_y = 8
},
@@ -39399,22 +39159,18 @@
},
/obj/structure/table/reinforced/steel,
/obj/item/storage/belt/military{
- layer = 2.99;
pixel_x = 16;
pixel_y = 5
},
/obj/item/storage/belt/military{
- layer = 2.99;
pixel_x = 16;
pixel_y = 5
},
/obj/item/storage/belt/military{
- layer = 2.99;
pixel_x = 16;
pixel_y = 5
},
/obj/item/storage/belt/military{
- layer = 2.99;
pixel_x = 16;
pixel_y = 5
},
@@ -39740,17 +39496,14 @@
pixel_y = 2
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
@@ -39881,12 +39634,10 @@
},
/obj/structure/table/reinforced,
/obj/item/paper_bin{
- layer = 3;
pixel_x = -3;
pixel_y = 4
},
/obj/item/pen{
- layer = 3.01;
pixel_x = -4;
pixel_y = 5
},
@@ -40129,22 +39880,18 @@
pixel_y = 4
},
/obj/item/shield/riot/tact/legion{
- layer = 3.01;
pixel_x = -1;
pixel_y = 1
},
/obj/item/shield/riot/tact/legion{
- layer = 3.01;
pixel_x = -1;
pixel_y = 1
},
/obj/item/shield/riot/tact/legion{
- layer = 3.02;
pixel_x = 3;
pixel_y = -3
},
/obj/item/shield/riot/tact/legion{
- layer = 3.02;
pixel_x = 3;
pixel_y = -3
},
@@ -40161,7 +39908,6 @@
"wrI" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/structure/grille,
@@ -41163,7 +40909,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/obj/machinery/light{
@@ -41296,7 +41041,6 @@
pixel_y = 14
},
/obj/item/deployable_kit/surgery_table{
- layer = 3.01;
name = "field surgery table assembly kit";
pixel_x = -1
},
@@ -41364,32 +41108,26 @@
pixel_y = 2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
/obj/item/ammo_magazine/c45m/auto{
- layer = 2.99;
pixel_x = 2;
pixel_y = -2
},
@@ -41421,7 +41159,6 @@
/obj/machinery/porta_turret/crescent,
/obj/effect/floor_decal/industrial/warning/full,
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/structure/lattice/catwalk/indoor,
@@ -41499,15 +41236,12 @@
pixel_y = 10
},
/obj/item/gun/energy/blaster/carbine{
- layer = 3.01;
pixel_y = 2
},
/obj/item/gun/energy/blaster/carbine{
- layer = 3.01;
pixel_y = 2
},
/obj/item/gun/energy/blaster/carbine{
- layer = 3.02;
pixel_y = -6
},
/turf/unsimulated/floor,
@@ -41773,7 +41507,6 @@
"xkI" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/snacks/salad/tossedsalad{
- layer = 2.99;
pixel_x = 18;
pixel_y = 10
},
@@ -41865,7 +41598,6 @@
icon_state = "tube_empty"
},
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/obj/machinery/porta_turret/crescent,
@@ -41928,7 +41660,6 @@
dir = 8
},
/obj/machinery/computer/cryopod{
- layer = 3.3;
pixel_y = 27
},
/turf/simulated/floor/carpet/cyan,
@@ -42190,11 +41921,9 @@
pixel_y = 15
},
/obj/item/gun/energy/blaster/rifle{
- layer = 3.01;
pixel_y = 7
},
/obj/item/gun/energy/blaster/rifle{
- layer = 3.02;
pixel_y = -1
},
/turf/unsimulated/floor,
@@ -42343,11 +42072,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/effect/floor_decal/corner/lime/diagonal,
@@ -42356,11 +42083,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/machinery/light{
@@ -42687,7 +42412,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutter0";
- layer = 2.4;
name = "shutter"
},
/obj/item/flame/lighter/zippo,
@@ -42931,11 +42655,9 @@
pixel_y = 16
},
/obj/item/gun/projectile/gauss{
- layer = 3.01;
pixel_y = 8
},
/obj/item/gun/projectile/gauss{
- layer = 3.02
},
/turf/unsimulated/floor,
/area/centcom/legion/hangar5)
@@ -43140,7 +42862,6 @@
dir = 1
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted window"
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -43174,7 +42895,6 @@
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/toilet{
dir = 1;
- layer = 4.1
},
/obj/machinery/light/small{
dir = 8;
@@ -43372,7 +43092,6 @@
},
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/railing/mapped{
- layer = 4.1;
name = "adjusted railing"
},
/turf/unsimulated/floor,
diff --git a/maps/aurora/aurora-2_under-station.dmm b/maps/aurora/aurora-2_under-station.dmm
index b9d799e28c8..1e54fcacb4a 100644
--- a/maps/aurora/aurora-2_under-station.dmm
+++ b/maps/aurora/aurora-2_under-station.dmm
@@ -360,7 +360,6 @@
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "cooling_airlock";
- layer = 3.3;
pixel_y = -25;
req_access = list(11);
tag_airpump = "cooling_pump";
@@ -370,7 +369,6 @@
},
/obj/machinery/airlock_sensor{
id_tag = "cooling_sensor";
- layer = 3.3;
master_tag = "cooling airlock";
pixel_x = 12;
pixel_y = -25
@@ -558,7 +556,6 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1379;
- layer = 3.3;
master_tag = "cooling_airlock";
name = "interior access button";
pixel_x = -25;
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 9dd7164a4d3..7c73e758098 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -2679,7 +2679,6 @@
/area/rnd/xenoarch_atrium)
"agF" = (
/obj/machinery/computer/security/telescreen{
- layer = 4;
name = "Anomaly Observation Screen";
network = list("Anomaly Isolation");
pixel_y = 26
@@ -5258,7 +5257,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_alpha";
- layer = 3.3;
name = "Containment Cell Alpha"
},
/obj/structure/cable/green{
@@ -5297,7 +5295,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_alpha";
- layer = 3.3;
name = "Containment Cell Alpha"
},
/obj/structure/plasticflaps/airtight,
@@ -5349,7 +5346,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_alpha";
- layer = 3.3;
name = "Containment Cell Alpha"
},
/obj/structure/cable/green{
@@ -5542,7 +5538,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_bravo";
- layer = 3.3;
name = "Containment Cell Bravo"
},
/obj/structure/cable/green{
@@ -5636,7 +5631,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_bravo";
- layer = 3.3;
name = "Containment Cell Bravo"
},
/obj/structure/plasticflaps/airtight,
@@ -5664,7 +5658,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_bravo";
- layer = 3.3;
name = "Containment Cell Bravo"
},
/obj/structure/cable/green{
@@ -5964,7 +5957,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_charlie";
- layer = 3.3;
name = "Containment Cell Charlie"
},
/obj/structure/cable/green{
@@ -6102,7 +6094,6 @@
/area/turret_protected/ai_upload_foyer)
"anq" = (
/obj/machinery/status_display{
- layer = 4;
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt,
@@ -6596,7 +6587,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_charlie";
- layer = 3.3;
name = "Containment Cell Charlie"
},
/obj/structure/plasticflaps/airtight,
@@ -7062,7 +7052,6 @@
name = "dead greimorian"
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/machinery/light/small/emergency{
@@ -7107,7 +7096,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_charlie";
- layer = 3.3;
name = "Containment Cell Charlie"
},
/obj/structure/cable/green{
@@ -7432,7 +7420,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_delta";
- layer = 3.3;
name = "Containment Cell Delta"
},
/obj/structure/cable/green{
@@ -7483,7 +7470,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_delta";
- layer = 3.3;
name = "Containment Cell Delta"
},
/obj/structure/plasticflaps/airtight,
@@ -7558,7 +7544,6 @@
/area/turret_protected/ai_upload_foyer)
"apl" = (
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/turf/simulated/floor/tiled,
@@ -7692,7 +7677,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "ccell_delta";
- layer = 3.3;
name = "Containment Cell Delta"
},
/obj/structure/cable/green{
@@ -7727,7 +7711,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_hotel";
- layer = 3.3;
name = "Containment Cell Hotel"
},
/obj/structure/cable/green,
@@ -7752,7 +7735,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_hotel";
- layer = 3.3;
name = "Containment Cell Hotel"
},
/obj/structure/plasticflaps/airtight,
@@ -7782,7 +7764,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_hotel";
- layer = 3.3;
name = "Containment Cell Hotel"
},
/obj/structure/cable/green,
@@ -7812,7 +7793,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_golf";
- layer = 3.3;
name = "Containment Cell Golf"
},
/obj/structure/cable/green,
@@ -7837,7 +7817,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_golf";
- layer = 3.3;
name = "Containment Cell Golf"
},
/obj/structure/plasticflaps/airtight,
@@ -7867,7 +7846,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_golf";
- layer = 3.3;
name = "Containment Cell Golf"
},
/obj/structure/cable/green,
@@ -7897,7 +7875,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_foxtrot";
- layer = 3.3;
name = "Containment Cell Foxtrot"
},
/obj/structure/cable/green,
@@ -8165,7 +8142,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_foxtrot";
- layer = 3.3;
name = "Containment Cell Foxtrot"
},
/obj/structure/plasticflaps/airtight,
@@ -8195,7 +8171,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_foxtrot";
- layer = 3.3;
name = "Containment Cell Foxtrot"
},
/obj/structure/cable/green,
@@ -8225,7 +8200,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_echo";
- layer = 3.3;
name = "Containment Cell Echo"
},
/obj/structure/cable/green,
@@ -8251,7 +8225,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_echo";
- layer = 3.3;
name = "Containment Cell Echo"
},
/obj/machinery/door/blast/regular{
@@ -8281,7 +8254,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "ccell_echo";
- layer = 3.3;
name = "Containment Cell Echo"
},
/obj/machinery/door/blast/regular{
@@ -9883,7 +9855,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad{
- layer = 2.5
},
/turf/simulated/floor,
/area/turret_protected/ai_upload_foyer)
@@ -11603,7 +11574,6 @@
/area/bridge/aibunker)
"avE" = (
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/structure/closet/emcloset,
@@ -25185,7 +25155,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/suit/space/void/sci,
/obj/item/clothing/shoes/magboots,
@@ -29484,7 +29453,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_h";
- layer = 3.7
},
/turf/simulated/floor/tiled/white,
/area/maintenance/medsublevel_port)
@@ -32359,7 +32327,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_h";
- layer = 3.7
},
/turf/simulated/floor/tiled/white,
/area/maintenance/medsublevel_port)
@@ -33053,7 +33020,6 @@
/obj/machinery/door/window{
base_state = "right";
closed_layer = 4.1;
- layer = 4.1;
name = "Remote Mech Storage";
req_access = list(20)
},
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index ba2cfbd4418..27d317c9eb9 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -829,7 +829,6 @@
},
/obj/machinery/door/firedoor,
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/structure/disposalpipe/segment{
@@ -2522,7 +2521,6 @@
/area/security/brig)
"aeZ" = (
/obj/machinery/computer/security/telescreen{
- layer = 4;
name = "Observation Screen";
network = list("Interrogation");
pixel_y = -32
@@ -6086,7 +6084,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "EngineEmitterPortWest";
- layer = 3.3;
name = "Engine Waste Handling Access"
},
/turf/simulated/floor/plating,
@@ -6095,7 +6092,6 @@
/obj/machinery/door/blast/regular{
dir = 4;
id = "EngineEmitterPortWest";
- layer = 3.3;
name = "Engine Waste Handling Access"
},
/turf/simulated/floor/plating,
@@ -9209,7 +9205,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/stack/material/glass{
amount = 50
@@ -12161,7 +12156,6 @@
id = "enginecore"
},
/obj/machinery/power/supermatter{
- layer = 4
},
/obj/effect/landmark/engine_setup/core,
/turf/simulated/floor/greengrid/nitrogen,
@@ -13995,25 +13989,20 @@
/area/crew_quarters/sleep/research)
"azT" = (
/obj/item/storage/box/drinkingglasses{
- layer = 3.3;
pixel_x = 15;
pixel_y = 12
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.3;
pixel_y = 17
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.3;
pixel_x = -7;
pixel_y = 17
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.3;
pixel_y = 13
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.3;
pixel_x = -7;
pixel_y = 13
},
@@ -14328,7 +14317,6 @@
/area/engineering/engine_monitoring)
"aAs" = (
/obj/item/device/radio/intercom/south{
- layer = 4
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -14341,7 +14329,6 @@
/area/engineering/engine_monitoring)
"aAt" = (
/obj/machinery/newscaster/south{
- layer = 3.3
},
/turf/simulated/floor/tiled,
/area/engineering/engine_monitoring)
@@ -18379,7 +18366,6 @@
"aGG" = (
/obj/structure/table/steel,
/obj/structure/closet/crate/autakh{
- layer = 2.79;
pixel_y = -4;
tablestatus = -1
},
@@ -18830,7 +18816,6 @@
dir = 1
},
/obj/item/device/radio/intercom/south{
- layer = 4
},
/obj/machinery/light{
icon_state = "tube_empty"
@@ -19036,7 +19021,6 @@
"aHR" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/mask/breath,
/obj/item/clothing/head/helmet/space/void/medical,
@@ -19048,7 +19032,6 @@
"aHS" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/mask/breath,
/obj/item/clothing/head/helmet/space/void/medical,
@@ -20459,7 +20442,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
id_tag = "";
- layer = 2.8;
name = "Security Starboard Entrance";
req_access = list(63);
dir = 4
@@ -21020,7 +21002,6 @@
"aLi" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/mask/breath,
@@ -21034,7 +21015,6 @@
"aLj" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/void/atmos,
@@ -21241,7 +21221,6 @@
dir = 8
},
/obj/structure/noticeboard{
- layer = 3.3;
pixel_x = 32;
pixel_y = 2
},
@@ -21587,7 +21566,6 @@
dir = 8
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -22224,7 +22202,6 @@
"aNc" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/shoes/magboots,
@@ -22234,7 +22211,6 @@
"aNd" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/shoes/magboots,
@@ -25253,7 +25229,6 @@
"aSm" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/machinery/light/small{
dir = 4
@@ -25661,7 +25636,6 @@
/area/bridge)
"aTc" = (
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/effect/floor_decal/corner_wide/paleblue/full,
@@ -25747,7 +25721,6 @@
"aTk" = (
/obj/item/modular_computer/console/preset/engineering,
/obj/machinery/newscaster/south{
- layer = 3.3
},
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/chief)
@@ -26029,7 +26002,6 @@
"aTH" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 4
@@ -27150,7 +27122,6 @@
},
/obj/machinery/door/airlock/glass_security{
id_tag = "";
- layer = 2.8;
name = "Security Aft Entrance";
req_access = list(63);
dir = 1
@@ -27377,7 +27348,6 @@
dir = 8
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/turf/simulated/floor/tiled,
@@ -29693,7 +29663,6 @@
"baa" = (
/obj/machinery/photocopier,
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/turf/simulated/floor/wood,
@@ -29849,7 +29818,6 @@
/area/janitor)
"bav" = (
/obj/machinery/newscaster/south{
- layer = 3.3
},
/obj/effect/floor_decal/corner/yellow/full,
/turf/simulated/floor/tiled,
@@ -31034,7 +31002,6 @@
"bcW" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/healthanalyzer,
@@ -31830,7 +31797,6 @@
"beu" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/borgupload{
pixel_x = -1;
@@ -31869,7 +31835,6 @@
"bez" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/rdconsole,
/obj/item/circuitboard/rdserver{
@@ -31884,7 +31849,6 @@
"beA" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/security{
pixel_x = 1;
@@ -31895,7 +31859,6 @@
"beB" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
@@ -32547,7 +32510,6 @@
"bfN" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/security/mining,
/obj/item/circuitboard/autolathe{
@@ -32559,7 +32521,6 @@
"bfO" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/security/engineering,
/obj/item/circuitboard/atmos_alert{
@@ -32571,7 +32532,6 @@
"bfP" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
@@ -33402,7 +33362,6 @@
"bhg" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/robotics{
pixel_x = -2;
@@ -33418,7 +33377,6 @@
"bhi" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/message_monitor{
pixel_x = 3;
@@ -33437,7 +33395,6 @@
"bhk" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/rdtechprocessor{
pixel_x = -2;
@@ -33671,7 +33628,6 @@
},
/obj/structure/table/reinforced,
/obj/structure/noticeboard{
- layer = 3.3;
pixel_x = 32;
pixel_y = 2
},
@@ -34123,7 +34079,6 @@
"biv" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/matter_bin,
@@ -34413,7 +34368,6 @@
/obj/item/device/assembly/timer,
/obj/structure/closet/crate/drop/grey{
desc = "A large, sturdy crate, that stores grenade components.";
- layer = 2.79;
name = "grenade crate";
pixel_y = -4;
tablestatus = -1
@@ -35278,7 +35232,6 @@
"bkp" = (
/obj/structure/table/wood,
/obj/machinery/chemical_dispenser/bar_alc/full{
- layer = 3.1;
pixel_x = -1;
pixel_y = 7
},
@@ -39221,7 +39174,6 @@
},
/obj/machinery/door/window{
dir = 1;
- layer = 2.85;
name = "MediExpress - Storage";
req_access = list(66)
},
@@ -41379,7 +41331,6 @@
/area/rnd/rdoffice)
"bwW" = (
/obj/machinery/status_display{
- layer = 4;
pixel_y = 32
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -45614,7 +45565,6 @@
"bGt" = (
/obj/structure/table/standard,
/obj/machinery/door/window{
- layer = 2.85;
name = "hydroponics desk";
req_access = list(35)
},
@@ -48841,7 +48791,6 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1379;
- layer = 3.3;
master_tag = "civilian_eva_airlock";
name = "interior access button";
pixel_x = -25;
@@ -48988,7 +48937,6 @@
pixel_y = 24
},
/obj/structure/sink/kitchen{
- layer = 3.3;
pixel_y = 26
},
/turf/simulated/floor/tiled/white,
@@ -49346,7 +49294,6 @@
/obj/structure/table/stone/marble,
/obj/machinery/door/window/westleft{
closed_layer = 2.9;
- layer = 2.9;
name = "Display Window";
open_layer = 2.9;
req_access = list(28)
@@ -49941,7 +49888,6 @@
"bRU" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/sink/kitchen{
- layer = 3.3;
pixel_y = 26
},
/turf/simulated/floor/tiled/white,
@@ -57657,7 +57603,6 @@
"cqu" = (
/obj/machinery/door/firedoor,
/obj/structure/plasticflaps/airtight{
- layer = 2.5
},
/obj/machinery/door/airlock/security{
name = "Autopsy Lab";
@@ -58010,7 +57955,6 @@
"cUQ" = (
/obj/machinery/ringer_button{
id = "Consular";
- layer = 3.3;
name = "Consular ringer button";
pixel_x = 24;
pixel_y = -23
@@ -58400,7 +58344,6 @@
/area/maintenance/research_port)
"dBV" = (
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/structure/closet/crate/freezer,
@@ -58756,7 +58699,6 @@
},
/obj/machinery/body_scanconsole{
dir = 1;
- layer = 3.01;
pixel_y = 6
},
/turf/simulated/floor/tiled{
@@ -59227,7 +59169,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -59392,7 +59333,6 @@
/obj/random/plushie,
/obj/item/stack/material/wood{
amount = 10;
- layer = 3.01
},
/turf/simulated/floor/plating,
/area/maintenance/library)
@@ -60437,7 +60377,6 @@
"hji" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp/green{
- layer = 4.1;
on = 0;
pixel_y = 4
},
@@ -60731,7 +60670,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/railing/mapped{
- layer = 4.01;
name = "polished railing"
},
/obj/effect/floor_decal/spline/plain,
@@ -60937,7 +60875,6 @@
/area/maintenance/atmos_control)
"hVm" = (
/obj/structure/railing/mapped{
- layer = 4.01;
name = "polished railing"
},
/obj/effect/floor_decal/spline/plain{
@@ -60982,7 +60919,6 @@
/area/maintenance/engineering)
"iap" = (
/obj/structure/railing/mapped{
- layer = 4.01;
name = "polished railing"
},
/obj/effect/floor_decal/spline/plain{
@@ -61087,12 +61023,10 @@
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/table/stone/marble,
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9;
pixel_y = -14
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -62283,7 +62217,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -63137,7 +63070,6 @@
},
/obj/machinery/ringer_button{
id = "Representative";
- layer = 3.3;
name = "Representative ringer button";
pixel_x = -24;
pixel_y = 32
@@ -63503,7 +63435,6 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1379;
- layer = 3.3;
master_tag = "civilian_eva_airlock";
name = "exterior access button";
pixel_x = 25;
@@ -63894,7 +63825,6 @@
"ohL" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/circuitboard/protolathe,
/obj/item/circuitboard/destructive_analyzer{
@@ -64427,7 +64357,6 @@
"pfO" = (
/obj/structure/noticeboard{
dir = 8;
- layer = 3.3;
pixel_x = 32;
pixel_y = 2
},
@@ -64599,7 +64528,6 @@
pixel_y = -2
},
/obj/item/pen/multi{
- layer = 3.01
},
/turf/simulated/floor/wood,
/area/lawoffice/consular)
@@ -64984,7 +64912,6 @@
/obj/item/storage/box/sharps,
/obj/structure/noticeboard{
dir = 8;
- layer = 3.3;
pixel_x = 32;
pixel_y = 2
},
@@ -65520,7 +65447,6 @@
},
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
dir = 8;
- layer = 2.45
},
/obj/structure/cable{
d2 = 8;
@@ -66576,7 +66502,6 @@
},
/obj/machinery/door/window/westright{
closed_layer = 2.9;
- layer = 2.9;
name = "Display Window";
open_layer = 2.9;
req_access = list(28)
@@ -67601,7 +67526,6 @@
/area/maintenance/medbay)
"ulg" = (
/obj/machinery/chemical_dispenser/coffee/full{
- layer = 3.3;
pixel_x = 1;
pixel_y = 8;
spawn_cartridges = list(/obj/item/reagent_containers/chem_disp_cartridge/coffee,/obj/item/reagent_containers/chem_disp_cartridge/milk,/obj/item/reagent_containers/chem_disp_cartridge/cream,/obj/item/reagent_containers/chem_disp_cartridge/sugar)
@@ -68019,10 +67943,8 @@
icon_state = "4-8"
},
/obj/structure/grille{
- layer = 2.7
},
/obj/structure/blocker{
- layer = 2.8
},
/turf/simulated/floor/plating,
/area/maintenance/vault)
@@ -68318,12 +68240,10 @@
pixel_y = 9
},
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9;
pixel_y = -14
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -69141,7 +69061,6 @@
pixel_y = 1
},
/obj/item/stamp{
- layer = 3.1;
name = "representative stamp";
pixel_x = -8;
pixel_y = 4
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 443f27028bb..6055c02c9b2 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -4926,7 +4926,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/turf/simulated/floor/plating,
/area/maintenance/interstitial_main)
@@ -5236,7 +5235,6 @@
/area/mine/unexplored)
"oB" = (
/obj/item/device/radio/intercom/south{
- layer = 4
},
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/bed/stool/chair/padded/black{
@@ -6715,7 +6713,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/machinery/door/airlock/maintenance_hatch{
icon_state = "door_locked";
@@ -7434,7 +7431,6 @@
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/zpipe/down/supply{
dir = 8;
- layer = 2.45
},
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
dir = 8
@@ -7720,7 +7716,6 @@
/area/maintenance/engineering_ladder)
"EK" = (
/obj/structure/lattice/catwalk/indoor{
- layer = 2.5;
name = "adjusted catwalk"
},
/obj/structure/cable/green{
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 63726f6e1cf..bf093fa49e5 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -667,7 +667,6 @@
dir = 1
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
@@ -1209,7 +1208,6 @@
dir = 1
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/effect/floor_decal/corner/dark_blue{
@@ -2104,7 +2102,6 @@
/obj/machinery/door/blast/shutters{
dir = 8;
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/obj/structure/window/reinforced,
@@ -3050,7 +3047,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK"
},
/turf/simulated/floor/plating,
@@ -3124,7 +3120,6 @@
"cwm" = (
/obj/machinery/atmospherics/pipe/tank/air{
dir = 8;
- layer = 3.5
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
@@ -3359,7 +3354,6 @@
dir = 1
},
/obj/effect/spider/stickyweb{
- layer = 3.5
},
/obj/machinery/door/blast/shutters{
id = "commissary_counter";
@@ -3963,7 +3957,6 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1399;
- layer = 3.5;
master_tag = "admin_shuttle_dock_airlock";
name = "exterior access button";
pixel_x = 21;
@@ -4476,7 +4469,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "science_shuttle";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "science_shuttle_pump";
tag_chamber_sensor = "science_shuttle_sensor";
@@ -4877,7 +4869,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK"
},
/turf/simulated/floor/plating,
@@ -5206,7 +5197,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = -32
},
@@ -5568,7 +5558,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 32
},
@@ -6971,7 +6960,6 @@
/area/solar/fore)
"giv" = (
/obj/machinery/status_display{
- layer = 4;
pixel_x = -32
},
/obj/machinery/light{
@@ -7451,7 +7439,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK"
},
/turf/simulated/floor/plating,
@@ -9406,17 +9393,14 @@
/obj/item/storage/box/fancy/cookiesnack,
/obj/item/storage/box/fancy/cookiesnack,
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.01;
pixel_x = -8;
pixel_y = 14
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.01;
pixel_x = -1;
pixel_y = 14
},
/obj/item/reagent_containers/food/drinks/waterbottle{
- layer = 3.01;
pixel_x = 6;
pixel_y = 14
},
@@ -9506,7 +9490,6 @@
/obj/machinery/door/blast/shutters{
dir = 8;
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/turf/simulated/floor/plating,
@@ -9898,7 +9881,6 @@
dir = 1
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
@@ -10814,7 +10796,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/turf/simulated/floor/plating,
@@ -11574,7 +11555,6 @@
dir = 6
},
/obj/structure/window/reinforced{
- layer = 6;
name = "adjusted window"
},
/obj/structure/bed/stool/chair/office/bridge{
@@ -11898,7 +11878,6 @@
dir = 9
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6;
pixel_y = 3
},
@@ -11907,7 +11886,6 @@
pixel_y = 3
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/research)
@@ -11975,7 +11953,6 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1379;
- layer = 3.3;
master_tag = "brig_solar_airlock";
name = "interior access button";
pixel_x = -25;
@@ -12955,7 +12932,6 @@
/area/quartermaster/loading)
"lvK" = (
/obj/structure/closet/cabinet{
- layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/random/booze,
@@ -14776,7 +14752,6 @@
dir = 9
},
/obj/structure/window/reinforced{
- layer = 6;
name = "adjusted window"
},
/obj/structure/bed/stool/chair/office/bridge{
@@ -16680,7 +16655,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_y = -32
},
@@ -16871,7 +16845,6 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/status_display{
- layer = 3.5
},
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
@@ -17106,7 +17079,6 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- layer = 3.3;
master_tag = "centcom_shuttle_dock_airlock";
name = "interior access button";
pixel_x = -25;
@@ -17134,7 +17106,6 @@
dir = 1
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = 32
},
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
@@ -17427,7 +17398,6 @@
/area/hallway/secondary/exit)
"pqk" = (
/obj/structure/closet/cabinet{
- layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/random/random_flag,
@@ -18393,7 +18363,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/effect/floor_decal/corner/dark_blue{
@@ -18493,7 +18462,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/turf/simulated/floor/plating,
@@ -20337,7 +20305,6 @@
/obj/machinery/door/blast/shutters{
dir = 8;
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/obj/structure/window/reinforced{
@@ -21952,7 +21919,6 @@
dir = 1
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/effect/floor_decal/corner/dark_blue/full{
@@ -23458,7 +23424,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/turf/simulated/floor/plating,
@@ -24367,7 +24332,6 @@
/obj/machinery/door/blast/shutters{
dir = 8;
id = "office_shutter";
- layer = 3.1;
name = "Office Shutters"
},
/turf/simulated/floor/plating,
@@ -25340,7 +25304,6 @@
"vZO" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/door/firedoor{
- layer = 2.8;
open_layer = 2.8
},
/turf/simulated/floor/plating,
@@ -25608,7 +25571,6 @@
dir = 8
},
/obj/machinery/status_display{
- layer = 3.5
},
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
@@ -26349,7 +26311,6 @@
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "brig_solar_airlock";
- layer = 3.3;
pixel_y = -25;
req_access = list(13);
tag_airpump = "brig_solar_pump";
@@ -26359,7 +26320,6 @@
},
/obj/machinery/airlock_sensor{
id_tag = "brig_solar_sensor";
- layer = 3.3;
pixel_x = 12;
pixel_y = -25
},
@@ -26513,7 +26473,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK"
},
/turf/simulated/floor/plating,
@@ -27662,7 +27621,6 @@
/area/security/vacantoffice)
"yav" = (
/obj/structure/closet/cabinet{
- layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/stool/padded/red,
diff --git a/maps/away/away_site/abandoned_mining/cursed.dmm b/maps/away/away_site/abandoned_mining/cursed.dmm
index dcd8d91398a..50e670e2873 100644
--- a/maps/away/away_site/abandoned_mining/cursed.dmm
+++ b/maps/away/away_site/abandoned_mining/cursed.dmm
@@ -182,7 +182,6 @@
"aQn" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4;
- layer = 2.8
},
/turf/simulated/floor,
/area/cursed/hangar)
@@ -1153,7 +1152,6 @@
/obj/item/bodybag/cryobag,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/turf/simulated/floor/tiled/white,
/area/cursed/medical)
@@ -1707,7 +1705,6 @@
/obj/structure/flora/rock/pile{
density = 0;
icon_state = "basalt2";
- layer = 3;
pixel_x = -13;
pixel_y = 5
},
@@ -1853,7 +1850,6 @@
"lrD" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
@@ -2186,7 +2182,6 @@
"mTG" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
- layer = 2.8
},
/turf/simulated/floor,
/area/cursed/engineering)
@@ -3097,7 +3092,6 @@
/area/cursed/living_area)
"rwC" = (
/obj/machinery/atmospherics/pipe/tank/air{
- layer = 3.5;
start_pressure = 5066.26;
dir = 4
},
diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm
index 382d9997a39..5a9264f4194 100644
--- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm
+++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm
@@ -165,7 +165,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -202,7 +201,6 @@
/area/crashed_elyran_tanker/engineering)
"bk" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 4
@@ -456,7 +454,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-12";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -734,7 +731,6 @@
},
/obj/machinery/atmospherics/portables_connector{
dir = 4;
- layer = 2.8
},
/obj/item/stack/material/steel,
/obj/item/tape_roll,
@@ -802,7 +798,6 @@
/area/crashed_elyran_tanker/engineering)
"hO" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
@@ -995,7 +990,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -1094,7 +1088,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/carbon_dioxide,
@@ -1239,7 +1232,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/carbon_dioxide,
@@ -1471,7 +1463,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
@@ -1561,7 +1552,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/turf/simulated/floor/tiled/rust/airless,
/area/crashed_elyran_tanker/engineering)
@@ -1606,7 +1596,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-11";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -1903,7 +1892,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
@@ -1974,7 +1962,6 @@
/area/crashed_elyran_tanker/tanks)
"tS" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 4
@@ -2103,7 +2090,6 @@
/area/crashed_elyran_tanker/tanks)
"vI" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide,
/obj/effect/floor_decal/industrial/warning/cee{
@@ -2191,7 +2177,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airless,
@@ -2308,7 +2293,6 @@
/area/crashed_elyran_tanker/tanks)
"xF" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide,
@@ -2991,7 +2975,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-5";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -3051,7 +3034,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -3063,7 +3045,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airless,
@@ -3124,7 +3105,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -3259,7 +3239,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -3620,7 +3599,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/phoron,
@@ -3740,7 +3718,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/phoron,
@@ -3873,7 +3850,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/obj/effect/decal/cleanable/dirt,
@@ -3996,7 +3972,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
@@ -4024,7 +3999,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/hydrogen,
@@ -4201,7 +4175,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph11";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -4303,7 +4276,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -4686,7 +4658,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/hydrogen,
@@ -4815,7 +4786,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -4878,7 +4848,6 @@
/area/crashed_elyran_tanker/tanks)
"VN" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning,
/obj/item/clothing/suit/space/emergency,
@@ -5006,7 +4975,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -5166,7 +5134,6 @@
/area/crashed_elyran_tanker/tanks)
"Yq" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/effect/floor_decal/industrial/warning,
/obj/effect/decal/cleanable/dirt,
@@ -5304,7 +5271,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph5";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
@@ -5339,7 +5305,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph12";
- layer = 10.1;
opacity = 0
},
/obj/structure/cable{
@@ -5367,7 +5332,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/obj/effect/decal/cleanable/dirt,
diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm
index 46be01fe4e8..3df1d076575 100644
--- a/maps/away/away_site/first_aurora/first_aurora.dmm
+++ b/maps/away/away_site/first_aurora/first_aurora.dmm
@@ -588,7 +588,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/turf/simulated/floor/tiled/white,
/area/derelict/hallway/northeast)
@@ -661,7 +660,6 @@
/obj/machinery/door/blast/regular,
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/turf/simulated/floor/airless,
/area/derelict/hallway/northwest)
@@ -690,7 +688,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/turf/simulated/floor/tiled/dark/airless,
/area/derelict/hallway/northwest)
@@ -1500,7 +1497,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 32;
pixel_y = 0
@@ -1520,7 +1516,6 @@
"fc" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/turf/simulated/floor/tiled/airless,
/area/derelict/hallway/northwest)
@@ -1704,7 +1699,6 @@
"fE" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/mask/breath,
@@ -1716,7 +1710,6 @@
"fF" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/void/atmos,
@@ -1817,7 +1810,6 @@
/area/derelict/hallway/northwest)
"fT" = (
/obj/machinery/status_display{
- layer = 4;
pixel_x = 0;
pixel_y = 32
},
@@ -2483,7 +2475,6 @@
"ir" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/stack/rods{
amount = 50
@@ -2497,7 +2488,6 @@
"it" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/module/power_control,
/obj/item/cell{
@@ -3912,7 +3902,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 0
},
@@ -4823,7 +4812,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 0
},
@@ -4832,7 +4820,6 @@
"pD" = (
/obj/machinery/status_display{
density = 0;
- layer = 4;
pixel_x = 0;
pixel_y = -32
},
@@ -5597,7 +5584,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 0;
pixel_y = -32
@@ -6574,7 +6560,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = -32;
pixel_y = 0
@@ -6664,7 +6649,6 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1379;
- layer = 3.3;
master_tag = "robotics_solar_airlock";
name = "exterior access button";
pixel_x = 25;
@@ -6700,7 +6684,6 @@
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1379;
id_tag = "robotics_solar_airlock";
- layer = 3.3;
pixel_x = 0;
pixel_y = -25;
req_access = list(13);
@@ -6712,7 +6695,6 @@
/obj/machinery/airlock_sensor{
frequency = 1379;
id_tag = "robotics_solar_sensor";
- layer = 3.3;
pixel_x = 12;
pixel_y = -25
},
@@ -6728,7 +6710,6 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1379;
- layer = 3.3;
master_tag = "robotics_solar_airlock";
name = "interior access button";
pixel_x = -25;
diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm
index 55f32297f6a..19662c3baa6 100644
--- a/maps/away/away_site/racers/racers.dmm
+++ b/maps/away/away_site/racers/racers.dmm
@@ -457,11 +457,9 @@
pixel_y = 9
},
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3
},
/turf/simulated/floor/tiled/white,
@@ -1573,7 +1571,6 @@
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/effect/floor_decal/industrial/warning{
@@ -1932,7 +1929,6 @@
"jjQ" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/turf/simulated/floor/shuttle/white,
/area/racers)
@@ -2582,7 +2578,6 @@
"mxk" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/structure/lattice/catwalk/indoor/grate,
diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm
index dfa9bc61bf6..14e1a8f8f9e 100644
--- a/maps/away/away_site/romanovich/grand_romanovich.dmm
+++ b/maps/away/away_site/romanovich/grand_romanovich.dmm
@@ -5931,7 +5931,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/item/storage/firstaid/toxin{
@@ -5939,7 +5938,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/structure/sign/nosmoking_1{
pixel_y = 30
@@ -6235,7 +6233,6 @@
"uW" = (
/obj/structure/table/standard,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/unsimulated/floor{
@@ -6273,7 +6270,6 @@
/obj/item/bedsheet/black,
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/carpet/art,
@@ -6740,7 +6736,6 @@
"CJ" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/wood,
@@ -7618,7 +7613,6 @@
pixel_y = 20
},
/obj/structure/mirror{
- layer = 2.98;
pixel_y = 34
},
/turf/simulated/floor/tiled/freezer,
@@ -7661,11 +7655,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/effect/floor_decal/corner/lime/diagonal,
@@ -7674,11 +7666,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/simulated/floor/tiled/white,
@@ -7794,12 +7784,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -8084,12 +8072,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dmm b/maps/away/away_site/sensor_relay/sensor_relay.dmm
index d0eac782629..e9669f83a35 100644
--- a/maps/away/away_site/sensor_relay/sensor_relay.dmm
+++ b/maps/away/away_site/sensor_relay/sensor_relay.dmm
@@ -187,7 +187,6 @@
/obj/structure/bed/padded,
/obj/item/bedsheet/random,
/obj/structure/curtain{
- layer = 4.1
},
/obj/structure/sign/poster{
pixel_x = 32
@@ -598,11 +597,9 @@
"kgP" = (
/obj/structure/table/stone/marble,
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
@@ -909,11 +906,9 @@
"pat" = (
/obj/effect/floor_decal/corner/blue/diagonal,
/obj/item/towel/random{
- layer = 3.02;
pixel_y = 4
},
/obj/item/towel/random{
- layer = 3.01;
pixel_y = 2
},
/obj/item/towel/random,
@@ -963,7 +958,6 @@
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/head/hardhat/orange,
/obj/structure/curtain{
- layer = 4.1
},
/turf/simulated/floor/carpet/green,
/area/sensor_relay)
diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm
index 2f89b268f82..2c11f9aff9e 100644
--- a/maps/away/away_site/shady/shady.dmm
+++ b/maps/away/away_site/shady/shady.dmm
@@ -116,7 +116,6 @@
dir = 8
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/turf/simulated/floor/lino/diamond,
@@ -335,7 +334,6 @@
"eu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/structure/window/reinforced{
@@ -1095,7 +1093,6 @@
/area/hideout)
"pL" = (
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/structure/window/reinforced{
@@ -1742,7 +1739,6 @@
"AA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/item/landmine{
@@ -2361,7 +2357,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/turf/simulated/floor/tiled,
@@ -2888,7 +2883,6 @@
"SP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/structure/table/steel,
@@ -3125,7 +3119,6 @@
/area/hideout)
"WT" = (
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/effect/decal/cleanable/dirt,
@@ -3190,7 +3183,6 @@
dir = 4
},
/obj/structure/window/reinforced{
- layer = 5;
name = "adjusted reinforced window"
},
/obj/item/gun/custom_ka/frameB,
diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm
index 95e2e2ce8cd..356e1e64950 100644
--- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm
+++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm
@@ -4,7 +4,6 @@
/obj/effect/floor_decal/industrial/warning/cee,
/obj/machinery/conveyor{
id = "mining_jack_base_belt";
- layer = 2.9
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -239,7 +238,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -288,7 +286,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -346,7 +343,6 @@
"eZ" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/plating{
@@ -374,7 +370,6 @@
/area/mining_jack_outpost/storage)
"fG" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8;
dir = 4
},
/obj/machinery/portable_atmospherics/canister/empty{
@@ -507,7 +502,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -540,7 +534,6 @@
/obj/machinery/conveyor{
dir = 10;
id = "mining_jack_base_belt";
- layer = 2.9;
reversed = 1
},
/obj/effect/floor_decal/industrial/warning{
@@ -564,7 +557,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -590,7 +582,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/turf/simulated/floor/tiled/rust{
temperature = 278.15
@@ -718,7 +709,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -774,7 +764,6 @@
/obj/machinery/conveyor{
dir = 4;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
@@ -846,7 +835,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
@@ -986,7 +974,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -1266,7 +1253,6 @@
/obj/machinery/conveyor{
dir = 9;
id = "mining_jack_base_belt";
- layer = 2.9;
reversed = 1
},
/obj/effect/floor_decal/industrial/warning{
@@ -1445,7 +1431,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -1738,7 +1723,6 @@
/area/shuttle/mining_jack/bridge)
"DS" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating{
@@ -1791,7 +1775,6 @@
/area/shuttle/mining_jack/engines)
"EO" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8;
dir = 4
},
/turf/simulated/floor/plating{
@@ -1853,7 +1836,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "tajara_mining_jack_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
dir = 4
@@ -2098,7 +2080,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_base_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -2276,7 +2257,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
@@ -2378,7 +2358,6 @@
/obj/machinery/conveyor{
dir = 5;
id = "mining_jack_base_belt";
- layer = 2.9;
reversed = 1
},
/obj/effect/floor_decal/industrial/warning{
@@ -2515,7 +2494,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_jack_belt";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 4
diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
index ecc2ace78b0..062c849537a 100644
--- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
+++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
@@ -1601,7 +1601,6 @@
req_access = null
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -1987,7 +1986,6 @@
name = "waste canister"
},
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/alarm/cold/north{
req_one_access = list(209)
@@ -5711,7 +5709,6 @@
"Ae" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/plating{
@@ -6064,7 +6061,6 @@
/area/peoples_station/atmos)
"BU" = (
/obj/machinery/atmospherics/pipe/tank/air{
- layer = 3.5;
start_pressure = 5066.26
},
/turf/simulated/floor/plating{
@@ -9554,7 +9550,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "fang_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
dir = 4
@@ -10567,7 +10562,6 @@
pixel_y = 28
},
/obj/structure/mirror{
- layer = 2.98;
pixel_y = 34
},
/turf/simulated/floor/tiled/freezer{
diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm
index 087ab545925..861795ff233 100644
--- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm
+++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm
@@ -33,7 +33,6 @@
"aH" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/structure/window/reinforced{
dir = 1
@@ -732,7 +731,6 @@
"oR" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/structure/window/reinforced{
dir = 8
diff --git a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm
index f44d8cf8e46..5bebb148cd2 100644
--- a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm
+++ b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm
@@ -337,7 +337,6 @@
/area/saniorios_smuggler)
"lf" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/turf/simulated/floor/shuttle/black{
temperature = 278.15
diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm
index 2f74c9e7714..b69fa0920d8 100644
--- a/maps/away/away_site/tajara/scrapper/scrapper.dmm
+++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm
@@ -417,7 +417,6 @@
/area/shuttle/scrapper_ship/bridge)
"fd" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
@@ -447,7 +446,6 @@
/area/scrapper_base/atmos)
"fq" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
@@ -478,7 +476,6 @@
dir = 6
},
/obj/structure/extinguisher_cabinet/west{
- layer = 3.3;
pixel_y = 1
},
/turf/simulated/floor/plating{
@@ -1022,7 +1019,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_scrapper";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 4
@@ -1620,7 +1616,6 @@
/obj/effect/floor_decal/corner/beige/full,
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/structure/window/reinforced{
@@ -1700,7 +1695,6 @@
dir = 6
},
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3;
pixel_y = 1
},
/turf/simulated/floor/tiled/dark,
@@ -2255,7 +2249,6 @@
/area/shuttle/scrapper_ship/storage)
"CM" = (
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3;
pixel_y = 1
},
/turf/simulated/floor/tiled/dark,
@@ -2330,7 +2323,6 @@
/area/scrapper_base)
"Et" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/empty{
name = "waste canister"
@@ -2681,7 +2673,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "tajara_scrapper_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
dir = 4
@@ -2692,7 +2683,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_scrapper";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/obj/effect/floor_decal/industrial/warning{
@@ -2984,7 +2974,6 @@
},
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/obj/structure/window/reinforced{
dir = 4
@@ -3339,7 +3328,6 @@
dir = 9
},
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3;
pixel_y = 1
},
/turf/simulated/floor/plating{
@@ -3364,7 +3352,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "tajara_scrapper_hatch";
- layer = 2.8;
name = "Ship External Access";
open_layer = 2.8;
dir = 4
@@ -3491,7 +3478,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_scrapper";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
index f0f8fb2d947..79d365dd5a2 100644
--- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
+++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
@@ -7,7 +7,6 @@
/area/tajara_safehouse)
"ab" = (
/obj/structure/extinguisher_cabinet/west{
- layer = 3.3
},
/turf/simulated/floor/tiled/dark,
/area/tajara_safehouse)
@@ -236,7 +235,6 @@
pixel_y = 20
},
/obj/structure/mirror{
- layer = 2.98;
pixel_y = 34
},
/obj/machinery/light/small{
@@ -678,7 +676,6 @@
/area/tajara_safehouse/hangar)
"th" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
@@ -1077,7 +1074,6 @@
/area/tajara_safehouse)
"JI" = (
/obj/structure/extinguisher_cabinet/east{
- layer = 3.3
},
/turf/simulated/floor/tiled/dark,
/area/tajara_safehouse)
diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
index c2320756296..0d3d20c3160 100644
--- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
+++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
@@ -1356,7 +1356,6 @@
"iaO" = (
/obj/machinery/body_scanconsole{
dir = 1;
- layer = 3.01;
pixel_y = 6
},
/turf/simulated/floor/shuttle/white,
@@ -2269,7 +2268,6 @@
"nfi" = (
/obj/structure/toilet{
dir = 4;
- layer = 2.6;
pixel_y = 1
},
/obj/structure/extinguisher_cabinet/west,
@@ -2543,7 +2541,6 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -2704,7 +2701,6 @@
pixel_y = 7
},
/obj/item/storage/box/fancy/cigarettes/cigar{
- layer = 3.01;
pixel_x = -5;
pixel_y = 6
},
@@ -3003,7 +2999,6 @@
"rYF" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8;
name = "primary engine control pump"
},
/obj/structure/lattice/catwalk/indoor,
@@ -3040,7 +3035,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "tcfl_peacekeeper_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "tcfl_peacekeeper_ship_pump";
tag_chamber_sensor = "tcfl_peacekeeper_ship_sensor";
diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm
index bb49a40f3ff..d328335a388 100644
--- a/maps/away/ships/casino/casino.dmm
+++ b/maps/away/ships/casino/casino.dmm
@@ -4839,7 +4839,6 @@
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/atmospherics/portables_connector{
dir = 4;
- layer = 2.8
},
/turf/simulated/floor/plating,
/area/casino/casino_crew_atmos)
diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
index 39878da395c..e6fa0852087 100644
--- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
+++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
@@ -1332,7 +1332,6 @@
/area/hailstorm_ship)
"iW" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8;
dir = 4
},
/obj/machinery/portable_atmospherics/canister/empty{
@@ -3665,7 +3664,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
frequency = 1380;
id_tag = "hailstorm_shuttle";
- layer = 3.3;
master_tag = "hailstorm_shuttle";
tag_airpump = "hailstorm_shuttle_pump";
tag_chamber_sensor = "hailstorm_shuttle_sensor";
@@ -3768,7 +3766,6 @@
/area/hailstorm_ship/gun_deck/second)
"Uy" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8;
dir = 8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
diff --git a/maps/away/ships/einstein/ee_spy_ship.dmm b/maps/away/ships/einstein/ee_spy_ship.dmm
index d6de5f19ae4..02b20f9cd30 100644
--- a/maps/away/ships/einstein/ee_spy_ship.dmm
+++ b/maps/away/ships/einstein/ee_spy_ship.dmm
@@ -118,7 +118,6 @@
"aJd" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/ee_spy_ship)
@@ -397,7 +396,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "ee_spy_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "ee_spy_ship_pump";
tag_chamber_sensor = "ee_spy_ship_sensor";
@@ -502,7 +500,6 @@
"hdb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
@@ -846,7 +843,6 @@
/area/ship/ee_spy_ship)
"ofY" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm
index cf3ba068262..77b3ce52a36 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dmm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dmm
@@ -3755,7 +3755,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
frequency = 1380;
id_tag = "kataphract_shuttle";
- layer = 3.3;
master_tag = "kataphract_transport";
pixel_x = 27;
pixel_y = -2;
@@ -4866,7 +4865,6 @@
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
- layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = -32;
pixel_y = 0
@@ -8007,7 +8005,6 @@
"Ci" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8
},
/obj/structure/cable/green{
d1 = 1;
@@ -8850,7 +8847,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "kata_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "kata_ship_pump";
tag_chamber_sensor = "kata_ship_sensor";
diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm
index 08ce7e6dc34..7673ff43294 100644
--- a/maps/away/ships/pra/database_freighter/database_freighter.dmm
+++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm
@@ -3825,7 +3825,6 @@
/area/database_freighter/eva)
"Jn" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
index 2c7371f78a9..4edcfeb6f5f 100644
--- a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
+++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
@@ -241,7 +241,6 @@
"aJd" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
@@ -586,7 +585,6 @@
/area/ship/fsf_patrol_ship)
"dTw" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
@@ -1085,7 +1083,6 @@
"hdb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/decal/cleanable/dirt,
@@ -1135,7 +1132,6 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -1260,7 +1256,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "sfa_patrol_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "sfa_patrol_ship_pump";
tag_chamber_sensor = "sfa_patrol_ship_sensor";
@@ -1598,7 +1593,6 @@
name = "trashbin"
},
/obj/item/clothing/gloves/black_leather{
- layer = 2.98
},
/turf/simulated/floor/tiled{
name = "cooled floor";
diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
index d7812fe1d8a..25363e9d73e 100644
--- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
@@ -309,7 +309,6 @@
"aJd" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/sfa_patrol_ship/Engine2)
@@ -963,7 +962,6 @@
/area/ship/sfa_patrol_ship/Engine2)
"dTw" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
@@ -1085,7 +1083,6 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -1877,7 +1874,6 @@
"hdb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/decal/cleanable/dirt,
@@ -2049,7 +2045,6 @@
/area/ship/sfa_patrol_ship/Quarters)
"hYx" = (
/obj/machinery/status_display{
- layer = 4;
pixel_y = 32
},
/obj/structure/window/reinforced{
@@ -2121,7 +2116,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "sfa_patrol_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "sfa_patrol_ship_pump";
tag_chamber_sensor = "sfa_patrol_ship_sensor";
@@ -2522,7 +2516,6 @@
"jEV" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/sfa_patrol_ship/Engine1)
@@ -3884,7 +3877,6 @@
name = "trashbin"
},
/obj/item/clothing/gloves/black_leather{
- layer = 2.98
},
/obj/structure/cable/green{
d1 = 4;
@@ -4375,7 +4367,6 @@
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/atmospherics/portables_connector{
dir = 8;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/sfa_patrol_ship/Engineering)
diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
index a94d8d8204e..9223a7e1422 100644
--- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
+++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
@@ -134,7 +134,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -202,7 +201,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/turf/simulated/floor{
temperature = 278.15
@@ -351,7 +349,6 @@
frequency = 1337;
icon_state = "door_locked";
id_tag = "smuggler_cargo_hatch";
- layer = 2.8;
name = "Cargo Hold";
open_layer = 2.8;
dir = 4
@@ -399,7 +396,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/machinery/light/small,
/turf/simulated/floor{
@@ -450,7 +446,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/obj/machinery/door/blast/shutters{
@@ -516,7 +511,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/turf/simulated/floor/airless,
/area/shuttle/tajaran_smuggler_cargo)
@@ -612,7 +606,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/obj/machinery/door/blast/shutters{
@@ -894,7 +887,6 @@
"ePD" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
- layer = 2.8
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green{
@@ -972,7 +964,6 @@
"fjf" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
@@ -1302,7 +1293,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/turf/simulated/floor/airless,
/area/shuttle/tajaran_smuggler_cargo)
@@ -1345,7 +1335,6 @@
"gXD" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green{
@@ -2257,7 +2246,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -2576,7 +2564,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/obj/machinery/door/blast/shutters{
@@ -2669,7 +2656,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/obj/structure/cable/green{
d1 = 1;
@@ -3139,7 +3125,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "tajara_smuggler";
- layer = 2.9
},
/turf/simulated/floor{
temperature = 278.15
@@ -3153,7 +3138,6 @@
/area/tajaran_smuggler)
"rAo" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black{
@@ -3322,7 +3306,6 @@
req_access = null
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -3801,7 +3784,6 @@
/area/shuttle/tajaran_smuggler_cargo)
"xeO" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor{
diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
index 1e7e7059e2e..d75e0716104 100644
--- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
+++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
@@ -333,7 +333,6 @@
"lE" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4;
opacity = 0
},
/obj/item/bedsheet/brown,
@@ -556,7 +555,6 @@
},
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4;
opacity = 0
},
/obj/item/bedsheet/brown,
diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm
index b6f5c6d87a9..214f0ebdc41 100644
--- a/maps/away/ships/wildlands_militia/militia_ship.dmm
+++ b/maps/away/ships/wildlands_militia/militia_ship.dmm
@@ -157,7 +157,6 @@
"aJd" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor,
/area/ship/militia_ship)
@@ -649,7 +648,6 @@
"hdb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8;
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
@@ -1126,7 +1124,6 @@
/area/ship/militia_ship)
"ofY" = (
/obj/machinery/atmospherics/portables_connector{
- layer = 2.8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/shuttle/black,
@@ -1180,7 +1177,6 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -1723,7 +1719,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "militia_ship_port";
- layer = 3.3;
pixel_y = 28;
tag_airpump = "militia_ship_pump";
tag_chamber_sensor = "militia_ship_sensor";
diff --git a/maps/dungeon_spawns/coc_ship_unique.dmm b/maps/dungeon_spawns/coc_ship_unique.dmm
index 770a60ed87a..2de22c9c0fa 100644
--- a/maps/dungeon_spawns/coc_ship_unique.dmm
+++ b/maps/dungeon_spawns/coc_ship_unique.dmm
@@ -89,7 +89,6 @@
"ci" = (
/obj/structure/shuttle_part/raider{
icon_state = "19,3";
- layer = 3.5;
outside_part = 0
},
/obj/item/ammo_casing/gauss,
@@ -959,7 +958,6 @@
pixel_x = 1
},
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/turf/simulated/floor/tiled/white,
/area/dungeon/crashed_ship)
@@ -981,7 +979,6 @@
pixel_x = 1
},
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/turf/simulated/floor/tiled/white,
/area/dungeon/crashed_ship)
@@ -1386,7 +1383,6 @@
"Ci" = (
/obj/structure/shuttle_part/raider{
icon_state = "6,3";
- layer = 3.5;
outside_part = 0
},
/obj/item/storage/firstaid/o2{
@@ -1441,7 +1437,6 @@
"DK" = (
/obj/structure/shuttle_part/raider{
icon_state = "15,3";
- layer = 3.5;
outside_part = 0
},
/obj/structure/table/steel,
diff --git a/maps/dungeon_spawns/satellite_crash_unique.dmm b/maps/dungeon_spawns/satellite_crash_unique.dmm
index 0eba371f384..8f902ecf458 100644
--- a/maps/dungeon_spawns/satellite_crash_unique.dmm
+++ b/maps/dungeon_spawns/satellite_crash_unique.dmm
@@ -35,7 +35,6 @@
"i" = (
/obj/effect/decal/cleanable/liquid_fuel,
/obj/structure/computerframe{
- layer = 3.1
},
/obj/item/device/gps,
/obj/item/material/shard,
diff --git a/maps/dungeon_spawns/skrell_crash_unique.dmm b/maps/dungeon_spawns/skrell_crash_unique.dmm
index a22443f7f2c..50f15c054f4 100644
--- a/maps/dungeon_spawns/skrell_crash_unique.dmm
+++ b/maps/dungeon_spawns/skrell_crash_unique.dmm
@@ -862,7 +862,6 @@
/obj/item/powerdrill,
/obj/item/landmine/frag{
deployed = 1;
- layer = 2
},
/turf/simulated/floor/shuttle/advanced,
/area/dungeon/skrell_ship)
diff --git a/maps/dungeon_spawns/sol_bunker_unique.dmm b/maps/dungeon_spawns/sol_bunker_unique.dmm
index 00cc2bd5d6c..1d066f92989 100644
--- a/maps/dungeon_spawns/sol_bunker_unique.dmm
+++ b/maps/dungeon_spawns/sol_bunker_unique.dmm
@@ -854,7 +854,6 @@
pixel_x = 1
},
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/turf/simulated/floor/wood{
nitrogen = 0;
@@ -898,7 +897,6 @@
/area/dungeon/sol_outpost)
"cG" = (
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/obj/effect/decal/fake_object{
density = 1;
@@ -1136,7 +1134,6 @@
density = 1;
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_open_0";
- layer = 2.99;
name = "broken turret"
},
/obj/effect/decal/cleanable/dirt,
diff --git a/maps/dungeon_spawns/vault_unique.dmm b/maps/dungeon_spawns/vault_unique.dmm
index 131d74ade51..062e3e786ae 100644
--- a/maps/dungeon_spawns/vault_unique.dmm
+++ b/maps/dungeon_spawns/vault_unique.dmm
@@ -214,7 +214,6 @@
},
/obj/machinery/airlock_sensor{
id_tag = "hidden_vault_airlock_sensor";
- layer = 3.3;
pixel_x = -24
},
/obj/machinery/light/small/emergency,
diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm
index 7d192b46ed1..ec511a6e826 100644
--- a/maps/event/idris_cruise/idris_cruise-1.dmm
+++ b/maps/event/idris_cruise/idris_cruise-1.dmm
@@ -55,7 +55,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -120,7 +119,6 @@
"aaw" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/random/pottedplant,
@@ -388,7 +386,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -528,7 +525,6 @@
"arl" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -836,7 +832,6 @@
"aDi" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -851,11 +846,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/adv{
@@ -863,11 +856,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/adv{
@@ -1075,7 +1066,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -1516,7 +1506,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -1597,7 +1586,6 @@
"bcl" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/random/pottedplant,
@@ -1841,7 +1829,6 @@
/area/cruise/jungle)
"blf" = (
/obj/item/gun/projectile/automatic/rifle/z8{
- layer = 2.99;
pixel_y = 10
},
/obj/item/gun/projectile/automatic/rifle/z8{
@@ -2023,7 +2010,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/turf/template_noop,
@@ -2042,7 +2028,6 @@
/area/cruise/fore)
"bqt" = (
/obj/structure/flora/tree/jungle{
- layer = 9.1
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -2117,7 +2102,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -3412,12 +3396,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -3568,7 +3550,6 @@
desc = "A gigantic thruster in delightful Idris colors. This thing's used to look as fabulous as it is efficient, with its thruster plume resembling a shooting star.";
icon = 'icons/effects/160x160.dmi';
icon_state = "idris_ship_engine";
- layer = 9;
name = "starslinger thruster";
opacity = 0;
pixel_y = -128
@@ -3773,7 +3754,6 @@
/obj/structure/flora/grass/jungle,
/obj/structure/flora/tree/jungle{
icon_state = "tree2";
- layer = 9.2
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -4346,7 +4326,6 @@
desc = "A big, sad derelict hovercar!";
icon = 'icons/effects/64x64.dmi';
icon_state = "derelict_hovercar";
- layer = 9;
name = "derelict hovercar"
},
/obj/structure/flora/grass/jungle{
@@ -4372,7 +4351,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -4403,7 +4381,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -4530,7 +4507,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9.1;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -4648,7 +4624,6 @@
"dBm" = (
/obj/structure/flora/tree/jungle/small{
icon_state = "tree2";
- layer = 9.12
},
/obj/structure/flora/grass/jungle,
/turf/unsimulated/floor{
@@ -4730,7 +4705,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -5067,7 +5041,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-5";
- layer = 10.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -5204,7 +5177,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -5489,7 +5461,6 @@
"erJ" = (
/obj/structure/bed/stool/padded/red,
/obj/structure/sink/kitchen{
- layer = 3.5;
pixel_x = 6;
pixel_y = 27
},
@@ -5987,7 +5958,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/structure/closet/crate/large,
@@ -6556,7 +6526,6 @@
desc = "A nondescript shower drain.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "shower drain";
pixel_x = 9;
pixel_y = -14
@@ -6792,13 +6761,11 @@
/area/cruise/central)
"fsh" = (
/obj/structure/flora/tree/jungle/small{
- layer = 9.12
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -7034,7 +7001,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -7150,7 +7116,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -7259,7 +7224,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -7313,7 +7277,6 @@
desc = "A nondescript shower drain.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "shower drain";
pixel_x = 9;
pixel_y = -14
@@ -7429,7 +7392,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -7629,7 +7591,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -7691,7 +7652,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -7943,7 +7903,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -8129,7 +8088,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -8445,7 +8403,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -8466,7 +8423,6 @@
"gBO" = (
/obj/structure/flora/tree/jungle/small{
icon_state = "tree2";
- layer = 9.12
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -8525,7 +8481,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -8892,7 +8847,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -9061,7 +9015,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -9082,7 +9035,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -9097,7 +9049,6 @@
"hbr" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.1
},
/turf/unsimulated/floor{
desc = "Gloomy, depressing grass...";
@@ -9784,7 +9735,6 @@
desc = "A nondescript shower drain.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "shower drain";
pixel_x = 9;
pixel_y = -14
@@ -9928,7 +9878,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -9963,7 +9912,6 @@
"hQs" = (
/obj/structure/flora/tree/jungle/small{
icon_state = "tree2";
- layer = 9.12
},
/turf/unsimulated/floor{
desc = "Gloomy, depressing grass...";
@@ -10177,7 +10125,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/turf/template_noop,
@@ -10291,13 +10238,11 @@
"ieV" = (
/obj/structure/flora/tree/jungle/small{
icon_state = "tree2";
- layer = 9.12
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -10322,7 +10267,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -10412,7 +10356,6 @@
"ijF" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -10492,7 +10435,6 @@
"imp" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.11
},
/turf/unsimulated/floor{
desc = "Gloomy, depressing grass...";
@@ -10518,7 +10460,6 @@
desc = "A gigantic thruster in desaturated Conglomerate colors.";
icon = 'icons/effects/160x160.dmi';
icon_state = "scc_ship_engine";
- layer = 9;
name = "hyperefficient thruster";
pixel_y = -128
},
@@ -10550,7 +10491,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -10691,7 +10631,6 @@
"isP" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.11
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -10833,7 +10772,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -11046,7 +10984,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -11104,7 +11041,6 @@
desc = "A gigantic thruster in delightful Idris colors. This thing's used to look as fabulous as it is efficient, with its thruster plume resembling a shooting star.";
icon = 'icons/effects/160x160.dmi';
icon_state = "idris_ship_engine";
- layer = 9;
name = "starslinger thruster";
opacity = 0;
pixel_y = -128
@@ -11747,17 +11683,14 @@
pixel_y = 2
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
/obj/item/clothing/mask/gas/tactical{
- layer = 2.99;
pixel_x = -1;
pixel_y = 5
},
@@ -11952,11 +11885,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/structure/sign/nosmoking_1{
pixel_y = 30
@@ -11994,7 +11925,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -12048,7 +11978,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -12117,7 +12046,6 @@
desc = "A gigantic thruster in delightful Idris colors. This thing's used to look as fabulous as it is efficient, with its thruster plume resembling a shooting star.";
icon = 'icons/effects/160x160.dmi';
icon_state = "idris_ship_engine";
- layer = 9;
name = "starslinger thruster";
opacity = 0;
pixel_y = -128
@@ -12392,7 +12320,6 @@
"jRb" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/fancy/wood{
@@ -12937,7 +12864,6 @@
"knz" = (
/obj/structure/table/rack,
/obj/item/gun/energy/rifle/ionrifle{
- layer = 2.99;
pixel_y = 6
},
/obj/item/gun/energy/rifle/ionrifle{
@@ -13013,11 +12939,9 @@
pixel_y = -5
},
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = -10
},
/obj/item/storage/firstaid/fire{
- layer = 2.99;
pixel_x = 4
},
/obj/item/storage/box/gloves{
@@ -13134,7 +13058,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -13160,13 +13083,11 @@
"kuu" = (
/obj/structure/flora/tree/jungle/small{
icon_state = "tree2";
- layer = 9.12
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -13405,7 +13326,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor/plating,
@@ -13657,7 +13577,6 @@
"kQi" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/machinery/door/firedoor,
@@ -14044,7 +13963,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -14267,13 +14185,11 @@
/area/cruise/centerline)
"lpP" = (
/obj/structure/flora/tree/jungle/small{
- layer = 9.12
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -14376,14 +14292,12 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -14485,82 +14399,66 @@
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/structure/table/stone/marble,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
@@ -14761,7 +14659,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9.1;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -14790,7 +14687,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -14895,7 +14791,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -14910,7 +14805,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -15200,7 +15094,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -15253,7 +15146,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -15271,7 +15163,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -15633,7 +15524,6 @@
"mnl" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -16148,7 +16038,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -16280,52 +16169,42 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = 5
},
@@ -16341,7 +16220,6 @@
/area/cruise/pool)
"mOx" = (
/obj/structure/flora/tree/jungle/small{
- layer = 9.12
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -16520,11 +16398,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/effect/floor_decal/corner/lime/diagonal,
@@ -16533,11 +16409,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/unsimulated/floor{
@@ -16589,7 +16463,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -16607,7 +16480,6 @@
"mYa" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.11
},
/obj/structure/flora/grass/jungle,
/turf/unsimulated/floor{
@@ -16629,13 +16501,11 @@
"mZW" = (
/obj/structure/flora/grass/jungle,
/obj/structure/flora/tree/jungle{
- layer = 9.1
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -16792,7 +16662,6 @@
dir = 9
},
/obj/structure/closet/walllocker/emerglocker/north{
- layer = 3;
pixel_x = -1;
pixel_y = 29
},
@@ -16911,7 +16780,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -17169,7 +17037,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -17326,12 +17193,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -17408,7 +17273,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -17896,7 +17760,6 @@
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/machinery/body_scanconsole{
dir = 1;
- layer = 3.01;
pixel_y = 6
},
/turf/unsimulated/floor{
@@ -17962,7 +17825,6 @@
"ogR" = (
/obj/structure/table/standard,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/unsimulated/floor{
@@ -18031,7 +17893,6 @@
/area/cruise/beach)
"ojQ" = (
/obj/structure/closet/walllocker/emerglocker/north{
- layer = 3;
pixel_x = -1;
pixel_y = 29
},
@@ -18619,7 +18480,6 @@
desc = "An automated gun turret, it shoots bad code so you do not encounter any weird glitches or hackers...";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "code firewall point defense"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -18680,12 +18540,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -18947,7 +18805,6 @@
"oXT" = (
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/structure/sink/kitchen{
- layer = 3.5;
pixel_y = 27
},
/obj/machinery/icecream_vat,
@@ -19238,7 +19095,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -19380,12 +19236,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -19427,14 +19281,12 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -19712,14 +19564,12 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -19931,14 +19781,12 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "4-8";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -20154,7 +20002,6 @@
"pXi" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/random/pottedplant,
@@ -20679,7 +20526,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -20865,7 +20711,6 @@
/area/cruise/hydroponics)
"qEZ" = (
/obj/structure/flora/tree/jungle{
- layer = 9.11
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -20883,7 +20728,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -20964,7 +20808,6 @@
"qIH" = (
/obj/structure/table/standard,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/unsimulated/floor{
@@ -21080,7 +20923,6 @@
desc = "A gigantic thruster in delightful Idris colors. This thing's used to look as fabulous as it is efficient, with its thruster plume resembling a shooting star.";
icon = 'icons/effects/160x160.dmi';
icon_state = "idris_ship_engine";
- layer = 9;
name = "starslinger thruster";
opacity = 0;
pixel_y = -128
@@ -21162,13 +21004,11 @@
"qSc" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.11
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -21203,7 +21043,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/template_noop,
@@ -21418,7 +21257,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -21529,7 +21367,6 @@
desc = "An automated gun turret, it shoots bad code so you do not encounter any weird glitches or hackers...";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "code firewall point defense"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -22103,7 +21940,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/obj/effect/decal/fake_object{
@@ -22269,7 +22105,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -22303,7 +22138,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -22358,7 +22192,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks1";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -22571,7 +22404,6 @@
"ses" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots,
@@ -23500,7 +23332,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -23580,7 +23411,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -23615,7 +23445,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -23641,7 +23470,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -23680,7 +23508,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -23742,7 +23569,6 @@
desc = "A true to life depiction of a Jotun main battle tank, once used to kill quite a lot of people in a war a really long time ago! Wow! Horrifying. It's beached and immobile.";
icon = 'icons/mecha/mecha_114x59.dmi';
icon_state = "jotun-broken";
- layer = 9;
name = "beached Jotun main battle tank";
pixel_x = -44
},
@@ -23757,7 +23583,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -23935,7 +23760,6 @@
desc = "A gigantic thruster in desaturated Conglomerate colors.";
icon = 'icons/effects/160x160.dmi';
icon_state = "scc_ship_engine";
- layer = 9;
name = "hyperefficient thruster";
pixel_y = -128
},
@@ -23991,14 +23815,12 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/item/storage/firstaid/toxin{
pixel_x = 6;
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/turf/unsimulated/floor{
dir = 8;
@@ -24052,7 +23874,6 @@
"tne" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -24102,7 +23923,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -24220,7 +24040,6 @@
/area/cruise/library)
"tuz" = (
/obj/structure/sink/kitchen{
- layer = 3.5;
name = "sink";
pixel_y = 23
},
@@ -24724,7 +24543,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/unsimulated/floor{
@@ -24897,7 +24715,6 @@
desc = "A true to life depiction of a Jotun main battle tank, once used to kill quite a lot of people in a war a really long time ago! Wow! Horrifying. It's beached and immobile.";
icon = 'icons/mecha/mecha_114x59.dmi';
icon_state = "jotun-broken";
- layer = 9;
name = "beached Jotun main battle tank";
pixel_x = -44
},
@@ -24924,7 +24741,6 @@
"tWe" = (
/obj/structure/flora/tree/jungle{
icon_state = "tree3";
- layer = 9.1
},
/turf/unsimulated/floor{
footstep_sound = /singleton/sound_category/grass_footstep;
@@ -24960,11 +24776,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/adv{
@@ -24972,11 +24786,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/unsimulated/floor{
@@ -25379,7 +25191,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -25530,7 +25341,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -25573,7 +25383,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -25893,7 +25702,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -26775,7 +26583,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -26835,7 +26642,6 @@
desc = "A lush and healthy bush.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "bush";
- layer = 9.1;
name = "bush";
pixel_x = -16
},
@@ -27128,7 +26934,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/turf/unsimulated/floor{
@@ -27298,7 +27103,6 @@
desc = "A big, scary derelict mech!";
icon = 'icons/effects/96x96.dmi';
icon_state = "derelict_mech";
- layer = 9;
name = "derelict mech"
},
/obj/structure/flora/grass/jungle{
@@ -27489,7 +27293,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -27520,7 +27323,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -27680,7 +27482,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp";
@@ -28493,13 +28294,11 @@
/area/cruise/beach_bar)
"wQN" = (
/obj/structure/flora/tree/jungle{
- layer = 9.1
},
/obj/structure/flora/tree/jungle/small{
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -28535,7 +28334,6 @@
color = "#ff0000";
icon = 'icons/obj/power_cond_white.dmi';
icon_state = "1-2";
- layer = 2.6;
name = "cable"
},
/turf/template_noop,
@@ -28717,7 +28515,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_r";
- layer = 9;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -29106,7 +28903,6 @@
pixel_y = -11
},
/obj/item/reagent_containers/hypospray/cmo{
- layer = 2.99;
pixel_x = -2;
pixel_y = -3
},
@@ -29144,7 +28940,6 @@
desc = "A cozy lamp.";
icon = 'icons/effects/32x96.dmi';
icon_state = "rustlamp_l";
- layer = 9.1;
light_color = "#FA644B";
light_range = 6;
name = "rusty lamp"
@@ -29304,7 +29099,6 @@
"xvq" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/obj/item/flame/candle,
@@ -29499,7 +29293,6 @@
/area/cruise/beach)
"xBm" = (
/obj/structure/closet/walllocker/emerglocker/north{
- layer = 3;
pixel_x = -1;
pixel_y = 29
},
@@ -29585,7 +29378,6 @@
"xEM" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/storage/bag/inflatable,
/obj/item/storage/bag/inflatable,
@@ -29659,7 +29451,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks2";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -29856,7 +29647,6 @@
desc = "A pile of unassuming rocks.";
icon = 'icons/obj/flora/largejungleflora.dmi';
icon_state = "rocks3";
- layer = 2.5;
name = "rocks";
pixel_x = -16;
pixel_y = -16
@@ -29966,7 +29756,6 @@
desc = "A gigantic thruster in desaturated Conglomerate colors.";
icon = 'icons/effects/160x160.dmi';
icon_state = "scc_ship_engine";
- layer = 9;
name = "hyperefficient thruster";
pixel_y = -128
},
@@ -30017,7 +29806,6 @@
desc = "An automated gun turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_0";
- layer = 3.02;
name = "turret"
},
/obj/effect/floor_decal/industrial/warning/full,
@@ -30160,7 +29948,6 @@
desc = "A huge lamp post.";
icon = 'icons/effects/32x96.dmi';
icon_state = "lamp_on";
- layer = 9;
name = "tall lamp post";
opacity = 1
},
@@ -30205,7 +29992,6 @@
desc = "A nondescript shower drain.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "shower drain";
pixel_x = 9;
pixel_y = -14
diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm
index 7f67283a481..c73b6f0d885 100644
--- a/maps/event/rooftop/rooftop-1.dmm
+++ b/maps/event/rooftop/rooftop-1.dmm
@@ -113,7 +113,6 @@
desc = "The distant cityscape of Mendell City.";
icon = 'icons/effects/1152x544.dmi';
icon_state = "cityscape_bg";
- layer = 2.01;
name = "Mendell City"
},
/turf/simulated/abyss{
@@ -253,11 +252,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/adv{
@@ -265,11 +262,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/unsimulated/floor{
@@ -369,7 +364,6 @@
"bH" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/gold,
@@ -398,7 +392,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf1";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -605,11 +598,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/effect/floor_decal/corner/lime/diagonal,
@@ -618,11 +609,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/turf/unsimulated/floor{
@@ -840,7 +829,6 @@
desc = "It's used to monitor rooms.";
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/simulated/floor/tiled/dark,
@@ -911,7 +899,6 @@
dir = 8;
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/simulated/floor/wood,
@@ -1001,7 +988,6 @@
desc = "It's used to monitor rooms.";
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/simulated/floor/lino,
@@ -1357,11 +1343,9 @@
"gE" = (
/obj/structure/table/rack,
/obj/item/storage/briefcase/aluminium{
- layer = 2.99;
pixel_y = 6
},
/obj/item/storage/briefcase/aluminium{
- layer = 2.99;
pixel_y = 6
},
/obj/item/storage/lockbox/cciaa/bssb{
@@ -1382,7 +1366,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -1409,7 +1392,6 @@
"gO" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -1529,7 +1511,6 @@
density = 1;
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutterhalf";
- layer = 2.4;
name = "shutter"
},
/obj/effect/decal/fake_object{
@@ -1547,7 +1528,6 @@
desc = "A huge lamp post.";
icon = 'icons/effects/32x96.dmi';
icon_state = "lamp_on";
- layer = 9;
name = "tall lamp post";
opacity = 1
},
@@ -1644,7 +1624,6 @@
desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed.";
icon = 'icons/effects/city.dmi';
icon_state = "flatscreen";
- layer = 9;
name = "expensive flatscreen holovision";
pixel_y = 15
},
@@ -1697,7 +1676,6 @@
"il" = (
/obj/structure/table/standard,
/obj/item/storage/box/fancy/tray{
- layer = 2.99
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/unsimulated/floor{
@@ -1838,7 +1816,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/item/storage/firstaid/toxin{
@@ -1846,7 +1823,6 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/structure/sign/nosmoking_1{
pixel_y = 30
@@ -2052,7 +2028,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
@@ -2090,7 +2065,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/obj/effect/decal/warning_stripes,
@@ -2117,7 +2091,6 @@
"kS" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/wood,
@@ -2167,7 +2140,6 @@
/obj/machinery/light/small,
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -2289,7 +2261,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
@@ -2331,12 +2302,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -2369,7 +2338,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -2386,7 +2354,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
@@ -2933,7 +2900,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "inconveniently placed crate";
pixel_x = 1
},
@@ -2942,7 +2908,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.01;
name = "inconveniently placed crate";
pixel_x = 3;
pixel_y = 8
@@ -2951,7 +2916,6 @@
desc = "What jerk stacked these here?";
icon = 'icons/obj/crate.dmi';
icon_state = "tcfl_crate_preview";
- layer = 3.02;
name = "inconveniently placed crate";
pixel_x = 2;
pixel_y = 19
@@ -3074,7 +3038,6 @@
},
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -3396,7 +3359,6 @@
dir = 8;
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/simulated/floor/tiled/dark,
@@ -3511,7 +3473,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_x = 21;
pixel_y = 9
@@ -3571,7 +3532,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf2";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -3664,7 +3624,6 @@
desc = "A big, scary derelict mech!";
icon = 'icons/effects/96x96.dmi';
icon_state = "derelict_mech";
- layer = 9;
name = "derelict mech"
},
/obj/structure/flora/grass/jungle{
@@ -3940,7 +3899,6 @@
"vS" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/simulated/floor/lino,
@@ -4225,12 +4183,10 @@
},
/obj/structure/table/rack,
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = 2;
pixel_y = 5
},
/obj/item/storage/firstaid/o2{
- layer = 2.99;
pixel_x = 2;
pixel_y = 5
},
@@ -4397,7 +4353,6 @@
},
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -4432,7 +4387,6 @@
desc = "A bland air conditioning unit.";
icon = 'icons/effects/city.dmi';
icon_state = "ac";
- layer = 2.7;
name = "AC unit"
},
/turf/simulated/floor/tiled,
@@ -4446,7 +4400,6 @@
"yl" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -4477,7 +4430,6 @@
},
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -4577,7 +4529,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_y = -12
},
@@ -4593,7 +4544,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_y = -12
},
@@ -4762,7 +4712,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf1";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -5019,7 +4968,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/turf/simulated/floor/tiled/dark,
@@ -5299,7 +5247,6 @@
desc = "A huge lamp post.";
icon = 'icons/effects/32x96.dmi';
icon_state = "lamp_on";
- layer = 9;
name = "tall lamp post";
opacity = 1
},
@@ -5347,7 +5294,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf1";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -5446,7 +5392,6 @@
"DP" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -5523,7 +5468,6 @@
desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!";
icon = 'icons/effects/city.dmi';
icon_state = "gamer_console";
- layer = 2.7;
name = "gaming console"
},
/turf/simulated/floor/carpet,
@@ -5618,7 +5562,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf1";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -5896,7 +5839,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -5931,7 +5873,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -6093,7 +6034,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_x = -3;
pixel_y = 35
@@ -6205,7 +6145,6 @@
desc = "The distant cityscape of Mendell City.";
icon = 'icons/effects/256x672.dmi';
icon_state = "cityscape";
- layer = 2.01;
name = "Mendell City"
},
/turf/simulated/abyss{
@@ -6785,7 +6724,6 @@
desc = "A big, sad derelict hovercar!";
icon = 'icons/effects/64x64.dmi';
icon_state = "derelict_hovercar";
- layer = 9;
name = "derelict hovercar"
},
/obj/structure/flora/grass/jungle{
@@ -6891,7 +6829,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
@@ -6940,7 +6877,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_y = -12
},
@@ -7031,7 +6967,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -7189,12 +7124,10 @@
},
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/thetamycin{
- layer = 2.99;
pixel_x = 9;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
- layer = 2.99;
pixel_y = 7
},
/obj/item/reagent_containers/glass/bottle/dexalin_plus{
@@ -7419,14 +7352,12 @@
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/obj/item/storage/firstaid/toxin{
pixel_x = 6;
pixel_y = 8
},
/obj/item/storage/firstaid/fire{
- layer = 3.01
},
/turf/unsimulated/floor{
dir = 8;
@@ -7969,7 +7900,6 @@
"SG" = (
/obj/structure/toilet{
dir = 4;
- layer = 2.6;
pixel_y = 1
},
/obj/machinery/light/small{
@@ -7983,7 +7913,6 @@
dir = 8;
icon = 'icons/obj/monitors.dmi';
icon_state = "camera";
- layer = 3.02;
name = "surveillance camera"
},
/turf/simulated/floor/wood,
@@ -8023,7 +7952,6 @@
desc = "A crate of military supplies.";
icon = 'icons/obj/crate.dmi';
icon_state = "dropcrate";
- layer = 3.02;
name = "metal crate";
pixel_x = 1;
pixel_y = 4
@@ -8082,7 +8010,6 @@
density = 1;
icon = 'icons/obj/doors/rapid_pdoor.dmi';
icon_state = "shutterhalf";
- layer = 2.4;
name = "shutter"
},
/turf/simulated/floor/plating,
@@ -8142,17 +8069,14 @@
},
/obj/structure/table/rack,
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
/obj/item/clothing/suit/storage/toggle/bssb{
- layer = 2.99;
pixel_x = 6;
pixel_y = 2
},
@@ -8321,7 +8245,6 @@
desc = "An automated turret.";
icon = 'icons/obj/turrets.dmi';
icon_state = "cover_1";
- layer = 3.02;
name = "turret"
},
/obj/effect/decal/warning_stripes,
@@ -8390,7 +8313,6 @@
desc = "A nondescript decorative shelf.";
icon = 'icons/effects/city.dmi';
icon_state = "shelf";
- layer = 2.7;
name = "shelf";
pixel_y = 35
},
@@ -8416,7 +8338,6 @@
desc = "A bland air conditioning unit.";
icon = 'icons/effects/city.dmi';
icon_state = "ac";
- layer = 2.7;
name = "AC unit"
},
/turf/simulated/floor/tiled,
@@ -8549,7 +8470,6 @@
desc = "Power outlets, in space!";
icon = 'icons/effects/city.dmi';
icon_state = "outlet";
- layer = 2.7;
name = "power outlets";
pixel_y = -12
},
@@ -8746,7 +8666,6 @@
desc = "The distant cityscape of Mendell City.";
icon = 'icons/effects/1152x544.dmi';
icon_state = "cityscale_scrolling";
- layer = 2.01;
name = "Mendell City"
},
/turf/simulated/abyss{
@@ -8899,7 +8818,6 @@
desc = "A huge pillar! It's holding up a roof.";
icon = 'icons/effects/32x96.dmi';
icon_state = "pillar";
- layer = 9;
name = "tall white pillar";
opacity = 1
},
@@ -8911,7 +8829,6 @@
"Yd" = (
/obj/structure/curtain/black{
icon_state = "open";
- layer = 4.1;
opacity = 0
},
/turf/unsimulated/floor{
@@ -8973,7 +8890,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
@@ -9034,11 +8950,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/adv{
@@ -9046,11 +8960,9 @@
pixel_y = 8
},
/obj/item/storage/firstaid/o2{
- layer = 3.01;
pixel_x = -13
},
/obj/item/storage/firstaid/regular{
- layer = 3.01;
pixel_x = 6
},
/obj/item/storage/firstaid/adv{
@@ -9244,7 +9156,6 @@
desc = "A nondescript vent.";
icon = 'icons/effects/city.dmi';
icon_state = "vent";
- layer = 2.7;
name = "wall vent";
pixel_x = 6;
pixel_y = 25
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
index 1da7652152d..62b8eebc48e 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
@@ -214,7 +214,6 @@
/area/adhomai_bar)
"lk" = (
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -5
},
@@ -223,7 +222,6 @@
pixel_y = 10
},
/obj/item/material/knife{
- layer = 2.99;
pixel_x = -9
},
/obj/structure/table/wood,
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm
index 6584fdf3b9f..4cd687a3529 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm
@@ -5,7 +5,6 @@
},
/obj/structure/barricade/wooden{
dir = 4;
- layer = 2.95
},
/turf/simulated/floor/wood{
temperature = 268.15
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
index f82bcbb9b06..7343f36ca0f 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
@@ -718,7 +718,6 @@
req_access = null
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm
index 778f95e7aad..1599cbdd1e2 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm
@@ -15,4 +15,4 @@
density = TRUE
anchored = TRUE
pixel_x = -16
- layer = ABOVE_ALL_MOB_LAYER
+ layer = ABOVE_HUMAN_LAYER
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm
index f3bffea5998..a9011f74ef4 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm
@@ -85,7 +85,6 @@
/area/exoplanet/adhomai)
"X" = (
/obj/item/clothing/accessory/dogtags/adhomai{
- layer = 2.9;
icon_state = "adhomai_dogtags_single";
item_state = "adhomai_dogtags_single";
separated = 1
diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dmm b/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dmm
index 58104c0e4c5..90f6bf74327 100644
--- a/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dmm
@@ -14,7 +14,6 @@
/obj/effect/decal/fake_object{
icon = 'icons/effects/adhomai_worm.dmi';
icon_state = "skeleton";
- layer = 4.5;
name = "glacier worm carcass";
desc = "A massive carcass of an Adhomian aquatic creature."
},
diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm
index aa163166387..27b1a81b9ae 100644
--- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm
@@ -3,7 +3,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -26,7 +25,6 @@
/obj/effect/floor_decal/industrial/warning/cee,
/obj/machinery/conveyor{
id = "pra_mining_base";
- layer = 2.9
},
/turf/simulated/floor/exoplanet/concrete,
/area/pra_mining_camp)
@@ -118,7 +116,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -198,7 +195,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -252,7 +248,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -308,7 +303,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -320,7 +314,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -384,7 +377,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "pra_mining_base";
- layer = 2.9
},
/turf/simulated/floor/exoplanet/concrete,
/area/pra_mining_camp)
@@ -409,7 +401,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "pra_mining_base";
- layer = 2.9
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -483,7 +474,6 @@
/obj/machinery/conveyor{
dir = 10;
id = "pra_mining_base";
- layer = 2.9;
reversed = 1
},
/obj/effect/floor_decal/industrial/warning{
@@ -529,7 +519,6 @@
/obj/machinery/conveyor{
dir = 9;
id = "pra_mining_base";
- layer = 2.9;
reversed = 1
},
/obj/effect/floor_decal/industrial/warning{
diff --git a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm
index 9ec87185f6e..3f50c9442fe 100644
--- a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm
+++ b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm
@@ -336,7 +336,6 @@
pixel_x = 1
},
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/turf/simulated/floor/tiled/white/airless,
/area/template_noop)
@@ -564,7 +563,6 @@
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "coc_skipjack";
- layer = 3.3;
pixel_y = -7;
tag_airpump = "coc_skipjack_pump";
tag_chamber_sensor = "coc_skipjack_sensor";
@@ -611,7 +609,6 @@
"mG" = (
/obj/structure/shuttle_part/raider{
icon_state = "6,3";
- layer = 3.5;
outside_part = 0
},
/obj/item/storage/firstaid/o2{
@@ -774,7 +771,6 @@
"pv" = (
/obj/structure/shuttle_part/raider{
icon_state = "15,3";
- layer = 3.5;
outside_part = 0
},
/obj/structure/table/steel,
@@ -1355,7 +1351,6 @@
"CY" = (
/obj/structure/shuttle_part/raider{
icon_state = "19,3";
- layer = 3.5;
outside_part = 0
},
/obj/item/ammo_casing/gauss,
@@ -1384,7 +1379,6 @@
pixel_x = 1
},
/obj/effect/decal/cleanable/dirt{
- layer = 3.1
},
/turf/simulated/floor/tiled/white/airless,
/area/template_noop)
diff --git a/maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm
index 1abc1291a7d..f3455d8d348 100644
--- a/maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm
+++ b/maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm
@@ -41,7 +41,6 @@
"i" = (
/obj/effect/decal/cleanable/liquid_fuel,
/obj/structure/computerframe{
- layer = 3.1
},
/obj/item/device/gps,
/obj/item/material/shard,
diff --git a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
index 817366d9904..119b193eb01 100644
--- a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
+++ b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
@@ -812,7 +812,6 @@
/obj/item/powerdrill,
/obj/item/landmine/frag{
deployed = 1;
- layer = 2
},
/turf/simulated/floor/shuttle/advanced,
/area/template_noop)
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm
index 1419df0a1b5..ef4f8d55fc4 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm
@@ -55,7 +55,6 @@
/area/exoplanet/grass/konyang)
"dj" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/turf/simulated/floor/exoplanet/wood/bamboo,
/area/konyang/house_small)
@@ -82,7 +81,6 @@
/area/exoplanet/grass/konyang)
"fb" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/table/wood,
/turf/simulated/floor/exoplanet/wood/bamboo,
@@ -156,7 +154,6 @@
"jA" = (
/obj/structure/window/urban{
dir = 8;
- layer = 3.3
},
/turf/simulated/floor/exoplanet/sidewalk/dark,
/area/konyang/house_small)
@@ -167,7 +164,6 @@
/area/konyang/house_small)
"jL" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/random/dirt_75,
/turf/simulated/floor/exoplanet/wood/bamboo,
@@ -190,7 +186,6 @@
/area/konyang/house_small)
"kf" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/machinery/door/urban{
dir = 4
@@ -339,7 +334,6 @@
"re" = (
/obj/structure/window/urban{
dir = 4;
- layer = 3.3
},
/turf/simulated/floor/exoplanet/sidewalk/dark,
/area/konyang/house_small)
@@ -349,7 +343,6 @@
/area/konyang/house_small)
"rl" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/curtain/black,
/turf/simulated/floor/exoplanet/wood/bamboo,
@@ -395,7 +388,6 @@
/obj/random/dirt_75,
/obj/structure/table/rack/clothing{
dir = 4;
- layer = 3.1
},
/turf/simulated/floor/exoplanet/sidewalk/dark,
/area/konyang/house_small)
@@ -454,7 +446,6 @@
dir = 4;
icon = 'icons/effects/props/holodeck/konyang/32x32.dmi';
icon_state = "bench";
- layer = 2.4;
name = "bench"
},
/turf/simulated/floor/exoplanet/konyang,
@@ -518,11 +509,9 @@
/area/exoplanet/grass/konyang)
"yn" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/window/urban{
dir = 4;
- layer = 3.3
},
/turf/simulated/floor/exoplanet/wood/bamboo,
/area/konyang/house_small)
@@ -545,7 +534,6 @@
/area/konyang/house_small)
"BH" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/window/urban{
dir = 4
@@ -574,7 +562,6 @@
/area/exoplanet/grass/konyang)
"EF" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/bed/stool/padded/red{
dir = 8
@@ -635,7 +622,6 @@
/area/konyang/house_small)
"HQ" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/bed/stool/padded/red{
dir = 1
@@ -669,7 +655,6 @@
/area/konyang/house_small)
"Ix" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/window/urban,
/turf/simulated/floor/exoplanet/wood/bamboo,
@@ -691,7 +676,6 @@
/area/exoplanet/grass/konyang)
"IS" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/bed/stool/padded/red,
/turf/simulated/floor/exoplanet/wood/bamboo,
@@ -720,7 +704,6 @@
/area/exoplanet/grass/konyang)
"Kc" = (
/obj/structure/lattice/catwalk/indoor/planks/deep{
- layer = 2.5
},
/obj/structure/bed/stool/padded/red{
dir = 4
@@ -920,7 +903,6 @@
desc = "A bland air conditioning unit.";
icon = 'icons/effects/city.dmi';
icon_state = "ac";
- layer = 2.7;
name = "AC unit"
},
/turf/simulated/floor/exoplanet/concrete,
diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
index ad0a97d7fba..a55a7e6a9b0 100644
--- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
+++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
@@ -277,7 +277,6 @@
/obj/effect/floor_decal/industrial/warning/cee,
/obj/machinery/conveyor{
id = "okon_base_belt";
- layer = 2.9
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -513,7 +512,6 @@
/obj/machinery/conveyor{
dir = 10;
id = "okon_base_belt";
- layer = 2.9;
reversed = 1
},
/turf/simulated/floor/plating{
@@ -1112,7 +1110,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "okon_base_belt";
- layer = 2.9
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -1625,7 +1622,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "okon_base_belt";
- layer = 2.9
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -1792,7 +1788,6 @@
/obj/machinery/conveyor{
dir = 5;
id = "okon_base_belt";
- layer = 2.9;
reversed = 0
},
/turf/simulated/floor/plating{
@@ -2576,7 +2571,6 @@
req_access = null
},
/obj/item/storage/box/produce{
- layer = 2.99;
pixel_x = 3;
pixel_y = -11
},
@@ -2911,7 +2905,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "okon_base_belt";
- layer = 2.9
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -3355,7 +3348,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "okon_base_belt";
- layer = 2.9
},
/turf/simulated/floor/tiled/rust{
temperature = 278.15
diff --git a/maps/runtime/runtime-2.dmm b/maps/runtime/runtime-2.dmm
index 6e7ad7e8301..29da52760da 100644
--- a/maps/runtime/runtime-2.dmm
+++ b/maps/runtime/runtime-2.dmm
@@ -1000,7 +1000,6 @@
must_start_working = 1
},
/obj/machinery/status_display{
- layer = 4;
pixel_x = -32
},
/turf/simulated/floor/tiled{
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index f121303e1f1..d77ff6b5a0f 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -500,7 +500,6 @@
/obj/machinery/conveyor{
dir = 10;
id = "mining_1";
- layer = 2.9;
reversed = 1
},
/turf/simulated/floor/plating,
@@ -658,7 +657,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "1,12";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -1196,7 +1194,6 @@
"aUC" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -1518,7 +1515,6 @@
"beF" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox,
@@ -1595,7 +1591,6 @@
},
/obj/structure/window/shuttle/unique/scc/tall{
icon_state = "short1_top";
- layer = 3
},
/turf/simulated/floor/plating,
/area/shuttle/intrepid/quarters)
@@ -2034,7 +2029,6 @@
alarm_id = 1501;
breach_detection = 0;
dir = 4;
- layer = 4;
name = "Isolation A";
pixel_x = -24;
rcon_setting = 3;
@@ -2099,7 +2093,6 @@
},
/obj/structure/sign/emergency/evacuation{
dir = 4;
- layer = 2.1
},
/turf/simulated/floor/tiled,
/area/hangar/auxiliary)
@@ -2342,7 +2335,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/carbon_dioxide,
@@ -2500,7 +2492,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_2";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
@@ -2514,7 +2505,6 @@
},
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8;
name = "Phoron to Burn Mix"
},
/turf/simulated/floor/tiled/dark,
@@ -2769,7 +2759,6 @@
/obj/structure/tank_wall/nitrous_oxide{
density = 0;
icon_state = "h11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -2958,7 +2947,6 @@
/obj/structure/tank_wall/air{
density = 0;
icon_state = "air11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -3441,17 +3429,14 @@
/area/engineering/atmos/propulsion)
"cvz" = (
/obj/machinery/computer/ship/helm/cockpit{
- layer = 3.1;
pixel_y = -18
},
/obj/machinery/light/spot,
/obj/structure/bed/stool/chair/cockpit,
/obj/machinery/computer/shuttle_control/explore/canary{
- layer = 3;
pixel_x = 25
},
/obj/machinery/computer/ship/sensors/cockpit{
- layer = 3;
pixel_x = -25
},
/turf/simulated/floor/carpet/rubber,
@@ -3553,7 +3538,6 @@
/obj/structure/shuttle_part/scc/scout{
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
opacity = 1;
outside_part = 0
},
@@ -4593,7 +4577,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
- layer = 2.8
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -4678,7 +4661,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
@@ -4944,7 +4926,6 @@
"dsT" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner_wide/blue/full,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -5592,7 +5573,6 @@
/obj/structure/shuttle_part/scc/research{
density = 0;
icon_state = "4,11";
- layer = 2.6;
outside_part = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -5778,7 +5758,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airless,
@@ -5846,7 +5825,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/carbon_dioxide,
@@ -6341,7 +6319,6 @@
},
/obj/structure/window/shuttle/unique/scc/tall{
icon_state = "short2_top";
- layer = 3
},
/turf/simulated/floor/plating,
/area/shuttle/intrepid/crew_compartment)
@@ -6780,7 +6757,6 @@
/obj/structure/tank_wall/nitrogen{
density = 0;
icon_state = "n5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/nitrogen,
@@ -6895,7 +6871,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -7321,7 +7296,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/stock_parts/matter_bin{
pixel_y = 8
@@ -8477,7 +8451,6 @@
desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
name = "pathfinder class shuttle hull";
opacity = 1;
outside_part = 0
@@ -8665,7 +8638,6 @@
"fTm" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
- layer = 2.8;
name = "Oxidizer to Burn Mix"
},
/obj/effect/floor_decal/corner_wide/black{
@@ -8949,11 +8921,9 @@
/area/shuttle/mining)
"fZQ" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- layer = 2.8
},
/obj/machinery/access_button{
dir = 4;
- layer = 3.1;
pixel_x = -22;
pixel_y = 2
},
@@ -9063,7 +9033,6 @@
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/structure/stairs_lower/stairs_upper{
- layer = 3
},
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/deck1)
@@ -9071,7 +9040,6 @@
/obj/structure/tank_wall/nitrous_oxide{
density = 0;
icon_state = "h12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -9173,7 +9141,6 @@
alarm_id = 1502;
breach_detection = 0;
dir = 4;
- layer = 4;
name = "Isolation B";
pixel_x = -24;
rcon_setting = 3;
@@ -9291,7 +9258,6 @@
/obj/structure/railing/mapped,
/obj/structure/sign/emergency/evacuation{
dir = 8;
- layer = 2.1
},
/turf/simulated/floor/tiled,
/area/hangar/operations)
@@ -10761,7 +10727,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "7,11";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -10955,7 +10920,6 @@
/obj/structure/tank_wall/hydrogen{
density = 0;
icon_state = "h6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
@@ -11028,7 +10992,6 @@
"hwy" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide,
@@ -11091,7 +11054,6 @@
/obj/structure/tank_wall/nitrogen{
density = 0;
icon_state = "n6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/manifold/visible/green{
@@ -11263,7 +11225,6 @@
"hEh" = (
/obj/machinery/conveyor{
id = "mining_1";
- layer = 2.9
},
/obj/machinery/door/firedoor,
/obj/structure/plasticflaps/mining,
@@ -11508,7 +11469,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "1,11";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -12204,7 +12164,6 @@
"itD" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8;
name = "Oxidizer to Burn Mix"
},
/obj/effect/floor_decal/corner_wide/black{
@@ -12704,7 +12663,6 @@
desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
name = "pathfinder class shuttle hull";
opacity = 1;
outside_part = 0
@@ -13213,12 +13171,10 @@
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/structure/closet/secure_closet/security,
/obj/machinery/recharger/wallcharger{
- layer = 3.3;
pixel_x = 4;
pixel_y = 24
},
/obj/machinery/recharger/wallcharger{
- layer = 3.3;
pixel_x = 4;
pixel_y = 33
},
@@ -13313,7 +13269,6 @@
/area/hangar/control)
"jio" = (
/obj/effect/decal/fake_object{
- layer = 2.5;
name = "cockpit ladder";
pixel_x = 9;
pixel_y = -4
@@ -13606,7 +13561,6 @@
},
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
- layer = 2.8;
name = "Hydrogen to Burn Mix"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -13779,7 +13733,6 @@
/obj/structure/tank_wall/air{
density = 0;
icon_state = "air12";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airmix,
@@ -13966,7 +13919,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "warehousetomail";
- layer = 2.9
},
/obj/effect/floor_decal/corner/brown{
dir = 9
@@ -14372,7 +14324,6 @@
dir = 8
},
/obj/structure/plasticflaps/airtight{
- layer = 2.5;
dir = 8
},
/turf/simulated/floor/tiled/full,
@@ -14388,7 +14339,6 @@
/obj/machinery/conveyor{
dir = 10;
id = "mining_2";
- layer = 2.9;
reversed = 1
},
/obj/structure/railing/mapped{
@@ -14449,7 +14399,6 @@
/obj/structure/shuttle_part/scc/research{
density = 0;
icon_state = "14,12";
- layer = 2.6;
outside_part = 0
},
/obj/machinery/light/small{
@@ -14575,7 +14524,6 @@
alarm_id = 1501;
breach_detection = 0;
dir = 1;
- layer = 4;
name = "Exotic Energy Harvesting";
pixel_x = -2;
pixel_y = -19;
@@ -14732,7 +14680,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -14801,7 +14748,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
- layer = 2.8
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -14876,7 +14822,6 @@
},
/obj/machinery/mineral/processing_unit_console{
id = "processing_s";
- layer = 3.3;
pixel_y = 28
},
/obj/effect/floor_decal/corner/brown{
@@ -14973,7 +14918,6 @@
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/portables_connector{
dir = 1;
- layer = 2.8
},
/turf/simulated/floor/reinforced,
/area/shuttle/intrepid/quarters)
@@ -15069,7 +15013,6 @@
/obj/effect/floor_decal/industrial/warning/cee,
/obj/structure/ship_weapon_dummy,
/obj/machinery/ship_weapon/francisca/compact{
- layer = 3;
pixel_x = -40;
pixel_y = -64;
weapon_id = "Francisca Rotary Gun"
@@ -15192,7 +15135,6 @@
/area/horizon/custodial/disposals)
"kxk" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- layer = 2.8
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/bed/handrail{
@@ -17126,7 +17068,6 @@
/obj/structure/tank_wall/hydrogen{
density = 0;
icon_state = "h5";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
@@ -17923,7 +17864,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -18224,7 +18164,6 @@
/obj/structure/tank_wall/nitrogen{
density = 0;
icon_state = "n11";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/nitrogen,
@@ -18410,7 +18349,6 @@
"mFO" = (
/obj/structure/sign/emergency/evacuation{
dir = 8;
- layer = 2.1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
@@ -18452,7 +18390,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "6,11";
- layer = 9;
outside_part = 0
},
/obj/machinery/atmospherics/unary/engine/scc_shuttle,
@@ -18756,7 +18693,6 @@
/obj/structure/shuttle_part/scc/research{
density = 0;
icon_state = "4,12";
- layer = 2.6;
outside_part = 0
},
/obj/structure/table/wood,
@@ -19150,7 +19086,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "2,12";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -19606,7 +19541,6 @@
/obj/structure/tank_wall/nitrous_oxide{
density = 0;
icon_state = "h6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/n20,
@@ -19683,7 +19617,6 @@
/area/hangar/control)
"nvn" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- layer = 2.8
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/door/blast/shutters/open{
@@ -20337,7 +20270,6 @@
"nQT" = (
/obj/structure/shuttle_part/scc/research{
icon_state = "12,4";
- layer = 2.97;
outside_part = 0
},
/turf/simulated/floor/plating,
@@ -20548,7 +20480,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "warehousetomail";
- layer = 2.9
},
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -20852,7 +20783,6 @@
dir = 8
},
/obj/machinery/computer/ship/sensors/cockpit{
- layer = 3;
pixel_x = -22;
pixel_y = 7
},
@@ -20876,7 +20806,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "7,12";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -20886,7 +20815,6 @@
},
/obj/structure/sign/emergency/evacuation{
dir = 8;
- layer = 2.1
},
/turf/simulated/floor/tiled,
/area/horizon/stairwell/central)
@@ -21342,7 +21270,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_2";
- layer = 2.9
},
/obj/structure/railing/mapped{
dir = 1
@@ -21892,7 +21819,6 @@
"pbX" = (
/obj/structure/shuttle_part/scc/research{
icon_state = "6,4";
- layer = 2.97;
outside_part = 0
},
/turf/simulated/floor/plating,
@@ -22061,7 +21987,6 @@
"pfQ" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/device/flash,
/obj/item/device/flash,
@@ -22681,7 +22606,6 @@
/obj/structure/tank_wall/oxygen{
density = 0;
icon_state = "o2-5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/oxygen,
@@ -22938,7 +22862,6 @@
desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
name = "pathfinder class shuttle hull";
opacity = 1;
outside_part = 0
@@ -23227,7 +23150,6 @@
density = 0
},
/obj/machinery/computer/ship/helm/cockpit{
- layer = 3.1
},
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
@@ -23247,7 +23169,6 @@
"pTp" = (
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- layer = 2.8
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -23356,7 +23277,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_1";
- layer = 2.9
},
/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
@@ -23454,7 +23374,6 @@
/obj/structure/tank_wall/oxygen{
density = 0;
icon_state = "o2-11";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/oxygen,
@@ -23878,7 +23797,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -24378,7 +24296,6 @@
dir = 8
},
/obj/structure/sink{
- layer = 3;
pixel_x = -7;
pixel_y = 23
},
@@ -24488,7 +24405,6 @@
/obj/structure/tank_wall/nitrogen{
density = 0;
icon_state = "n12";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/nitrogen,
@@ -24696,7 +24612,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "6,12";
- layer = 9
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -24927,7 +24842,6 @@
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
- layer = 4
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -24995,7 +24909,6 @@
/obj/structure/tank_wall/air{
density = 0;
icon_state = "air5";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -25280,7 +25193,6 @@
/obj/structure/tank_wall{
density = 0;
icon_state = "m-11";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airless,
@@ -25895,7 +25807,6 @@
"rKM" = (
/obj/structure/sign/fire{
desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'.";
- layer = 2.1;
name = "\improper DANGER: THRUSTERS sign";
pixel_x = 32
},
@@ -26542,7 +26453,6 @@
/obj/structure/tank_wall/hydrogen{
density = 0;
icon_state = "h12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/unary/outlet_injector{
@@ -27065,7 +26975,6 @@
},
/obj/structure/platform_deco{
dir = 4;
- layer = 2.7
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
@@ -27200,7 +27109,6 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
@@ -27811,7 +27719,6 @@
/obj/machinery/conveyor{
dir = 9;
id = "mining_2";
- layer = 2.9;
reversed = 1
},
/obj/structure/railing/mapped{
@@ -28176,7 +28083,6 @@
"tsv" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -28668,7 +28574,6 @@
/obj/machinery/conveyor{
dir = 8;
id = "mining_1";
- layer = 2.9
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/refinery)
@@ -28805,7 +28710,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/machinery/power/apc/north,
/turf/simulated/floor/tiled/dark,
@@ -28876,7 +28780,6 @@
/obj/structure/tank_wall/nitrous_oxide{
density = 0;
icon_state = "h5";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -28888,7 +28791,6 @@
/obj/structure/tank_wall/oxygen{
density = 0;
icon_state = "o2-6";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -28922,7 +28824,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph12";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
@@ -29102,7 +29003,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
@@ -29129,7 +29029,6 @@
/obj/machinery/conveyor{
dir = 1;
id = "mining_2";
- layer = 2.9
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/refinery)
@@ -29162,7 +29061,6 @@
"tZY" = (
/obj/machinery/conveyor{
id = "mining_2";
- layer = 2.9;
reversed = 1
},
/turf/simulated/floor/plating,
@@ -29489,7 +29387,6 @@
/obj/structure/shuttle_part/scc/scout{
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
opacity = 1;
outside_part = 0
},
@@ -29576,7 +29473,6 @@
/obj/structure/tank_wall/oxygen{
density = 0;
icon_state = "o2-12";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/oxygen,
@@ -30007,7 +29903,6 @@
/obj/structure/window/shuttle/unique/scc/scout/over{
density = 0;
icon_state = "4,3";
- layer = 6.1;
pixel_y = 32
},
/turf/simulated/floor/plating,
@@ -30557,7 +30452,6 @@
alarm_id = 1503;
breach_detection = 0;
dir = 4;
- layer = 4;
name = "Isolation C";
pixel_x = -24;
rcon_setting = 3;
@@ -31397,7 +31291,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph5";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/phoron,
@@ -31500,7 +31393,6 @@
dir = 4
},
/obj/machinery/computer/ship/engines/cockpit{
- layer = 3;
pixel_x = 24;
pixel_y = 7
},
@@ -31513,7 +31405,6 @@
/obj/structure/tank_wall/hydrogen{
density = 0;
icon_state = "h11";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/hydrogen,
@@ -31567,7 +31458,6 @@
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "2,11";
- layer = 9;
outside_part = 0
},
/obj/machinery/atmospherics/unary/engine/scc_shuttle,
@@ -31722,7 +31612,6 @@
"vKa" = (
/obj/machinery/conveyor{
id = "mining_2";
- layer = 2.9
},
/obj/machinery/door/firedoor,
/obj/structure/plasticflaps/mining,
@@ -32062,7 +31951,6 @@
/obj/structure/tank_wall/air{
density = 0;
icon_state = "air6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/airmix,
@@ -32202,7 +32090,6 @@
/obj/structure/tank_wall/phoron{
density = 0;
icon_state = "ph6";
- layer = 10.1;
opacity = 0
},
/turf/simulated/floor/reinforced/phoron,
@@ -32376,7 +32263,6 @@
/obj/structure/shuttle_part/scc/research{
density = 0;
icon_state = "14,11";
- layer = 2.6;
outside_part = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -32694,7 +32580,6 @@
"wsF" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 4;
- layer = 2
},
/turf/simulated/floor/reinforced/airless,
/area/engineering/atmos/propulsion)
@@ -32783,7 +32668,6 @@
},
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
- layer = 2.8;
name = "Phoron to Burn Mix"
},
/turf/simulated/floor/tiled/dark,
@@ -33146,7 +33030,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/light/small,
@@ -33281,12 +33164,10 @@
/area/hangar/intrepid)
"wPX" = (
/obj/machinery/computer/ship/targeting/cockpit{
- layer = 3;
pixel_x = -25
},
/obj/structure/bed/stool/chair/cockpit,
/obj/machinery/computer/ship/engines/cockpit{
- layer = 3;
pixel_x = 26
},
/turf/simulated/floor/carpet/rubber,
@@ -33344,7 +33225,6 @@
/obj/structure/tank_wall/carbon_dioxide{
density = 0;
icon_state = "co2-11";
- layer = 10.1;
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -33893,7 +33773,6 @@
},
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- layer = 2.8
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -34185,7 +34064,6 @@
},
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
- layer = 2.8;
name = "Hydrogen to Burn Mix"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -34244,7 +34122,6 @@
/area/turbolift/scc_ship/operations_lift)
"xqo" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- layer = 2.8
},
/obj/structure/lattice/catwalk/indoor,
/obj/item/device/radio/intercom/expedition/east,
@@ -34260,7 +34137,6 @@
"xqv" = (
/obj/structure/shuttle_part/scc/research{
icon_state = "11,26";
- layer = 2.91;
opacity = 1;
outside_part = 0
},
@@ -34372,7 +34248,6 @@
desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
icon_state = "nozzle";
- layer = 2.4;
name = "pathfinder class shuttle hull";
opacity = 1;
outside_part = 0
@@ -34651,7 +34526,6 @@
/obj/machinery/conveyor{
dir = 9;
id = "mining_1";
- layer = 2.9;
reversed = 1
},
/turf/simulated/floor/plating,
@@ -34852,7 +34726,6 @@
"xLq" = (
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/effect/floor_decal/corner_wide/blue/full{
dir = 8
@@ -35481,7 +35354,6 @@
},
/obj/structure/table/rack{
dir = 8;
- layer = 2.9
},
/obj/item/device/flash{
pixel_x = -4;
@@ -35592,7 +35464,6 @@
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
- layer = 2.8
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
diff --git a/maps/templates/distress/iac.dmm b/maps/templates/distress/iac.dmm
index 9f85d0415b6..4a9c7fbd681 100644
--- a/maps/templates/distress/iac.dmm
+++ b/maps/templates/distress/iac.dmm
@@ -22,7 +22,6 @@
/area/centcom/distress_prep)
"d" = (
/obj/structure/closet/crate/freezer{
- layer = 2.99;
name = "rations"
},
/obj/item/reagent_containers/food/snacks/koisbar_clean,
@@ -63,7 +62,6 @@
/area/centcom/distress_prep)
"e" = (
/obj/structure/closet/crate/freezer{
- layer = 2.99;
name = "blood, surgery equipment"
},
/obj/item/reagent_containers/blood/OMinus,
@@ -92,7 +90,6 @@
/area/centcom/distress_prep)
"f" = (
/obj/structure/closet/crate/medical{
- layer = 2.99
},
/obj/item/cane/crutch,
/obj/item/cane/crutch,