diff --git a/html/changelog.html b/html/changelog.html
index 1c910a2fcc7..a65ccb33ffa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -66,6 +66,21 @@
 				<li class="rscadd">IPCs now have kicks and stomps.</li>
 				<li class="rscdel">Shells can now bite.</li>
 			</ul>
+			<h3 class="author">Geeves, with some code by BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a ninja frequency to radios which ninjas spawn with to collaborate.</li>
+				<li class="tweak">Two ninjas now spawn instead of just one.</li>
+				<li class="rscadd">Gave the ninja better spawning gear, a syndicate uniform, a belt with some tools and a pAI card.</li>
+				<li class="tweak">The ninja suit now has new lights, and its shoes are now magboots.</li>
+				<li class="rscadd">Added a doorhack RIG module. Functions the same as the normal doorhack, but the user can move around after initiating the hack, as well as hack multiple airlocks at once.</li>
+				<li class="tweak">Gave the ninja teleporter a 5 second cooldown between uses.</li>
+				<li class="rscadd">Added new advanced combat belt, can hold various gear that a ninja would usually come across.</li>
+				<li class="tweak">Buffed the ninja's RIG armour values slightly. Still requires feedback, if ninjas die too quickly, it will be buffed more.</li>
+				<li class="rscadd">Added an additional toolbox, chair, suitcooling unit and ninja spawn point to the ninja shuttle on the centcomm level.</li>
+				<li class="rscadd">Gave the ninja a new uniform + gloves.</li>
+				<li class="tweak">EMERGENCY power generator now generates 2500 units of power, with a cooldown of five minutes.</li>
+				<li class="wip">Gnomes still evading capture. Report any occurences of gnomes and gnome activity to Aurora authorities.</li>
+			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">You will no longer see the station species' death message if you're more than two tiles away from them. Check their pulse or make sure they stop gasping if you're too far away.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e3d072d97bd..606c8867c69 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9047,6 +9047,27 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Geeves:
   - rscadd: IPCs now have kicks and stomps.
   - rscdel: Shells can now bite.
+  Geeves, with some code by BurgerBB:
+  - rscadd: Added a ninja frequency to radios which ninjas spawn with to collaborate.
+  - tweak: Two ninjas now spawn instead of just one.
+  - rscadd: Gave the ninja better spawning gear, a syndicate uniform, a belt with
+      some tools and a pAI card.
+  - tweak: The ninja suit now has new lights, and its shoes are now magboots.
+  - rscadd: Added a doorhack RIG module. Functions the same as the normal doorhack,
+      but the user can move around after initiating the hack, as well as hack multiple
+      airlocks at once.
+  - tweak: Gave the ninja teleporter a 5 second cooldown between uses.
+  - rscadd: Added new advanced combat belt, can hold various gear that a ninja would
+      usually come across.
+  - tweak: Buffed the ninja's RIG armour values slightly. Still requires feedback,
+      if ninjas die too quickly, it will be buffed more.
+  - rscadd: Added an additional toolbox, chair, suitcooling unit and ninja spawn point
+      to the ninja shuttle on the centcomm level.
+  - rscadd: Gave the ninja a new uniform + gloves.
+  - tweak: EMERGENCY power generator now generates 2500 units of power, with a cooldown
+      of five minutes.
+  - wip: Gnomes still evading capture. Report any occurences of gnomes and gnome activity
+      to Aurora authorities.
   MattAtlas:
   - tweak: You will no longer see the station species' death message if you're more
       than two tiles away from them. Check their pulse or make sure they stop gasping
diff --git a/html/changelogs/geeves_duoNinja.yml b/html/changelogs/geeves_duoNinja.yml
deleted file mode 100644
index 848a16f79de..00000000000
--- a/html/changelogs/geeves_duoNinja.yml
+++ /dev/null
@@ -1,52 +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
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.  
-author: Geeves, with some code by BurgerBB
-
-# 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: 
-  - rscadd: "Added a ninja frequency to radios which ninjas spawn with to collaborate."
-  - tweak: "Two ninjas now spawn instead of just one."
-  - rscadd: "Gave the ninja better spawning gear, a syndicate uniform, a belt with some tools and a pAI card."
-  - tweak: "The ninja suit now has new lights, and its shoes are now magboots."
-  - rscadd: "Added a doorhack RIG module. Functions the same as the normal doorhack, but the user can move around after initiating the hack, as well as hack multiple airlocks at once."
-  - tweak: "Gave the ninja teleporter a 5 second cooldown between uses."
-  - rscadd: "Added new advanced combat belt, can hold various gear that a ninja would usually come across."
-  - tweak : "Buffed the ninja's RIG armour values slightly. Still requires feedback, if ninjas die too quickly, it will be buffed more."
-  - rscadd: "Added an additional toolbox, chair, suitcooling unit and ninja spawn point to the ninja shuttle on the centcomm level."
-  - rscadd: Gave the ninja a new uniform + gloves.
-  - tweak: "EMERGENCY power generator now generates 2500 units of power, with a cooldown of five minutes."
-  - wip: "Gnomes still evading capture. Report any occurences of gnomes and gnome activity to Aurora authorities."