diff --git a/html/changelog.html b/html/changelog.html
index 108d747c2ab..fd2e7eb3df7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,22 @@
Fixed mixing bowls turning invisible.
Fixed the scrapper outpost being invisible.
+ GeneralCamo updated:
+
+ - Flashlights now consume power. They accept device power cells, with the exception of the lantern which uses standard cells.
+ - Flashlights have various brightness modes. The higher the brightness, the more light produced but also the more power consumed.
+ - The lantern and maglight's on states are actually used.
+ - Added more sanity checking to catch illegal calls in flashlights.
+ - Cleaned up flashlight code to make it more flexible.
+ - Added a sprite for device power cells. (Credit to Pebbles, Baystation12.)
+ - Power cells now have a distinct sprite for low power, and no power.
+ - Added advanced device power cells. (Sprite credit to Pebbles, Baystation12.)
+ - Added sounds for toggling flashlights, and the green desk lamp.
+ - Flashlights are now fabricated from plastic, instead of steel.
+ - Electronic cigarettes now use device power cells. Power consumption has been reduced in half to compensate.
+ - Dim lights can no longer be used to inspect eyes, and robotic eyes can no longer be inspected with flashlights.
+ - Lanterns are now considered large items. Their attack force was increased to 10 to compensate.
+
30 March 2023
RyverStyx updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fae2eb20ca4..33c2187ee1c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28764,3 +28764,22 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Alberyk:
- bugfix: Fixed mixing bowls turning invisible.
- bugfix: Fixed the scrapper outpost being invisible.
+ GeneralCamo:
+ - rscadd: Flashlights now consume power. They accept device power cells, with the
+ exception of the lantern which uses standard cells.
+ - rscadd: Flashlights have various brightness modes. The higher the brightness,
+ the more light produced but also the more power consumed.
+ - bugfix: The lantern and maglight's on states are actually used.
+ - bugfix: Added more sanity checking to catch illegal calls in flashlights.
+ - refactor: Cleaned up flashlight code to make it more flexible.
+ - imageadd: Added a sprite for device power cells. (Credit to Pebbles, Baystation12.)
+ - imageadd: Power cells now have a distinct sprite for low power, and no power.
+ - rscadd: Added advanced device power cells. (Sprite credit to Pebbles, Baystation12.)
+ - soundadd: Added sounds for toggling flashlights, and the green desk lamp.
+ - tweak: Flashlights are now fabricated from plastic, instead of steel.
+ - tweak: Electronic cigarettes now use device power cells. Power consumption has
+ been reduced in half to compensate.
+ - tweak: Dim lights can no longer be used to inspect eyes, and robotic eyes can
+ no longer be inspected with flashlights.
+ - tweak: Lanterns are now considered large items. Their attack force was increased
+ to 10 to compensate.
diff --git a/html/changelogs/generalcamo - flashlights.yml b/html/changelogs/generalcamo - flashlights.yml
deleted file mode 100644
index 8cdb5fae666..00000000000
--- a/html/changelogs/generalcamo - flashlights.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-################################
-# 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
-# balance
-# admin
-# backend
-# security
-# refactor
-#################################
-
-# Your name.
-author: GeneralCamo
-
-# 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: "Flashlights now consume power. They accept device power cells, with the exception of the lantern which uses standard cells."
- - rscadd: "Flashlights have various brightness modes. The higher the brightness, the more light produced but also the more power consumed."
- - bugfix: "The lantern and maglight's on states are actually used."
- - bugfix: "Added more sanity checking to catch illegal calls in flashlights."
- - refactor: "Cleaned up flashlight code to make it more flexible."
- - imageadd: "Added a sprite for device power cells. (Credit to Pebbles, Baystation12.)"
- - imageadd: "Power cells now have a distinct sprite for low power, and no power."
- - rscadd: "Added advanced device power cells. (Sprite credit to Pebbles, Baystation12.)"
- - soundadd: "Added sounds for toggling flashlights, and the green desk lamp."
- - tweak: "Flashlights are now fabricated from plastic, instead of steel."
- - tweak: "Electronic cigarettes now use device power cells. Power consumption has been reduced in half to compensate."
- - tweak: "Dim lights can no longer be used to inspect eyes, and robotic eyes can no longer be inspected with flashlights."
- - tweak: "Lanterns are now considered large items. Their attack force was increased to 10 to compensate."