From 8e5259aaae8017a31195b1c97f1b5ea9481ac8df Mon Sep 17 00:00:00 2001
From: d3athrow <somepersonsomeplace@yahoo.com>
Date: Sun, 25 May 2014 12:11:39 -0500
Subject: [PATCH] Muck with firedoor layers so they dont appear over airlocks
 when closed making it almost impossible to close airlocks easily.

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
---
 code/game/machinery/doors/door.dm     | 4 ++--
 code/game/machinery/doors/firedoor.dm | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index ef294831b38..f3fc88471e1 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -246,7 +246,7 @@
 	door_animate("closing")
 	src.density = 1
 	explosion_resistance = initial(explosion_resistance)
-	src.layer = 3.1
+	src.layer = 3.0
 	sleep(10)
 	update_icon()
 	if(visible && !glass)
@@ -291,4 +291,4 @@
 	update_nearby_tiles()
 
 /obj/machinery/door/morgue
-	icon = 'icons/obj/doors/doormorgue.dmi'
\ No newline at end of file
+	icon = 'icons/obj/doors/doormorgue.dmi'
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 9391bbb9d46..5a86a20259a 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -181,7 +181,6 @@
 			return
 
 
-
 /obj/machinery/door/firedoor/proc/latetoggle()
 	if(operating || stat & NOPOWER || !nextstate)
 		return
@@ -195,12 +194,15 @@
 	return
 
 /obj/machinery/door/firedoor/close()
+	..()
 	latetoggle()
-	return ..()
+	layer = 3.1
 
 /obj/machinery/door/firedoor/open()
+	..()
 	latetoggle()
-	return ..()
+	layer = 2.6
+
 
 
 /obj/machinery/door/firedoor/door_animate(animation)