From 378538d4abd3ed529306ae3636bf64cfb3a2a342 Mon Sep 17 00:00:00 2001
From: Mickyan <38563876+Mickyan@users.noreply.github.com>
Date: Wed, 16 Feb 2022 00:20:37 +0100
Subject: [PATCH] Fixes some light presets being brighter than intended
 (#64861)

* fixes light presets

* into the void with you
---
 .../knowledge/sacrifice_knowledge/sacrifice_map.dm        | 1 -
 code/modules/power/lighting/light.dm                      | 2 --
 code/modules/power/lighting/light_mapping_helpers.dm      | 8 ++++----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
index c000c09e9c5..e258b8f2aa8 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
@@ -70,7 +70,6 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks)
 	bulb_colour = "#d6b6a6ff"
 	brightness = 3
 	bulb_power = 0.5
-	fitting = "void" // If you set this to "tube" or "bulb" the brightness is reset in LateInitialize()
 
 /obj/machinery/light/very_dim/directional/north
 	dir = NORTH
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index ef82373de0b..e4ad0cf66b2 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -91,11 +91,9 @@
 	. = ..()
 	switch(fitting)
 		if("tube")
-			brightness = 8
 			if(prob(2))
 				break_light_tube(TRUE)
 		if("bulb")
-			brightness = 4
 			if(prob(5))
 				break_light_tube(TRUE)
 	addtimer(CALLBACK(src, .proc/update, FALSE), 0.1 SECONDS)
diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm
index 8d6c334cd77..4774241db22 100644
--- a/code/modules/power/lighting/light_mapping_helpers.dm
+++ b/code/modules/power/lighting/light_mapping_helpers.dm
@@ -31,13 +31,13 @@
 	bulb_colour = "#FF3232"
 	nightshift_allowed = FALSE
 	no_emergency = TRUE
-	brightness = 2
+	brightness = 4
 	bulb_power = 0.7
 
 /obj/machinery/light/blacklight
 	bulb_colour = "#A700FF"
 	nightshift_allowed = FALSE
-	brightness = 2
+	brightness = 4
 	bulb_power = 0.8
 
 /obj/machinery/light/dim
@@ -74,13 +74,13 @@
 	bulb_colour = "#FF3232"
 	no_emergency = TRUE
 	nightshift_allowed = FALSE
-	brightness = 1
+	brightness = 2
 	bulb_power = 0.8
 
 /obj/machinery/light/small/blacklight
 	bulb_colour = "#A700FF"
 	nightshift_allowed = FALSE
-	brightness = 1
+	brightness = 2
 	bulb_power = 0.9
 
 // -------- Directional presets