From 44a9fe95211aff30b997a72cce363d4ac1be5d2c Mon Sep 17 00:00:00 2001
From: Ghommie <Ghombeat@Gmail.com>
Date: Wed, 19 Jun 2019 13:38:59 +0200
Subject: [PATCH] Fixes "Penlights Cannot Give Eye Exams"

---
 code/game/objects/items/devices/flashlight.dm | 18 +++++++++--
 .../game/objects/items/devices/flashlight.dm  | 31 -------------------
 tgstation.dme                                 |  1 -
 3 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 modular_citadel/code/game/objects/items/devices/flashlight.dm

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 40f2059d25..d8b539ac27 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -13,7 +13,8 @@
 	actions_types = list(/datum/action/item_action/toggle_light)
 	var/on = FALSE
 	var/brightness_on = 4 //range of light when on
-	var/flashlight_power = 1 //strength of the light when on
+	var/flashlight_power = 0.8 //strength of the light when on
+	light_color = "#FFCC66"
 
 /obj/item/flashlight/Initialize()
 	. = ..()
@@ -63,7 +64,7 @@
 			to_chat(user, "<span class='warning'>[M] doesn't have a head!</span>")
 			return
 
-		if(flashlight_power < 1)
+		if(flashlight_power < 0.3)
 			to_chat(user, "<span class='warning'>\The [src] isn't bright enough to see anything!</span> ")
 			return
 
@@ -168,6 +169,8 @@
 	item_state = ""
 	flags_1 = CONDUCT_1
 	brightness_on = 2
+	light_color = "#FFDDCC"
+	flashlight_power = 0.3
 	var/holo_cooldown = 0
 
 /obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag)
@@ -204,6 +207,8 @@
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	force = 9 // Not as good as a stun baton.
 	brightness_on = 5 // A little better than the standard flashlight.
+	light_color = "#CDDDFF"
+	flashlight_power = 0.9
 	hitsound = 'sound/weapons/genhit1.ogg'
 
 // the desk lamps are a bit special
@@ -216,6 +221,7 @@
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	force = 10
 	brightness_on = 5
+	light_color = "#FFDDBB"
 	w_class = WEIGHT_CLASS_BULKY
 	flags_1 = CONDUCT_1
 	materials = list()
@@ -252,6 +258,7 @@
 	desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 7 // Pretty bright.
+	light_color = "#FA421A"
 	icon_state = "flare"
 	item_state = "flare"
 	actions_types = list()
@@ -325,6 +332,7 @@
 	desc = "A torch fashioned from some leaves and a log."
 	w_class = WEIGHT_CLASS_BULKY
 	brightness_on = 4
+	light_color = "#FAA44B"
 	icon_state = "torch"
 	item_state = "torch"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
@@ -341,6 +349,8 @@
 	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
 	desc = "A mining lantern."
 	brightness_on = 6			// luminosity when on
+	light_color = "#FFAA44"
+	flashlight_power = 0.75
 
 
 /obj/item/flashlight/slime
@@ -354,6 +364,8 @@
 	slot_flags = ITEM_SLOT_BELT
 	materials = list()
 	brightness_on = 6 //luminosity when on
+	light_color = "#FFEEAA"
+	flashlight_power = 0.6
 
 /obj/item/flashlight/emp
 	var/emp_max_charges = 4
@@ -517,6 +529,7 @@
 	icon_state = null
 	light_color = null
 	brightness_on = 0
+	flashlight_power = 1
 	light_range = 0
 	light_power = 10
 	alpha = 0
@@ -538,7 +551,6 @@
 	name = "eyelight"
 	desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
 	brightness_on = 15
-	flashlight_power = 1
 	flags_1 = CONDUCT_1
 	item_flags = DROPDEL
 	actions_types = list()
diff --git a/modular_citadel/code/game/objects/items/devices/flashlight.dm b/modular_citadel/code/game/objects/items/devices/flashlight.dm
deleted file mode 100644
index 3a373c9277..0000000000
--- a/modular_citadel/code/game/objects/items/devices/flashlight.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/obj/item/flashlight
-	light_color = "#FFCC66"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/pen
-	light_color = "#FFDDCC"
-	flashlight_power = 0.3
-
-/obj/item/flashlight/seclite
-	light_color = "#CDDDFF"
-	flashlight_power = 0.9
-
-/obj/item/flashlight/lamp
-	light_color = "#FFDDBB"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare
-	light_color = "#FA421A"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare/torch
-	light_color = "#FAA44B"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/lantern
-	light_color = "#FFAA44"
-	flashlight_power = 0.75
-
-/obj/item/flashlight/slime
-	light_color = "#FFEEAA"
-	flashlight_power = 0.6
diff --git a/tgstation.dme b/tgstation.dme
index 37df11d40c..65295c3773 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2879,7 +2879,6 @@
 #include "modular_citadel\code\game\objects\items\vending_items.dm"
 #include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "modular_citadel\code\game\objects\items\devices\aicard.dm"
-#include "modular_citadel\code\game\objects\items\devices\flashlight.dm"
 #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"