diff --git a/html/changelog.html b/html/changelog.html
index 0cbbac1eaae..311053cf2c9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,15 +65,21 @@
Gagging now occurs only when the mob has no nutrition at all. It no longer causes three toxin damage, only weakens as before.
Vomiting and/or gagging from toxins now occurs regardless of nutrition, not only 20+.
- N3X15 updated:
+ Yoshax updated:
- Repairing burn damage on FBPs will now once again properly work.
- Undislocating limbs will now once again properly work.
+ Neerti updated:
+
+ - Adds ability for ghosts to send and receive text messages via communicator.
+
Yoshax updated:
- Drop pod contents have been adjusted. In general, you will get something more useful and the less useful contents have been made more interesting. There is a total of 12 drop pod content lists and 7/12 are useful, 4/12 are useless, 1/12 is potentially useful.
- Stun Revolvers will no longer be able to spawn from random energy weapon spawns. In addition, some of the other random item spawns have new items and adjusted probablities.
+ - Tajaran are no longer negatively affected by coffee.
+ - Bucklecuffing as it has been known for the longest time is no longer a thing. When you resist when cuffed and buckled to something, you will now resist out of the handcuffs first, allowing you to simply unbuckle yourself once done.
13 July 2016
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4d30803b5c6..be34f6a2e06 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2549,9 +2549,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
causes three toxin damage, only weakens as before.
- tweak: Vomiting and/or gagging from toxins now occurs regardless of nutrition,
not only 20+.
- N3X15:
+ Yoshax:
- bugfix: Repairing burn damage on FBPs will now once again properly work.
- bugfix: Undislocating limbs will now once again properly work.
+ Neerti:
+ - rscadd: Adds ability for ghosts to send and receive text messages via communicator.
Yoshax:
- tweak: Drop pod contents have been adjusted. In general, you will get something
more useful and the less useful contents have been made more interesting. There
@@ -2560,3 +2562,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Stun Revolvers will no longer be able to spawn from random energy weapon
spawns. In addition, some of the other random item spawns have new items and
adjusted probablities.
+ - rscdel: Tajaran are no longer negatively affected by coffee.
+ - tweak: Bucklecuffing as it has been known for the longest time is no longer a
+ thing. When you resist when cuffed and buckled to something, you will now resist
+ out of the handcuffs first, allowing you to simply unbuckle yourself once done.
diff --git a/html/changelogs/Neerti-CommunicatorGhostTexting.yml b/html/changelogs/Neerti-CommunicatorGhostTexting.yml
deleted file mode 100644
index 2a1cff25c7a..00000000000
--- a/html/changelogs/Neerti-CommunicatorGhostTexting.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: Neerti
-
-# 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: "Adds ability for ghosts to send and receive text messages via communicator."
diff --git a/html/changelogs/Yoshax - Coffee.yml b/html/changelogs/Yoshax - Coffee.yml
deleted file mode 100644
index ec24e85a9dd..00000000000
--- a/html/changelogs/Yoshax - Coffee.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:
- - rscdel: "Tajaran are no longer negatively affected by coffee."
diff --git a/html/changelogs/Yoshax - Shitcuritygohome.yml b/html/changelogs/Yoshax - Shitcuritygohome.yml
deleted file mode 100644
index 2395b5f7f90..00000000000
--- a/html/changelogs/Yoshax - Shitcuritygohome.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:
- - tweak: "Bucklecuffing as it has been known for the longest time is no longer a thing. When you resist when cuffed and buckled to something, you will now resist out of the handcuffs first, allowing you to simply unbuckle yourself once done."