diff --git a/html/changelog.html b/html/changelog.html
index fa4af7ed73..60e522a07a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,29 @@
-->
+
01 July 2016
+
Aztectornado updated:
+
+ - Clicking a stack of sheets (Metal, phoron...) in your other hand now asks how many you want to split off the stack, courtesy of Baycode
+
+
Datraen updated:
+
+ - Antagonistic factions can now be set and viewed on the uplink. Visibilities can be set for these as well, to help identify sympathizers/potential aids, or to hide the information from those outside of your faction.
+
+
Yosh updated:
+
+ - Increases max records and book length to ridiculous levels.
+
+
Yoshax updated:
+
+ - The PTR Sniper is now more accurate when scoped, but less accurate when unscoped. In addition it now has more recoil.
+ - The Laser Cannon no longer holds multiple shots. It holds charge for one shot at a time. This is because the beams it fires now do 90 damage with 100 armor penetration. Furthermore, it is now considerably more accurate. Lastly, to counteract it only holding one shot at a time, it now autorecharges, which takes 60 seconds.
+
+
Zuhayr updated:
+
+ - Ports/adapted several kitchen machines from Apollo Station.
+
+
27 June 2016
Sin4 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2bb88fd72d..b619283220 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2446,3 +2446,23 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Computer, Chemmaster, Cloning Console, Fax Machines, Guestpass Console, Holodeck
Computer, Laptop Vendors, Operating Computer, and Photocopiers.
- bugfix: Fixes chemmaster not putting pills in pill bottles.
+2016-07-01:
+ Aztectornado:
+ - tweak: Clicking a stack of sheets (Metal, phoron...) in your other hand now asks
+ how many you want to split off the stack, courtesy of Baycode
+ Datraen:
+ - rscadd: Antagonistic factions can now be set and viewed on the uplink. Visibilities
+ can be set for these as well, to help identify sympathizers/potential aids,
+ or to hide the information from those outside of your faction.
+ Yosh:
+ - tweaks: Increases max records and book length to ridiculous levels.
+ Yoshax:
+ - tweak: The PTR Sniper is now more accurate when scoped, but less accurate when
+ unscoped. In addition it now has more recoil.
+ - tweak: The Laser Cannon no longer holds multiple shots. It holds charge for one
+ shot at a time. This is because the beams it fires now do 90 damage with 100
+ armor penetration. Furthermore, it is now considerably more accurate. Lastly,
+ to counteract it only holding one shot at a time, it now autorecharges, which
+ takes 60 seconds.
+ Zuhayr:
+ - rscadd: Ports/adapted several kitchen machines from Apollo Station.
diff --git a/html/changelogs/Aztectornado_Stack.yml b/html/changelogs/Aztectornado_Stack.yml
deleted file mode 100644
index 1a1db85656..0000000000
--- a/html/changelogs/Aztectornado_Stack.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: Aztectornado
-
-# 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: "Clicking a stack of sheets (Metal, phoron...) in your other hand now asks how many you want to split off the stack, courtesy of Baycode"
diff --git a/html/changelogs/Datraen-AntagFactions1.yml b/html/changelogs/Datraen-AntagFactions1.yml
deleted file mode 100644
index c778523bf3..0000000000
--- a/html/changelogs/Datraen-AntagFactions1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
- author: Datraen
-delete-after: True
-changes:
- - rscadd: "Antagonistic factions can now be set and viewed on the uplink. Visibilities can be set for these as well, to help identify sympathizers/potential aids, or to hide the information from those outside of your faction."
\ No newline at end of file
diff --git a/html/changelogs/Yoshax - heavyguns.yml b/html/changelogs/Yoshax - heavyguns.yml
deleted file mode 100644
index c56872c9be..0000000000
--- a/html/changelogs/Yoshax - heavyguns.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: 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:
- - tweak: "The PTR Sniper is now more accurate when scoped, but less accurate when unscoped. In addition it now has more recoil."
- - tweak: "The Laser Cannon no longer holds multiple shots. It holds charge for one shot at a time. This is because the beams it fires now do 90 damage with 100 armor penetration. Furthermore, it is now considerably more accurate. Lastly, to counteract it only holding one shot at a time, it now autorecharges, which takes 60 seconds.
\ No newline at end of file
diff --git a/html/changelogs/yoshax - snowflakes.yml b/html/changelogs/yoshax - snowflakes.yml
deleted file mode 100644
index 169ace483f..0000000000
--- a/html/changelogs/yoshax - snowflakes.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: Yosh
-
-# 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:
- - tweaks: "Increases max records and book length to ridiculous levels."
\ No newline at end of file
diff --git a/html/changelogs/zuhayr-kitchenmachines.yml b/html/changelogs/zuhayr-kitchenmachines.yml
deleted file mode 100644
index b803f4c034..0000000000
--- a/html/changelogs/zuhayr-kitchenmachines.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zuhayr
-delete-after: True
-changes:
- - rscadd: "Ports/adapted several kitchen machines from Apollo Station."
\ No newline at end of file