diff --git a/html/changelog.html b/html/changelog.html
index 6cc3c3bc315..0aadb8c8798 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,36 @@
-->
+
22 May 2015
+
Ccomp5950 updated:
+
+ - Beepsky no longer kills goats.
+ - Goats will move towards vines that are 4 spaces away now instead of 1
+ - Goats will eat the spawning plants for vines as well as the vines themselves.
+
+
Chinsky updated:
+
+ - Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click on them with help intent. This will tell you about their wounds, fractures and other oddities (toxins/oxygen) for that bodypart.
+ - Fractures are visible on very damaged limbs. Dislocations are always visible. Surgery incisions now visible too.
+ - Stethoscopes actually make sense now. They care for heart/lungs status when reporting pulse and respiration now.
+
+
HarpyEagle updated:
+
+ - Re-implemented fuel fires. Tweaked fire behaviour overall.
+
+
Yoshax updated:
+
+ - Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack.
+ - Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they are deployed.
+
+
Zuhayr updated:
+
+ - Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays, knives, baseball bats, axes, simple doors, barricades, so on.
+ - Tables are now built via steel then another sheet on the resulting frame. They can then be reinforced by dragging a stack of sheets onto the table.
+ - Walls are built with steel for girders, then right-click the girder and select the reinforce verb while holding a stack, then click the girders with a final sheet.
+ - Various things can be built with various sheet types. Experiment! Just keep in mind that uranium is now radioactive and phoron is now flammable.
+
+
18 May 2015
Hubblenaut updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a0bf108e0e1..25b2ca7dc7e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1816,3 +1816,35 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Turf are now processed. This, for example, causes radioactive walls to
regularly irradiate nearby mobs.
- bugfix: Welders should now always update their icon and inhand states properly.
+2015-05-22:
+ Ccomp5950:
+ - bugfix: Beepsky no longer kills goats.
+ - tweak: Goats will move towards vines that are 4 spaces away now instead of 1
+ - bugfix: Goats will eat the spawning plants for vines as well as the vines themselves.
+ Chinsky:
+ - rscadd: Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click
+ on them with help intent. This will tell you about their wounds, fractures and
+ other oddities (toxins/oxygen) for that bodypart.
+ - rscadd: Fractures are visible on very damaged limbs. Dislocations are always visible.
+ Surgery incisions now visible too.
+ - rscadd: Stethoscopes actually make sense now. They care for heart/lungs status
+ when reporting pulse and respiration now.
+ HarpyEagle:
+ - rscadd: Re-implemented fuel fires. Tweaked fire behaviour overall.
+ Yoshax:
+ - tweak: Bear traps now do damage when stood on, enough to break bones! Bear traps
+ can now affect any limb of a person who is on the ground, including head! Bear
+ traps are no longer legcuffs and instead embed in the limb they attack.
+ - tweak: Bear traps now take several seconds to deploy and cannot be picked up when
+ armed, they must be disarmed by clicking on them. They also cannot be moved
+ then they are deployed.
+ Zuhayr:
+ - rscadd: Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays,
+ knives, baseball bats, axes, simple doors, barricades, so on.
+ - rscadd: Tables are now built via steel then another sheet on the resulting frame.
+ They can then be reinforced by dragging a stack of sheets onto the table.
+ - rscadd: Walls are built with steel for girders, then right-click the girder and
+ select the reinforce verb while holding a stack, then click the girders with
+ a final sheet.
+ - rscadd: Various things can be built with various sheet types. Experiment! Just
+ keep in mind that uranium is now radioactive and phoron is now flammable.
diff --git a/html/changelogs/Ccomp5950-Goats.yml b/html/changelogs/Ccomp5950-Goats.yml
deleted file mode 100644
index be80867380f..00000000000
--- a/html/changelogs/Ccomp5950-Goats.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Ccomp5950
-delete-after: True
-
-changes:
- - bugfix: "Beepsky no longer kills goats."
- - tweak: "Goats will move towards vines that are 4 spaces away now instead of 1"
- - bugfix: "Goats will eat the spawning plants for vines as well as the vines themselves."
diff --git a/html/changelogs/Comma-PR-9337.yml b/html/changelogs/Comma-PR-9337.yml
deleted file mode 100644
index cf1aac28916..00000000000
--- a/html/changelogs/Comma-PR-9337.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Chinsky
-
-delete-after: True
-
-changes:
- - rscadd: "Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click on them with help intent. This will tell you about their wounds, fractures and other oddities (toxins/oxygen) for that bodypart."
- - rscadd: "Fractures are visible on very damaged limbs. Dislocations are always visible. Surgery incisions now visible too."
- - rscadd: "Stethoscopes actually make sense now. They care for heart/lungs status when reporting pulse and respiration now."
\ No newline at end of file
diff --git a/html/changelogs/HarpyEagle-fire.yml b/html/changelogs/HarpyEagle-fire.yml
deleted file mode 100644
index 66537a821ef..00000000000
--- a/html/changelogs/HarpyEagle-fire.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: HarpyEagle
-delete-after: True
-changes:
- - rscadd: "Re-implemented fuel fires. Tweaked fire behaviour overall."
diff --git a/html/changelogs/Yoshax - trapping.YML b/html/changelogs/Yoshax - trapping.YML
deleted file mode 100644
index d9b7884761a..00000000000
--- a/html/changelogs/Yoshax - trapping.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: "Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack."
- - tweak: "Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they are deployed."
\ No newline at end of file
diff --git a/html/changelogs/Zuhayr-materials.yml b/html/changelogs/Zuhayr-materials.yml
deleted file mode 100644
index 78d873857c5..00000000000
--- a/html/changelogs/Zuhayr-materials.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Zuhayr
-delete-after: True
-changes:
- - rscadd: "Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays, knives, baseball bats, axes, simple doors, barricades, so on."
- - rscadd: "Tables are now built via steel then another sheet on the resulting frame. They can then be reinforced by dragging a stack of sheets onto the table."
- - rscadd: "Walls are built with steel for girders, then right-click the girder and select the reinforce verb while holding a stack, then click the girders with a final sheet."
- - rscadd: "Various things can be built with various sheet types. Experiment! Just keep in mind that uranium is now radioactive and phoron is now flammable."
\ No newline at end of file