diff --git a/html/changelog.html b/html/changelog.html
index 0b00187daf7..ee6df126300 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,31 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 May 2017</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Proto-kinetic crushers have been worked over by our highly qualified techs, will recharge 12% faster, and no longer require very low-pressure atmospheres to fire!</li>
+				<li class="balance">In addition, our techs have tweaked the quantum linker module and proto-kinetic crushers can apply multiple marks to different targets! Marks applied may eventually expire if not detonated.</li>
+			</ul>
+			<h3 class="author">Steelpoint updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">All Pulse weapons now accurately show, by their sprites, what fire mode they are in.</li>
+				<li class="rscadd">ERT, non-red alert, Security Response Officers spawn with a Tactical Energy Gun. This is a military variant of the Egun that, in addition to laser and disable rounds, has access to stun rounds.</li>
+				<li class="tweak">Pulse Pistols can now be recharged.</li>
+			</ul>
+			<h3 class="author">Swindly updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added modified syringe guns. They fire DNA injectors. Geneticists and CMOs can buy them from the traitor uplink for 14 TC.</li>
+			</ul>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">When a shuttle is called, sometimes an on-call admiral, using available information to them, will recall the shuttle from Centcom.</li>
+			</ul>
+			<h3 class="author">octareenroon91 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Golems touching a shell can now choose to stay in their own body.</li>
+			</ul>
+
 			<h2 class="date">19 May 2017</h2>
 			<h3 class="author">4dplanner updated:</h3>
 			<ul class="changes bgimages16">
@@ -205,11 +230,6 @@
 			</ul>
 
 			<h2 class="date">13 May 2017</h2>
-			<h3 class="author">Kingofcarrotflowerspt1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds Dakimakuras, more colloquially known as "anime girl body pillows"</li>
-				<li class="rscadd">They take up a hand slot and can hold a few items. Many different girls to choose from!</li>
-			</ul>
 			<h3 class="author">QualityVan updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Pizza boxes once again look different when open</li>
@@ -1383,21 +1403,6 @@
 				<li class="bugfix">Fixed Monkey Recycler board not showing in Circuit Imprinter</li>
 				<li class="tweak">Kinetic Accelerator Range Mod now takes up 25% space instead of 24%</li>
 			</ul>
-
-			<h2 class="date">18 March 2017</h2>
-			<h3 class="author">Supermichael777 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Free golems can now buy new ids for 250 points.</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now complete a golem shell with runed metal, if you somehow manage to get both.</li>
-				<li class="rscadd">Runic golems don't have passive bonuses over golems, but they have some special abilities.</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">The alert level is no longer lowered by a nuke's detonation.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a438e19c6ad..4cfa5ffb6c7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11327,3 +11327,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-05-19:
   4dplanner:
   - balance: the Hierophant club has gained in power
+2017-05-20:
+  Joan:
+  - balance: Proto-kinetic crushers have been worked over by our highly qualified
+      techs, will recharge 12% faster, and no longer require very low-pressure atmospheres
+      to fire!
+  - balance: In addition, our techs have tweaked the quantum linker module and proto-kinetic
+      crushers can apply multiple marks to different targets! Marks applied may eventually
+      expire if not detonated.
+  Steelpoint:
+  - rscadd: All Pulse weapons now accurately show, by their sprites, what fire mode
+      they are in.
+  - rscadd: ERT, non-red alert, Security Response Officers spawn with a Tactical Energy
+      Gun. This is a military variant of the Egun that, in addition to laser and disable
+      rounds, has access to stun rounds.
+  - tweak: Pulse Pistols can now be recharged.
+  Swindly:
+  - rscadd: Added modified syringe guns. They fire DNA injectors. Geneticists and
+      CMOs can buy them from the traitor uplink for 14 TC.
+  coiax:
+  - rscadd: When a shuttle is called, sometimes an on-call admiral, using available
+      information to them, will recall the shuttle from Centcom.
+  octareenroon91:
+  - bugfix: Golems touching a shell can now choose to stay in their own body.
diff --git a/html/changelogs/AutoChangeLog-pr-27276.yml b/html/changelogs/AutoChangeLog-pr-27276.yml
deleted file mode 100644
index abf47dddbbc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27276.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Swindly"
-delete-after: True
-changes: 
-  - rscadd: "Added modified syringe guns. They fire DNA injectors. Geneticists and CMOs can buy them from the traitor uplink for 14 TC."
diff --git a/html/changelogs/AutoChangeLog-pr-27379.yml b/html/changelogs/AutoChangeLog-pr-27379.yml
deleted file mode 100644
index 2190640fe2d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27379.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - balance: "Proto-kinetic crushers have been worked over by our highly qualified techs, will recharge 12% faster, and no longer require very low-pressure atmospheres to fire!"
-  - balance: "In addition, our techs have tweaked the quantum linker module and proto-kinetic crushers can apply multiple marks to different targets! Marks applied may eventually expire if not detonated."
diff --git a/html/changelogs/AutoChangeLog-pr-27384.yml b/html/changelogs/AutoChangeLog-pr-27384.yml
deleted file mode 100644
index 59bd6de85e7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27384.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "octareenroon91"
-delete-after: True
-changes: 
-  - bugfix: "Golems touching a shell can now choose to stay in their own body."
diff --git a/html/changelogs/AutoChangeLog-pr-27386.yml b/html/changelogs/AutoChangeLog-pr-27386.yml
deleted file mode 100644
index e7975992633..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27386.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes: 
-  - rscadd: "All Pulse weapons now accurately show, by their sprites, what fire mode they are in."
diff --git a/html/changelogs/AutoChangeLog-pr-27387.yml b/html/changelogs/AutoChangeLog-pr-27387.yml
deleted file mode 100644
index 0cb4ddd10d3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27387.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes: 
-  - rscadd: "ERT, non-red alert, Security Response Officers spawn with a Tactical Energy Gun. This is a military variant of the Egun that, in addition to laser and disable rounds, has access to stun rounds."
diff --git a/html/changelogs/AutoChangeLog-pr-27393.yml b/html/changelogs/AutoChangeLog-pr-27393.yml
deleted file mode 100644
index 3c2108e9b18..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27393.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - rscadd: "When a shuttle is called, sometimes an on-call admiral, using
-available information to them, will recall the shuttle from Centcom."
diff --git a/html/changelogs/AutoChangeLog-pr-27426.yml b/html/changelogs/AutoChangeLog-pr-27426.yml
deleted file mode 100644
index 9cdff3e2be7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27426.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes: 
-  - tweak: "Pulse Pistols can now be recharged."