diff --git a/html/changelog.html b/html/changelog.html
index 4b7078e6da5..303a274aa36 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,26 @@
- Fixed Unathi clothing being slightly pink.
+ MattAtlas updated:
+
+ - Security's base nonlethal equipment - tasers and rubbers - is now a bit better.
+ - Fixed teargas doing practically nothing.
+ - Fixed a lot of stuff not applying pain damage. Ow.
+ - Fixed undefined values on the CMC.
+ - Fixed dionae not regenerating damage.
+
+ SonicGotNuked updated:
+
+ - Borg Combat Module now unlocks with synthetic domination. It only activates on all the current borgs, not the later ones.
+ - Removes code delta from elite encryption hack
+ - Replaces code delta with code yellow
+ - Borgs come out of the robot transformer hacked
+ - Combat Borgs no longer have a laser cannon
+ - Seperates traitor borg powers into a seperate verbs tab for you to actually know about
+ - Autoborger now tells admins that it made a borg
+ - You shouldn't know what the Autoborger is at a glance. It has a more descriptive description
+ - It now tells players that they are lobotomized
+
17 December 2019
Geeves updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 12144b115b8..4c0ccb1d85e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10700,3 +10700,23 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Emergency Maintenance can now be enabled/disabled from the command console.
Geeves:
- bugfix: Fixed Unathi clothing being slightly pink.
+ MattAtlas:
+ - tweak: Security's base nonlethal equipment - tasers and rubbers - is now a bit
+ better.
+ - bugfix: Fixed teargas doing practically nothing.
+ - bugfix: Fixed a lot of stuff not applying pain damage. Ow.
+ - bugfix: Fixed undefined values on the CMC.
+ - bugfix: Fixed dionae not regenerating damage.
+ SonicGotNuked:
+ - rscadd: Borg Combat Module now unlocks with synthetic domination. It only activates
+ on all the current borgs, not the later ones.
+ - rscdel: Removes code delta from elite encryption hack
+ - rscadd: Replaces code delta with code yellow
+ - tweak: Borgs come out of the robot transformer hacked
+ - rscdel: Combat Borgs no longer have a laser cannon
+ - rscadd: Seperates traitor borg powers into a seperate verbs tab for you to actually
+ know about
+ - admin: Autoborger now tells admins that it made a borg
+ - rscadd: You shouldn't know what the Autoborger is at a glance. It has a more descriptive
+ description
+ - rscadd: It now tells players that they are lobotomized
diff --git a/html/changelogs/AI_ROUGE!!!.yml b/html/changelogs/AI_ROUGE!!!.yml
deleted file mode 100644
index 8916b63f516..00000000000
--- a/html/changelogs/AI_ROUGE!!!.yml
+++ /dev/null
@@ -1,49 +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: SonicGotNuked
-
-# 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: "Borg Combat Module now unlocks with synthetic domination. It only activates on all the current borgs, not the later ones."
- - rscdel: "Removes code delta from elite encryption hack"
- - rscadd: "Replaces code delta with code yellow"
- - tweak: "Borgs come out of the robot transformer hacked"
- - rscdel: "Combat Borgs no longer have a laser cannon"
- - rscadd: "Seperates traitor borg powers into a seperate verbs tab for you to actually know about"
- - admin: "Autoborger now tells admins that it made a borg"
- - rscadd: "You shouldn't know what the Autoborger is at a glance. It has a more descriptive description"
- - rscadd: "It now tells players that they are lobotomized"
diff --git a/html/changelogs/mattatlas-securitybuffsbutwhy.yml b/html/changelogs/mattatlas-securitybuffsbutwhy.yml
deleted file mode 100644
index 7429640651b..00000000000
--- a/html/changelogs/mattatlas-securitybuffsbutwhy.yml
+++ /dev/null
@@ -1,45 +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: MattAtlas
-
-# 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: "Security's base nonlethal equipment - tasers and rubbers - is now a bit better."
- - bugfix: "Fixed teargas doing practically nothing."
- - bugfix: "Fixed a lot of stuff not applying pain damage. Ow."
- - bugfix: "Fixed undefined values on the CMC."
- - bugfix: "Fixed dionae not regenerating damage."