From 0c3db41e890cc05319db136eeb239ca2d872df8b Mon Sep 17 00:00:00 2001
From: Spades <jeremy.spades.neil@gmail.com>
Date: Thu, 29 Dec 2016 02:05:17 -0500
Subject: [PATCH] Fixes lights for macros, hopefully.

---
 code/modules/power/lighting.dm    |  2 +-
 code/modules/power/lighting_vr.dm | 26 ++++++++++++++++++++++++++
 vorestation.dme                   |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 code/modules/power/lighting_vr.dm

diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index b079d2fde59..969cc6b6c24 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -16,7 +16,7 @@
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "tube-construct-stage1"
 	anchored = 1
-	layer = OBJ_LAYER // Vorestation edit
+	layer = 5
 	var/stage = 1
 	var/fixture_type = "tube"
 	var/sheets_refunded = 2
diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm
new file mode 100644
index 00000000000..5583716d570
--- /dev/null
+++ b/code/modules/power/lighting_vr.dm
@@ -0,0 +1,26 @@
+// I hate the way macros look stupid standing near lights. I don't care how absurd this looks.
+
+/obj/machinery/light_construct
+	layer = 4
+
+/obj/machinery/light_construct/small
+	layer = 4
+
+/obj/machinery/light_construct/flamp
+	layer = 4
+
+
+/obj/machinery/light
+	layer = 4
+
+//Vorestation addition, to override the New() proc further below, since this is a lamp.
+/obj/machinery/light/flamp/New()
+	..()
+	layer = 4
+
+// create a new lighting fixture
+/obj/machinery/light/New()
+	..()
+	//Vorestation addition, so large mobs stop looking stupid in front of lights.
+	if (dir == 2)
+		layer = 5
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 2bae837fe80..862366cdd67 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1880,6 +1880,7 @@
 #include "code\modules\power\gravitygenerator.dm"
 #include "code\modules\power\grid_checker.dm"
 #include "code\modules\power\lighting.dm"
+#include "code\modules\power\lighting_vr.dm"
 #include "code\modules\power\port_gen.dm"
 #include "code\modules\power\power.dm"
 #include "code\modules\power\powernet.dm"