diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index ecd023320b..525840ed8b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -242,6 +242,26 @@ w_class = ITEMSIZE_TINY power_use = 0 +/obj/item/device/flashlight/color //Default color is blue, just roll with it. + name = "blue flashlight" + desc = "A hand-held emergency light. This one is blue." + icon_state = "flashlight_blue" + +/obj/item/device/flashlight/color/red + name = "blue flashlight" + desc = "A hand-held emergency light. This one is red." + icon_state = "flashlight_red" + +/obj/item/device/flashlight/color/orange + name = "orange flashlight" + desc = "A hand-held emergency light. This one is orange." + icon_state = "flashlight_orange" + +/obj/item/device/flashlight/color/yellow + name = "yellow flashlight" + desc = "A hand-held emergency light. This one is yellow." + icon_state = "flashlight_yellow" + /obj/item/device/flashlight/maglight name = "maglight" desc = "A very, very heavy duty flashlight." diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index ebc2e87ec1..253f843306 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -46,6 +46,22 @@ display_name = "flashlight" path = /obj/item/device/flashlight +/datum/gear/utility/flashlight_blue + display_name = "flashlight, blue" + path = /obj/item/device/flashlight/color + +/datum/gear/utility/flashlight_orange + display_name = "flashlight, orange" + path = /obj/item/device/flashlight/color/orange + +/datum/gear/utility/flashlight_red + display_name = "flashlight, red" + path = /obj/item/device/flashlight/color/red + +/datum/gear/utility/flashlight_yellow + display_name = "flashlight, yellow" + path = /obj/item/device/flashlight/color/yellow + /datum/gear/utility/maglight display_name = "flashlight, maglight" path = /obj/item/device/flashlight/maglight diff --git a/html/changelogs/Anewbe - Flashlights.yml b/html/changelogs/Anewbe - Flashlights.yml new file mode 100644 index 0000000000..2382cd6d6d --- /dev/null +++ b/html/changelogs/Anewbe - Flashlights.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a few colored (in sprite, not in color) flashlights, to the loadout. Sprites c/o Schnayy." \ No newline at end of file diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 8f6689b71f..5a63eb1c3d 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 0093c73c06..d2822ad021 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index dbaf4a5890..736308440d 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ