Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2017-04-25 20:27:20 -05:00
parent 0a77dfcce5 fd26d0eccd
commit b8ed1fc43e
15 changed files with 285 additions and 278 deletions
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -428,3 +428,11 @@
 	item_state = "flashdark"
 	brightness_on = 2.5
 	flashlight_power = -3
+
+/obj/item/device/flashlight/eyelight
+	name = "eyelight"
+	desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
+	brightness_on = 15
+	flashlight_power = 1
+	flags = CONDUCT | DROPDEL
+	actions_types = list()