From 8eb697fcab252bf3e3f377d2ad98f478de4548f9 Mon Sep 17 00:00:00 2001
From: Chompstation Bot <chompstation2bot@gmail.com>
Date: Fri, 18 Jun 2021 16:50:59 +0000
Subject: [PATCH] Make fake sun invisible

---
 code/modules/lighting/lighting_fake_sun_vr.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm
index a6eadd957d..5c8162082b 100644
--- a/code/modules/lighting/lighting_fake_sun_vr.dm
+++ b/code/modules/lighting/lighting_fake_sun_vr.dm
@@ -3,6 +3,13 @@
 	desc = "Deletes itself, but first updates all the lighting on outdoor turfs."
 	icon = 'icons/effects/effects_vr.dmi'
 	icon_state = "fakesun"
+<<<<<<< HEAD
+||||||| parent of 1b4c6bcca1... Merge pull request #10679 from VOREStation/Arokha/fakesuninvis
+	var/datum/light_source/sun/fake_sun
+=======
+	invisibility = INVISIBILITY_ABSTRACT
+	var/datum/light_source/sun/fake_sun
+>>>>>>> 1b4c6bcca1... Merge pull request #10679 from VOREStation/Arokha/fakesuninvis
 
 	var/list/possible_light_setups = list(
 		list(