From 4706bf18018180a7bea540127ea6c0587795965c Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Mon, 30 Apr 2018 12:50:47 -0400
Subject: [PATCH] Resolve shower curtain/steam layering issue

Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
---
 code/__defines/_planes+layers.dm            |  3 ---
 code/game/objects/structures/curtains.dm    | 15 ++++++++-------
 code/game/objects/structures/watercloset.dm |  3 ++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm
index ad2962547c2..b5d0cfa11a0 100644
--- a/code/__defines/_planes+layers.dm
+++ b/code/__defines/_planes+layers.dm
@@ -74,9 +74,6 @@ What is the naming convention for planes or layers?
 	#define DOOR_CLOSED_LAYER		3.1	// Doors when closed
 	#define WINDOW_LAYER			3.2	// Windows
 	#define ON_WINDOW_LAYER			3.3 // Ontop of a window
-	#define SHOWER_OPEN_LAYER		3.4	// Showers when open
-	// Obj/Mob layer boundary
-	#define SHOWER_CLOSED_LAYER 	4.2	// Should be converted to plane swaps
 	
 // Mob planes
 #define MOB_PLANE				-25
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index af129800b7e..39c2dc43fd9 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -2,13 +2,15 @@
 	name = "curtain"
 	icon = 'icons/obj/curtain.dmi'
 	icon_state = "closed"
-	layer = SHOWER_OPEN_LAYER
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
 	opacity = 1
 	density = 0
 
 /obj/structure/curtain/open
 	icon_state = "open"
-	layer = SHOWER_CLOSED_LAYER
+	plane = OBJ_PLANE
+	layer = OBJ_LAYER
 	opacity = 0
 
 /obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
@@ -27,10 +29,12 @@
 	set_opacity(!opacity)
 	if(opacity)
 		icon_state = "closed"
-		layer = SHOWER_CLOSED_LAYER
+		plane = MOB_PLANE
+		layer = ABOVE_MOB_LAYER
 	else
 		icon_state = "open"
-		layer = SHOWER_OPEN_LAYER
+		plane = OBJ_PLANE
+		layer = OBJ_LAYER
 
 /obj/structure/curtain/attackby(obj/item/P, mob/user)
 	if(istype(P, /obj/item/weapon/wirecutters))
@@ -76,6 +80,3 @@
 
 /obj/structure/curtain/open/shower/security
 	color = "#AA0000"
-
-#undef SHOWER_OPEN_LAYER
-#undef SHOWER_CLOSED_LAYER
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 9882ca45070..98e0f1a41e4 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -142,7 +142,8 @@
 	name = "mist"
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "mist"
-	layer = MOB_LAYER + 1
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
 	anchored = 1
 	mouse_opacity = 0