diff --git a/html/changelog.html b/html/changelog.html
index 9b6b059394a..d053021a1d7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">04 October 2015</h2>
+			<h3 class="author">Fox P McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adds a bar of soap to the janitor's locker.</li>
+				<li class="rscadd">Re-adds the advanced mop as a researchable R&D item.</li>
+				<li class="rscadd">Adds a bluespace trashbag as a researchable R&D item; can hold large quantities of garbage.</li>
+			</ul>
 			<h3 class="author">Jordie0608 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added Special Verb 'Create Poll', an in-game interface to create server polls for admins with +permissions.</li>
@@ -64,6 +70,14 @@
 			<ul class="changes bgimages16">
 				<li class="rscdel">Removed NTSL. Sorry. People could write scripts that crashed the server, and this is the only thing that can be done to prevent them from doing that.</li>
 			</ul>
+			<h3 class="author">MrStonedOne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed feature where quick consecutive ghost orbits while moving could be used to fuck with your sprite</li>
+				<li class="bugfix">Fixed ghosts losing floating animation when returning from an orbit</li>
+				<li class="bugfix">Fixed logic error that prevented orbit's automatic cancel when the orbiting thing moved in certain situations.</li>
+				<li class="rscadd">Ghost Orbit size now changes based on the icon size of the thing they are orbiting (for that sweet sweet singulo orbiting action)</li>
+				<li class="tweak">Removed needless checks in ghost orbit, you can now orbit yourself and restart an orbit around the thing you are already orbiting</li>
+			</ul>
 			<h3 class="author">Xhuis updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Syndicate Medical cyborgs now have cryptographic sequencers.</li>
@@ -73,6 +87,10 @@
 				<li class="bugfix">Syndicate Assault cyborgs no longer start with medical supplies.</li>
 				<li class="bugfix">Energy saws now have a proper icon.</li>
 				<li class="bugfix">Non-operatives can now longer use operative pinpointers or Syndicate cyborg teleporters.</li>
+				<li class="tweak">Doctor's Delight now requires cryoxadone in its recipe instead of omnizine.</li>
+				<li class="tweak">Doctor's Delight now restores half a point of brute, burn, toxin, and oxygen damage per tick.</li>
+				<li class="tweak">Doctor's Delight now drains nutrition while it's in your system (that is, unless you're a doctor).</li>
+				<li class="bugfix">Syndicate roboticists have given Syndicate medical cyborgs sharper hypospray needles - they are now able to penetrate armor.</li>
 			</ul>
 
 			<h2 class="date">29 September 2015</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 36536e0153e..df97f829c94 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1960,12 +1960,27 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Guardian powers are now used via alt+click rather than shift+click.
   - tweak: Added an alert chime for ghosts when someone is summoning a Guardian.
 2015-10-04:
+  Fox P McCloud:
+  - tweak: Adds a bar of soap to the janitor's locker.
+  - rscadd: Re-adds the advanced mop as a researchable R&D item.
+  - rscadd: Adds a bluespace trashbag as a researchable R&D item; can hold large quantities
+      of garbage.
   Jordie0608:
   - rscadd: Added Special Verb 'Create Poll', an in-game interface to create server
       polls for admins with +permissions.
   MrPerson:
   - rscdel: Removed NTSL. Sorry. People could write scripts that crashed the server,
       and this is the only thing that can be done to prevent them from doing that.
+  MrStonedOne:
+  - rscdel: Removed feature where quick consecutive ghost orbits while moving could
+      be used to fuck with your sprite
+  - bugfix: Fixed ghosts losing floating animation when returning from an orbit
+  - bugfix: Fixed logic error that prevented orbit's automatic cancel when the orbiting
+      thing moved in certain situations.
+  - rscadd: Ghost Orbit size now changes based on the icon size of the thing they
+      are orbiting (for that sweet sweet singulo orbiting action)
+  - tweak: Removed needless checks in ghost orbit, you can now orbit yourself and
+      restart an orbit around the thing you are already orbiting
   Xhuis:
   - rscadd: Syndicate Medical cyborgs now have cryptographic sequencers.
   - rscdel: Syndicate Medical cyborgs no longer have syringes.
@@ -1975,3 +1990,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Energy saws now have a proper icon.
   - bugfix: Non-operatives can now longer use operative pinpointers or Syndicate cyborg
       teleporters.
+  - tweak: Doctor's Delight now requires cryoxadone in its recipe instead of omnizine.
+  - tweak: Doctor's Delight now restores half a point of brute, burn, toxin, and oxygen
+      damage per tick.
+  - tweak: Doctor's Delight now drains nutrition while it's in your system (that is,
+      unless you're a doctor).
+  - bugfix: Syndicate roboticists have given Syndicate medical cyborgs sharper hypospray
+      needles - they are now able to penetrate armor.
diff --git a/html/changelogs/Fox P McCloud - advancedmop .yml b/html/changelogs/Fox P McCloud - advancedmop .yml
deleted file mode 100644
index 7bc5b81d601..00000000000
--- a/html/changelogs/Fox P McCloud - advancedmop .yml	
+++ /dev/null
@@ -1,10 +0,0 @@
-
-author: Fox P McCloud
-
-delete-after: True
-
-changes: 
-  - tweak: "Adds a bar of soap to the janitor's locker."
-  - rscadd: "Re-adds the advanced mop as a researchable R&D item."
-  - rscadd: "Adds a bluespace trashbag as a researchable R&D item; can hold large quantities
- of garbage."
diff --git a/html/changelogs/Xhuis-DoctorsDelight.yml b/html/changelogs/Xhuis-DoctorsDelight.yml
deleted file mode 100644
index 0e77af1b2fb..00000000000
--- a/html/changelogs/Xhuis-DoctorsDelight.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Xhuis
-delete-after: True
-
-changes:
-  - tweak: "Doctor's Delight now requires cryoxadone in its recipe instead of omnizine."
-  - tweak: "Doctor's Delight now restores half a point of brute, burn, toxin, and oxygen damage per tick."
-  - tweak: "Doctor's Delight now drains nutrition while it's in your system (that is, unless you're a doctor)."
\ No newline at end of file
diff --git a/html/changelogs/Xhuis-SyndiborgFixAgain.yml b/html/changelogs/Xhuis-SyndiborgFixAgain.yml
deleted file mode 100644
index ea0d30a91d6..00000000000
--- a/html/changelogs/Xhuis-SyndiborgFixAgain.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Xhuis
-delete-after: True
-
-changes: 
-  - bugfix: "Syndicate roboticists have given Syndicate medical cyborgs sharper hypospray needles - they are now able to penetrate armor."
diff --git a/html/changelogs/mso-orbittweaks.yml b/html/changelogs/mso-orbittweaks.yml
deleted file mode 100644
index 4e9f91034b0..00000000000
--- a/html/changelogs/mso-orbittweaks.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: MrStonedOne
-
-delete-after: True
-
-changes: 
-  - rscdel: "Removed feature where quick consecutive ghost orbits while moving could be used to fuck with your sprite"
-  - bugfix: "Fixed ghosts losing floating animation when returning from an orbit"
-  - bugfix: "Fixed logic error that prevented orbit's automatic cancel when the orbiting thing moved in certain situations."
-  - rscadd: "Ghost Orbit size now changes based on the icon size of the thing they are orbiting (for that sweet sweet singulo orbiting action)"
-  - tweak: "Removed needless checks in ghost orbit, you can now orbit yourself and restart an orbit around the thing you are already orbiting"