From 068e132603d71573e5a562a9035cd90f469f485d Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 29 Nov 2019 19:49:01 -0500 Subject: [PATCH] Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster Lamps, Lights, Lackluster! --- code/game/objects/items/devices/flashlight.dm | 2 +- ...heFurryFeline - Lamps Light Lackluster.yml | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/TheFurryFeline - Lamps Light Lackluster.yml diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 83bdee0059..150c2e1fe5 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -295,7 +295,7 @@ desc = "A desk lamp with an adjustable mount." icon_state = "lamp" force = 10 - brightness_on = 5 + brightness_on = 10 //TFF 27/11/19 - post refactor fix for intensity levels. w_class = ITEMSIZE_LARGE power_use = 0 on = 1 diff --git a/html/changelogs/TheFurryFeline - Lamps Light Lackluster.yml b/html/changelogs/TheFurryFeline - Lamps Light Lackluster.yml new file mode 100644 index 0000000000..bbf6c90a5e --- /dev/null +++ b/html/changelogs/TheFurryFeline - Lamps Light Lackluster.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: TheFurryFeline + +# 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: + - tweak: "Tweaks desk lamps to output twice as much light than before to compensate for a reduced level following a refactor." \ No newline at end of file