diff --git a/html/changelog.html b/html/changelog.html
index 7e4e972a070..4388ac43e06 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,46 @@
-->
+
13 April 2015
+
AnturK updated:
+
+ - Spacemen have learned the basics of martial arts: Boxing, unleash it's power by wearing Boxing Gloves.
+ - While boxing you can't grab or disarm, but you hit harder with a knockout chance that scales off stamina damage above 50.
+ - Rumors have been heard of powerful martial styles avaliable only to the gods themselves.
+
+
CosmicScientist updated:
+
+ - Added a dehydrated space carp to traitor items, bought with telecrystals. Use dehydrated space carp in hand to school them on loyalty. Add water to create a vicious murder machine just for the halibut.
+ - The toy carp plushie now has attack verbs for fun, hit your friend with one today. I put my sole into this mod.
+ - If you can think of a better fish pun let minnow but I shouldn't leave it to salmon else.
+
+
Ikarrus updated:
+
+ - Gang bosses can no longer purchase certain potent traitor items but instead have access to some of a nuke op's arsenal of weapons.
+
+
Incoming5643 updated:
+
+ - Three new chemical types of blob can occur: Omnizine, Morphine and Space Drugs.
+
+
MrPerson updated:
+
+ - New lighting system! Lighting now smoothly transfers from one lighting level to the next.
+
+
Xhuis updated:
+
+ - There have been... odd sighting in Space Station 13's sector. Alien organisms have appeared on stations 57, 23, and outlying.
+ - Nanotrasen personnel have reason to believe that Space Station 13 is under attack by shadowlings. We have little intel on these creatures, but be on the lookout for odd behavior and dark areas. Use plenty of lights.
+
+
Zelacks updated:
+
+ - Defibs no longer have a minimum damage requirement for a successful revive. Patients will have 150 total damage on a successful revive.
+ - Additional feedback is given for several failure states of the defib.
+
+
xxalpha updated:
+
+ - Airlock crushing damage increased.
+
+
11 April 2015
Gun Hog updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 94183ce73e0..c87337b27df 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2144,3 +2144,40 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: The kitchen cabinet starts with one rice pack.
- tweak: Glasses with unknown reagent will no longer be always brown but will take
the color of their reagents.
+2015-04-13:
+ AnturK:
+ - rscadd: 'Spacemen have learned the basics of martial arts: Boxing, unleash it''s
+ power by wearing Boxing Gloves.'
+ - rscadd: While boxing you can't grab or disarm, but you hit harder with a knockout
+ chance that scales off stamina damage above 50.
+ - rscadd: Rumors have been heard of powerful martial styles avaliable only to the
+ gods themselves.
+ CosmicScientist:
+ - rscadd: Added a dehydrated space carp to traitor items, bought with telecrystals.
+ Use dehydrated space carp in hand to school them on loyalty. Add water to create
+ a vicious murder machine just for the halibut.
+ - tweak: The toy carp plushie now has attack verbs for fun, hit your friend with
+ one today. I put my sole into this mod.
+ - wip: If you can think of a better fish pun let minnow but I shouldn't leave it
+ to salmon else.
+ Ikarrus:
+ - tweak: Gang bosses can no longer purchase certain potent traitor items but instead
+ have access to some of a nuke op's arsenal of weapons.
+ Incoming5643:
+ - rscadd: 'Three new chemical types of blob can occur: Omnizine, Morphine and Space
+ Drugs.'
+ MrPerson:
+ - experiment: New lighting system! Lighting now smoothly transfers from one lighting
+ level to the next.
+ Xhuis:
+ - rscadd: There have been... odd sighting in Space Station 13's sector. Alien organisms
+ have appeared on stations 57, 23, and outlying.
+ - rscadd: Nanotrasen personnel have reason to believe that Space Station 13 is under
+ attack by shadowlings. We have little intel on these creatures, but be on the
+ lookout for odd behavior and dark areas. Use plenty of lights.
+ Zelacks:
+ - tweak: Defibs no longer have a minimum damage requirement for a successful revive.
+ Patients will have 150 total damage on a successful revive.
+ - tweak: Additional feedback is given for several failure states of the defib.
+ xxalpha:
+ - wip: Airlock crushing damage increased.
diff --git a/html/changelogs/CosmicScientist-SpaceCarpTatorItem.yml b/html/changelogs/CosmicScientist-SpaceCarpTatorItem.yml
deleted file mode 100644
index e89ced52f82..00000000000
--- a/html/changelogs/CosmicScientist-SpaceCarpTatorItem.yml
+++ /dev/null
@@ -1,38 +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
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: CosmicScientist
-
-# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Added a dehydrated space carp to traitor items, bought with telecrystals. Use dehydrated space carp in hand to school them on loyalty. Add water to create a vicious murder machine just for the halibut."
- - tweak: "The toy carp plushie now has attack verbs for fun, hit your friend with one today. I put my sole into this mod."
- - wip: "If you can think of a better fish pun let minnow but I shouldn't leave it to salmon else."
\ No newline at end of file
diff --git a/html/changelogs/MrPerson.yml b/html/changelogs/MrPerson.yml
index 642ce9a49f5..6378584f30e 100644
--- a/html/changelogs/MrPerson.yml
+++ b/html/changelogs/MrPerson.yml
@@ -1,3 +1,2 @@
author: MrPerson
-changes:
- - experiment: "New lighting system! Lighting now smoothly transfers from one lighting level to the next."
+changes: []
diff --git a/html/changelogs/Xhuis-Shadowling.yml b/html/changelogs/Xhuis-Shadowling.yml
deleted file mode 100644
index 14b5506994d..00000000000
--- a/html/changelogs/Xhuis-Shadowling.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Xhuis
-delete-after: true
-
-
-changes:
- - rscadd: "There have been... odd sighting in Space Station 13's sector. Alien organisms have appeared on stations 57, 23, and outlying."
- - rscadd: "Nanotrasen personnel have reason to believe that Space Station 13 is under attack by shadowlings. We have little intel on these creatures, but be on the lookout for odd behavior and dark areas. Use plenty of lights."
diff --git a/html/changelogs/defibChange-Zel.yml b/html/changelogs/defibChange-Zel.yml
deleted file mode 100644
index 489d913c855..00000000000
--- a/html/changelogs/defibChange-Zel.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Zelacks
-
-delete-after: True
-
-changes:
- - tweak: "Defibs no longer have a minimum damage requirement for a successful revive. Patients will have 150 total damage on a successful revive."
- - tweak: "Additional feedback is given for several failure states of the defib."