From 0e9125eeaf8d2c89a3d741bfdc38d779ade6b696 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 19 Feb 2018 01:26:15 +0000
Subject: [PATCH] makes lighting a little fancier (#5576)

---
 .../game/objects/items/devices/flashlight.dm  | 31 +++++++++++++++++++
 .../code/modules/power/lighting.dm            |  7 +++++
 tgstation.dme                                 |  6 ++--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 modular_citadel/code/game/objects/items/devices/flashlight.dm
 create mode 100644 modular_citadel/code/modules/power/lighting.dm

diff --git a/modular_citadel/code/game/objects/items/devices/flashlight.dm b/modular_citadel/code/game/objects/items/devices/flashlight.dm
new file mode 100644
index 0000000000..bbf995e451
--- /dev/null
+++ b/modular_citadel/code/game/objects/items/devices/flashlight.dm
@@ -0,0 +1,31 @@
+/obj/item/device/flashlight
+	light_color = "#FFCC66"
+	flashlight_power = 0.8
+
+/obj/item/device/flashlight/pen
+	light_color = "#FFDDCC"
+	flashlight_power = 0.3
+
+/obj/item/device/flashlight/seclite
+	light_color = "#CDDDFF"
+	flashlight_power = 0.9
+
+/obj/item/device/flashlight/lamp
+	light_color = "#FFDDBB"
+	flashlight_power = 0.8
+
+/obj/item/device/flashlight/flare
+	light_color = "#FA421A"
+	flashlight_power = 0.8
+
+/obj/item/device/flashlight/flare/torch
+	light_color = "#FAA44B"
+	flashlight_power = 0.8
+
+/obj/item/device/flashlight/lantern
+	light_color = "#FFAA44"
+	flashlight_power = 0.75
+
+/obj/item/device/flashlight/slime
+	light_color = "#FFEEAA"
+	flashlight_power = 0.6
diff --git a/modular_citadel/code/modules/power/lighting.dm b/modular_citadel/code/modules/power/lighting.dm
new file mode 100644
index 0000000000..e326d84e7e
--- /dev/null
+++ b/modular_citadel/code/modules/power/lighting.dm
@@ -0,0 +1,7 @@
+/obj/machinery/light
+	bulb_colour = "#FFEEDD"
+	bulb_power = 0.75
+
+/obj/machinery/light/small
+	bulb_colour = "#FFDDBB"
+	bulb_power = 0.75
diff --git a/tgstation.dme b/tgstation.dme
index 99b118ae21..06e4a599dc 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2531,15 +2531,16 @@
 #include "modular_citadel\code\game\gamemodes\revolution\revolution.dm"
 #include "modular_citadel\code\game\machinery\cryopod.dm"
 #include "modular_citadel\code\game\machinery\Sleeper.dm"
-#include "modular_citadel\code\game\machinery\computer\card.dm"
 #include "modular_citadel\code\game\machinery\toylathe.dm"
 #include "modular_citadel\code\game\machinery\vending.dm"
+#include "modular_citadel\code\game\machinery\computer\card.dm"
 #include "modular_citadel\code\game\objects\ids.dm"
 #include "modular_citadel\code\game\objects\items\handcuffs.dm"
 #include "modular_citadel\code\game\objects\items\holy_weapons.dm"
 #include "modular_citadel\code\game\objects\items\stunsword.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"
@@ -2575,8 +2576,8 @@
 #include "modular_citadel\code\modules\client\loadout\suit.dm"
 #include "modular_citadel\code\modules\client\loadout\uniform.dm"
 #include "modular_citadel\code\modules\client\verbs\who.dm"
-#include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
 #include "modular_citadel\code\modules\clothing\under.dm"
+#include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
 #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm"
 #include "modular_citadel\code\modules\clothing\under\turtlenecks.dm"
 #include "modular_citadel\code\modules\crafting\recipes.dm"
@@ -2597,6 +2598,7 @@
 #include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "modular_citadel\code\modules\mob\living\simple_animal\banana_spider.dm"
 #include "modular_citadel\code\modules\mob\living\simple_animal\kiwi.dm"
+#include "modular_citadel\code\modules\power\lighting.dm"
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\code\modules\research\designs\machine_designs.dm"
 #include "modular_citadel\code\modules\research\techweb\_techweb.dm"