From 779e6f177d9fee77143790da30e291345d3a5282 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 29 Mar 2018 21:03:45 -0400 Subject: [PATCH] Fixes machines being below tables they should sit upon. --- code/__defines/_planes+layers.dm | 1 + code/modules/tables/tables.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm index ae6b80b0dd3..a044b16c85e 100644 --- a/code/__defines/_planes+layers.dm +++ b/code/__defines/_planes+layers.dm @@ -70,6 +70,7 @@ What is the naming convention for planes or layers? #define OBJ_PLANE -35 #define HIDING_LAYER 2.6 // Layer at which mobs hide to be under things like tables #define DOOR_OPEN_LAYER 2.7 // Under all objects if opened. 2.7 due to tables being at 2.6 + #define TABLE_LAYER 2.8 // Just under stuff that wants to be slightly below common objects. #define UNDER_JUNK_LAYER 2.9 // Things that want to be slightly below common objects // Turf/Obj layer boundary #define ABOVE_JUNK_LAYER 3.1 // Things that want to be slightly above common objects diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index b32af0f479e..a0fdf06f204 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -6,7 +6,7 @@ density = 1 anchored = 1 climbable = 1 - layer = UNDER_JUNK_LAYER + layer = TABLE_LAYER throwpass = 1 surgery_odds = 66 var/flipped = 0