diff --git a/html/changelog.html b/html/changelog.html
index 094778be218..fcceacb00e5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,34 @@
-->
+
29 August 2016
+
Haswell updated:
+
+ - Modules installed within a hardsuit will now be listed when examining the hardsuit control module while being held or worn, if the maintenance panel is open.
+
+
Hubblenaut updated:
+
+ - Bottles will now actually sell for their set prices.
+ - Chief Medical Officer and Medical Doctors now spawn with a health analyzer instead of a penlight.
+
+
Sin4 updated:
+
+ - Camera Console swaps to active camera upon clicking on.
+ - Hugs gender correctly.
+ - Prometheans gender correctly and have a gender identity.
+ - Meatspike no longer takes you prisoner upon placing something on it.
+ - Lighting someone on fire now tells the admins.
+ - Wiping something down with a damp rag no longer wets the floor.
+ - Captains gloves now appear when put on.
+ - Fixes Station Administrator Spawn point and access/restrictions.
+ - Renamed items from captain to station administrator.
+
+
Yoshax updated:
+
+ - IDs can now actually be put onto your ears.
+ - Lungs will now once again rupture when you are in an area where you cannot breathe. This has a relatively small chance to happen.
+
+
15 August 2016
Anewbe updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3934efa625c..e464055784b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2741,3 +2741,26 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: The change appearance window provided to antagoniss such as mercenaries,
heisters or suchlike (including traders!) will now properly allow people to
select species they are whitelisted for.
+2016-08-29:
+ Haswell:
+ - rscadd: Modules installed within a hardsuit will now be listed when examining
+ the hardsuit control module while being held or worn, if the maintenance panel
+ is open.
+ Hubblenaut:
+ - bugfix: Bottles will now actually sell for their set prices.
+ - tweak: Chief Medical Officer and Medical Doctors now spawn with a health analyzer
+ instead of a penlight.
+ Sin4:
+ - bugfix: Camera Console swaps to active camera upon clicking on.
+ - bugfix: Hugs gender correctly.
+ - bugfix: Prometheans gender correctly and have a gender identity.
+ - bugfix: Meatspike no longer takes you prisoner upon placing something on it.
+ - rscadd: Lighting someone on fire now tells the admins.
+ - bugfix: Wiping something down with a damp rag no longer wets the floor.
+ - bugfix: Captains gloves now appear when put on.
+ - bugfix: Fixes Station Administrator Spawn point and access/restrictions.
+ - tweak: Renamed items from captain to station administrator.
+ Yoshax:
+ - bugfix: IDs can now actually be put onto your ears.
+ - bugfix: Lungs will now once again rupture when you are in an area where you cannot
+ breathe. This has a relatively small chance to happen.
diff --git a/html/changelogs/Hubblenaut - bottles.yml b/html/changelogs/Hubblenaut - bottles.yml
deleted file mode 100644
index b12e6cde371..00000000000
--- a/html/changelogs/Hubblenaut - bottles.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Hubblenaut
-
-# 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:
- - bugfix: "Bottles will now actually sell for their set prices."
\ No newline at end of file
diff --git a/html/changelogs/Hubblenaut - penlight.yml b/html/changelogs/Hubblenaut - penlight.yml
deleted file mode 100644
index dd742e44c6a..00000000000
--- a/html/changelogs/Hubblenaut - penlight.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Hubblenaut
-
-# 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: "Chief Medical Officer and Medical Doctors now spawn with a health analyzer instead of a penlight."
diff --git a/html/changelogs/Kasuobes-ShowMeTheModules.yml b/html/changelogs/Kasuobes-ShowMeTheModules.yml
deleted file mode 100644
index 8b65bfad529..00000000000
--- a/html/changelogs/Kasuobes-ShowMeTheModules.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Haswell
-
-delete-after: True
-
-changes:
- - rscadd: "Modules installed within a hardsuit will now be listed when examining the hardsuit control module while being held or worn, if the maintenance panel is open."
\ No newline at end of file
diff --git a/html/changelogs/Sin4 - StationAdminFixes.yml b/html/changelogs/Sin4 - StationAdminFixes.yml
deleted file mode 100644
index eb32be753f1..00000000000
--- a/html/changelogs/Sin4 - StationAdminFixes.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# Your name.
-author: Sin4
-
-# 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:
- - bugfix: "Fixes Station Administrator Spawn point and access/restrictions."
- - tweak: "Renamed items from captain to station administrator."
diff --git a/html/changelogs/Sin4 - bugfixbugaloo.yml b/html/changelogs/Sin4 - bugfixbugaloo.yml
deleted file mode 100644
index 188ec32683e..00000000000
--- a/html/changelogs/Sin4 - bugfixbugaloo.yml
+++ /dev/null
@@ -1,42 +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
-#################################
-
-# Your name.
-author: Sin4
-
-# 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:
- - bugfix: "Camera Console swaps to active camera upon clicking on."
- - bugfix: "Hugs gender correctly."
- - bugfix: "Prometheans gender correctly and have a gender identity."
- - bugfix: "Meatspike no longer takes you prisoner upon placing something on it."
- - rscadd: "Lighting someone on fire now tells the admins."
- - bugfix: "Wiping something down with a damp rag no longer wets the floor."
- - bugfix: "Captains gloves now appear when put on."
diff --git a/html/changelogs/Yoshax - IDs.yml b/html/changelogs/Yoshax - IDs.yml
deleted file mode 100644
index e2b6ecf24d7..00000000000
--- a/html/changelogs/Yoshax - IDs.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Yoshax
-
-# 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:
- - bugfix: "IDs can now actually be put onto your ears."
diff --git a/html/changelogs/Yoshax - rupturelungs.yml b/html/changelogs/Yoshax - rupturelungs.yml
deleted file mode 100644
index 1df064bd6fd..00000000000
--- a/html/changelogs/Yoshax - rupturelungs.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Yoshax
-
-# 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:
- - bugfix: "Lungs will now once again rupture when you are in an area where you cannot breathe. This has a relatively small chance to happen."