shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makes lighting a little fancier (#5576)

Browse Source
This commit is contained in:
deathride58
2018-02-19 01:26:15 +00:00
committed by Poojawa
parent 7039068ce6
commit 0e9125eeaf
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/objects/items/devices/flashlight.dm
+31
View File
@@ -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
modular_citadel/code/modules/power/lighting.dm
+7
View File
@@ -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
tgstation.dme
+4 -2
View File
@@ -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"