diff --git a/html/changelog.html b/html/changelog.html
index 4bc53be9312..c541c97d8c4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,63 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">15 December 2017</h2>
+			<h3 class="author">AverageJoe82 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">drones now have night vision</li>
+				<li class="rscdel">drones no longer have lights</li>
+			</ul>
+			<h3 class="author">Cruix updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Shuttles now place hyperspace ripples where they are about to land again.</li>
+			</ul>
+			<h3 class="author">Cyberboss updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="config">Added "$include" directives to config files. These are recursive. Only config.txt will be default loaded if they are specified inside it</li>
+				<li class="config">Added multi string list entry CROSS_SERVER. e.g. CROSS_SERVER Server+Name byond://server.net:1337</li>
+				<li class="config">CROSS_SERVER_ADDRESS removed</li>
+			</ul>
+			<h3 class="author">Epoc updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Adds Cybernetic Lungs to the Cyber Organs research node</li>
+			</ul>
+			<h3 class="author">JStheguy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added 10 new assembly designs to the integrated circuit printer, the difference from current designs is purely aesthetics.</li>
+				<li class="imageadd">Added the icons for said new assembly designs to electronic_setups.dmi, changed the current electronic mechanism and electronic machine sprites.</li>
+			</ul>
+			<h3 class="author">MrStonedOne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="server">Added new admin flag, AUTOLOGIN, to control if admins start with admin powers. this defaults to on, and can be removed with -AUTOLOGIN</li>
+				<li class="admin">Admins with +PERMISSION may now deadmin or readmin other admins via the permission panel.</li>
+			</ul>
+			<h3 class="author">Naksu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="code_imp">Preliminary work on tracking cliented living mobs across Z-levels to facilitate mob AI changes later</li>
+				<li class="code_imp">Tidied up some loc assignments</li>
+				<li class="code_imp">fixes the remaining loc assignments</li>
+			</ul>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">Revamped gun dry-firing sounds.</li>
+				<li class="tweak">Everyone around you will now hear when your gun goes click. You don't want to hear click when you want to hear bang!</li>
+			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="code_imp">Remote signaler and other non-telecomms radio code has been cleaned up.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Grinding runed metal and brass now produces iron/blood and iron/teslium, respectively.</li>
+				<li class="balance">As part of some code-side improvements, the amount of reagents you get from grinding some objects might be slightly different.</li>
+				<li class="bugfix">Some grinding recipes that didn't work, like dead mice and glowsticks, now do.</li>
+				<li class="bugfix">All-In-One grinders now correctly grind up everything, instead of one thing at a time.</li>
+			</ul>
+			<h3 class="author">nicbn updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Closet sprites changed.</li>
+			</ul>
+
 			<h2 class="date">13 December 2017</h2>
 			<h3 class="author">Naksu updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 36e664b4050..c2e9ed3322a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14308,3 +14308,50 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   deathride58:
   - bugfix: Genetics will no longer have a random block completely disappear each
       round
+2017-12-15:
+  AverageJoe82:
+  - rscadd: drones now have night vision
+  - rscdel: drones no longer have lights
+  Cruix:
+  - bugfix: Shuttles now place hyperspace ripples where they are about to land again.
+  Cyberboss:
+  - config: Added "$include" directives to config files. These are recursive. Only
+      config.txt will be default loaded if they are specified inside it
+  - config: Added multi string list entry CROSS_SERVER. e.g. CROSS_SERVER Server+Name
+      byond://server.net:1337
+  - config: CROSS_SERVER_ADDRESS removed
+  Epoc:
+  - bugfix: Adds Cybernetic Lungs to the Cyber Organs research node
+  JStheguy:
+  - rscadd: Added 10 new assembly designs to the integrated circuit printer, the difference
+      from current designs is purely aesthetics.
+  - imageadd: Added the icons for said new assembly designs to electronic_setups.dmi,
+      changed the current electronic mechanism and electronic machine sprites.
+  MrStonedOne:
+  - server: Added new admin flag, AUTOLOGIN, to control if admins start with admin
+      powers. this defaults to on, and can be removed with -AUTOLOGIN
+  - admin: Admins with +PERMISSION may now deadmin or readmin other admins via the
+      permission panel.
+  Naksu:
+  - code_imp: Preliminary work on tracking cliented living mobs across Z-levels to
+      facilitate mob AI changes later
+  - code_imp: Tidied up some loc assignments
+  - code_imp: fixes the remaining loc assignments
+  ShizCalev:
+  - soundadd: Revamped gun dry-firing sounds.
+  - tweak: Everyone around you will now hear when your gun goes click. You don't want
+      to hear click when you want to hear bang!
+  SpaceManiac:
+  - code_imp: Remote signaler and other non-telecomms radio code has been cleaned
+      up.
+  Xhuis:
+  - rscadd: Grinding runed metal and brass now produces iron/blood and iron/teslium,
+      respectively.
+  - balance: As part of some code-side improvements, the amount of reagents you get
+      from grinding some objects might be slightly different.
+  - bugfix: Some grinding recipes that didn't work, like dead mice and glowsticks,
+      now do.
+  - bugfix: All-In-One grinders now correctly grind up everything, instead of one
+      thing at a time.
+  nicbn:
+  - imageadd: Closet sprites changed.
diff --git a/html/changelogs/AutoChangeLog-pr-33181.yml b/html/changelogs/AutoChangeLog-pr-33181.yml
deleted file mode 100644
index 5234e24f492..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33181.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Xhuis"
-delete-after: True
-changes: 
-  - rscadd: "Grinding runed metal and brass now produces iron/blood and iron/teslium, respectively."
-  - balance: "As part of some code-side improvements, the amount of reagents you get from grinding some objects might be slightly different."
-  - bugfix: "Some grinding recipes that didn't work, like dead mice and glowsticks, now do."
-  - bugfix: "All-In-One grinders now correctly grind up everything, instead of one thing at a time."
diff --git a/html/changelogs/AutoChangeLog-pr-33207.yml b/html/changelogs/AutoChangeLog-pr-33207.yml
deleted file mode 100644
index 34e1f53686d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33207.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "nicbn"
-delete-after: True
-changes: 
-  - imageadd: "Closet sprites changed."
diff --git a/html/changelogs/AutoChangeLog-pr-33216.yml b/html/changelogs/AutoChangeLog-pr-33216.yml
deleted file mode 100644
index cf9c743a03e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33216.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - code_imp: "Preliminary work on tracking cliented living mobs across Z-levels to facilitate mob AI changes later"
diff --git a/html/changelogs/AutoChangeLog-pr-33307.yml b/html/changelogs/AutoChangeLog-pr-33307.yml
deleted file mode 100644
index 110f7e6f2fa..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33307.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes: 
-  - config: "Added \"$include\" directives to config files. These are recursive. Only config.txt will be default loaded if they are specified inside it"
diff --git a/html/changelogs/AutoChangeLog-pr-33381.yml b/html/changelogs/AutoChangeLog-pr-33381.yml
deleted file mode 100644
index 96f2e6846db..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33381.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - code_imp: "Remote signaler and other non-telecomms radio code has been cleaned up."
diff --git a/html/changelogs/AutoChangeLog-pr-33465.yml b/html/changelogs/AutoChangeLog-pr-33465.yml
deleted file mode 100644
index e9aa1f0f2bf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33465.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - code_imp: "Tidied up some loc assignments"
diff --git a/html/changelogs/AutoChangeLog-pr-33466.yml b/html/changelogs/AutoChangeLog-pr-33466.yml
deleted file mode 100644
index fda81eb42be..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33466.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "JStheguy"
-delete-after: True
-changes: 
-  - rscadd: "Added 10 new assembly designs to the integrated circuit printer, the difference from current designs is purely aesthetics."
-  - imageadd: "Added the icons for said new assembly designs to electronic_setups.dmi, changed the current electronic mechanism and electronic machine sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-33480.yml b/html/changelogs/AutoChangeLog-pr-33480.yml
deleted file mode 100644
index 633b8339f37..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33480.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "MrStonedOne"
-delete-after: True
-changes: 
-  - server: "Added new admin flag, AUTOLOGIN, to control if admins start with admin powers. this defaults to on, and can be removed with -AUTOLOGIN"
-  - admin: "Admins with +PERMISSION may now deadmin or readmin other admins via the permission panel."
diff --git a/html/changelogs/AutoChangeLog-pr-33488.yml b/html/changelogs/AutoChangeLog-pr-33488.yml
deleted file mode 100644
index 0df1e1b22b6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33488.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes: 
-  - config: "Added multi string list entry CROSS_SERVER. e.g. CROSS_SERVER Server+Name byond://server.net:1337"
-  - config: "CROSS_SERVER_ADDRESS removed"
diff --git a/html/changelogs/AutoChangeLog-pr-33490.yml b/html/changelogs/AutoChangeLog-pr-33490.yml
deleted file mode 100644
index 165bb4d0df8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33490.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Epoc"
-delete-after: True
-changes: 
-  - bugfix: "Adds Cybernetic Lungs to the Cyber Organs research node"
diff --git a/html/changelogs/AutoChangeLog-pr-33497.yml b/html/changelogs/AutoChangeLog-pr-33497.yml
deleted file mode 100644
index 5f4807cbec5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33497.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cruix"
-delete-after: True
-changes: 
-  - bugfix: "Shuttles now place hyperspace ripples where they are about to land again."
diff --git a/html/changelogs/AutoChangeLog-pr-33503.yml b/html/changelogs/AutoChangeLog-pr-33503.yml
deleted file mode 100644
index 7c1aa4b97c2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33503.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes: 
-  - soundadd: "Revamped gun dry-firing sounds."
-  - tweak: "Everyone around you will now hear when your gun goes click. You don't want to hear click when you want to hear bang!"
diff --git a/html/changelogs/AutoChangeLog-pr-33519.yml b/html/changelogs/AutoChangeLog-pr-33519.yml
deleted file mode 100644
index 2cf7f4c721d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33519.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - code_imp: "fixes the remaining loc assignments"
diff --git a/html/changelogs/AutoChangeLog-pr-33529.yml b/html/changelogs/AutoChangeLog-pr-33529.yml
deleted file mode 100644
index 89d3683a34c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33529.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "AverageJoe82"
-delete-after: True
-changes: 
-  - rscadd: "drones now have night vision"
-  - rscdel: "drones no longer have lights"