diff --git a/html/changelog.html b/html/changelog.html
index c10a224d12d..91113157061 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,34 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">10 July 2018</h2>
+			<h3 class="author">Astatineguy12 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">You can now buy energy shields as a nuke op again</li>
+			</ul>
+			<h3 class="author">Denton updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Box/Delta/Pubbystation: Nuclear explosive-shaped beerkegs have been added to maintenance areas.</li>
+			</ul>
+			<h3 class="author">Naksu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new ghost verb that lets you change your ignore settings, allowing previously ignored popups to be un-ignored and notifications without an ignore button to be ignored</li>
+				<li class="bugfix">Chaplains are once again unable to acquire the inquisition ERT commander's sword, as intended. The sword has been restored to its former glory</li>
+			</ul>
+			<h3 class="author">Supermichael777 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Changelings are no longer prevented from entering stasis by another form of fake death.</li>
+			</ul>
+			<h3 class="author">Wjohnston & ninjanomnom updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Engine heaters and engines have had a minor touch up so they don't meld with the floor quite so much.</li>
+				<li class="tweak">Engine heaters don't block air anymore.</li>
+			</ul>
+			<h3 class="author">XDTM updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Romerol tumors no longer zombify you if you're alive when the revive timer counts down.</li>
+			</ul>
+
 			<h2 class="date">09 July 2018</h2>
 			<h3 class="author">Ausops updated:</h3>
 			<ul class="changes bgimages16">
@@ -1527,17 +1555,6 @@
 				<li class="tweak">The find text integrated circuit now has two new pulse outs, one that runs when it finds the text and one that runs when it does not.</li>
 				<li class="tweak">Leaving the delimiter in the explode text circuit null will now return all of the input string's characters in a list.</li>
 			</ul>
-
-			<h2 class="date">08 May 2018</h2>
-			<h3 class="author">cacogen and nicbn updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">You can now select RPD modes individually.</li>
-				<li class="tweak">RPD autowrenching is now a tgui action rather than an Alt Click option.</li>
-			</ul>
-			<h3 class="author">deathride58 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added ambient occlusion. You can toggle this on or off in the game preferences menu.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9cd622eb3cb..449ae867b43 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18887,3 +18887,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - spellcheck: The Nuke Op uplink no longer lies about how much ammo a C-20r holds.
   - tweak: The L6 SAW now has a small amount of spread. It is still accurate within
       visual range, but it's not as effective at longer ranges.
+2018-07-10:
+  Astatineguy12:
+  - bugfix: You can now buy energy shields as a nuke op again
+  Denton:
+  - rscadd: 'Box/Delta/Pubbystation: Nuclear explosive-shaped beerkegs have been added
+      to maintenance areas.'
+  Naksu:
+  - rscadd: Added a new ghost verb that lets you change your ignore settings, allowing
+      previously ignored popups to be un-ignored and notifications without an ignore
+      button to be ignored
+  - bugfix: Chaplains are once again unable to acquire the inquisition ERT commander's
+      sword, as intended. The sword has been restored to its former glory
+  Supermichael777:
+  - bugfix: Changelings are no longer prevented from entering stasis by another form
+      of fake death.
+  Wjohnston & ninjanomnom:
+  - imageadd: Engine heaters and engines have had a minor touch up so they don't meld
+      with the floor quite so much.
+  - tweak: Engine heaters don't block air anymore.
+  XDTM:
+  - bugfix: Romerol tumors no longer zombify you if you're alive when the revive timer
+      counts down.
diff --git a/html/changelogs/AutoChangeLog-pr-38963.yml b/html/changelogs/AutoChangeLog-pr-38963.yml
deleted file mode 100644
index 1b8852d7b05..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38963.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Supermichael777"
-delete-after: True
-changes: 
-  - bugfix: "Changelings are no longer prevented from entering stasis by another form of fake death."
diff --git a/html/changelogs/AutoChangeLog-pr-38990.yml b/html/changelogs/AutoChangeLog-pr-38990.yml
deleted file mode 100644
index 02780559f67..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38990.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - rscadd: "Added a new ghost verb that lets you change your ignore settings, allowing previously ignored popups to be un-ignored and notifications without an ignore button to be ignored"
diff --git a/html/changelogs/AutoChangeLog-pr-38998.yml b/html/changelogs/AutoChangeLog-pr-38998.yml
deleted file mode 100644
index 05186950e47..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38998.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Wjohnston & ninjanomnom"
-delete-after: True
-changes: 
-  - imageadd: "Engine heaters and engines have had a minor touch up so they don't meld with the floor quite so much."
-  - tweak: "Engine heaters don't block air anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-39001.yml b/html/changelogs/AutoChangeLog-pr-39001.yml
deleted file mode 100644
index 06ef367656c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-39001.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Denton"
-delete-after: True
-changes: 
-  - rscadd: "Box/Delta/Pubbystation: Nuclear explosive-shaped beerkegs have been added to maintenance areas."
diff --git a/html/changelogs/AutoChangeLog-pr-39005.yml b/html/changelogs/AutoChangeLog-pr-39005.yml
deleted file mode 100644
index 886b564d6f0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-39005.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "XDTM"
-delete-after: True
-changes: 
-  - bugfix: "Romerol tumors no longer zombify you if you're alive when the revive timer counts down."
diff --git a/html/changelogs/AutoChangeLog-pr-39020.yml b/html/changelogs/AutoChangeLog-pr-39020.yml
deleted file mode 100644
index c7b7969905d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-39020.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - bugfix: "Chaplains are once again unable to acquire the inquisition ERT commander's sword, as intended. The sword has been restored to its former glory"
diff --git a/html/changelogs/AutoChangeLog-pr-39025.yml b/html/changelogs/AutoChangeLog-pr-39025.yml
deleted file mode 100644
index f2bd9ae7966..00000000000
--- a/html/changelogs/AutoChangeLog-pr-39025.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Astatineguy12"
-delete-after: True
-changes: 
-  - bugfix: "You can now buy energy shields as a nuke op again"