diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4c6a8db6d78..00240dc5ff9 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -10,7 +10,8 @@ materials = list(MAT_METAL=50, MAT_GLASS=20) actions_types = list(/datum/action/item_action/toggle_light) var/on = 0 - var/brightness_on = 4 //luminosity when on + var/brightness_on = 4 //range of light when on + var/flashlight_power //strength of the light when on. optional /obj/item/device/flashlight/Initialize() ..() @@ -19,7 +20,10 @@ /obj/item/device/flashlight/proc/update_brightness(mob/user = null) if(on) icon_state = "[initial(icon_state)]-on" - set_light(brightness_on) + if(flashlight_power) + set_light(l_range = brightness_on, l_power = flashlight_power) + else + set_light(brightness_on) else icon_state = initial(icon_state) set_light(0) @@ -397,3 +401,11 @@ name = initial(glowtype.name) color = initial(glowtype.color) . = ..() + +/obj/item/device/flashlight/flashdark + name = "flashdark" + desc = "A strange device manufactured with mysterious elements that somehow emits darkness. Or maybe it just sucks in light? Nobody knows for sure." + icon_state = "flashdark" + item_state = "flashdark" + brightness_on = 2.5 + flashlight_power = -3 diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index f7c8d0bd5da..4f2cd8f03c8 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 79f65c57e53..3eccb4d744f 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 7490716faa6..9a6dd3cfaa8 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ