diff --git a/html/changelog.html b/html/changelog.html
index 0d67d545538..b22e0e3b38a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,12 +36,29 @@
12 May 2021
+
Geeves updated:
+
+ - Added a loadout option to shoes to make them spawn in your choice of under or over their uniforms.
+ - Attacking someone with a sharp or edged weapon now has a chance to splatter blood to any tile around them.
+ - Arterial sprays can now go onto walls.
+ - Sharp or edged weapons are now twice as likely to cover you in blood as an attacker.
+ - Flight helmets can now link to shuttle computers to give you a status readout on your main HUD, though the visor needs to be flipped down.
+
+
TheGreyWolf updated:
+
+ - Shastar Leaves & Royal Choice cigarettes are now in the vending machine for all your lung killing needs.
+
WickedCybs updated:
- Left facing sprite of the radhood was misaligned, it's been corrected by being shifted one pixel to the left.
- The Freelancers distress team has had its equipment changed up. Everyone now gets sidearms, the leader getting a revolver and the rest having .45s. The 10mm submachineguns have been swapped for a .45 submachinegun. People who lacked a knife have one now. At the baseline, they're stil one of the weaker ERT's comparatively but no longer major pushovers other than the lead, who has always been good.
- Freelancers now get some additional equipment if they're rolled. The Distress team base will give them zippos, cigars, holsters, vests and a few weapon racks that will provide random guns to vary up their firepower within reason. No two merc outfits are alike, right?
+
William Murdoch updated:
+
+ - Adds a telecopic cane which can be found in the loadout under cane.
+ - Merges white cane and crutches under the cane option in the loadout.
+
10 May 2021
Geeves updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4d7a0f21493..9508b73f687 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -19943,6 +19943,19 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
and beacon responders. The additional modules are more themed around its policing
aesthetic and include a mounted gun, actuators and more.
2021-05-12:
+ Geeves:
+ - rscadd: Added a loadout option to shoes to make them spawn in your choice of under
+ or over their uniforms.
+ - rscadd: Attacking someone with a sharp or edged weapon now has a chance to splatter
+ blood to any tile around them.
+ - tweak: Arterial sprays can now go onto walls.
+ - tweak: Sharp or edged weapons are now twice as likely to cover you in blood as
+ an attacker.
+ - rscadd: Flight helmets can now link to shuttle computers to give you a status
+ readout on your main HUD, though the visor needs to be flipped down.
+ TheGreyWolf:
+ - rscadd: Shastar Leaves & Royal Choice cigarettes are now in the vending machine
+ for all your lung killing needs.
WickedCybs:
- bugfix: Left facing sprite of the radhood was misaligned, it's been corrected
by being shifted one pixel to the left.
@@ -19956,3 +19969,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
The Distress team base will give them zippos, cigars, holsters, vests and a
few weapon racks that will provide random guns to vary up their firepower within
reason. No two merc outfits are alike, right?
+ William Murdoch:
+ - rscadd: Adds a telecopic cane which can be found in the loadout under cane.
+ - tweak: Merges white cane and crutches under the cane option in the loadout.
diff --git a/html/changelogs/SmokeLungs.yml b/html/changelogs/SmokeLungs.yml
deleted file mode 100644
index c6938df2c8e..00000000000
--- a/html/changelogs/SmokeLungs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
- - rscadd: "Shastar Leaves & Royal Choice cigarettes are now in the vending machine for all your lung killing needs."
\ No newline at end of file
diff --git a/html/changelogs/William Murdoch - Telecopic Cane.yml b/html/changelogs/William Murdoch - Telecopic Cane.yml
deleted file mode 100644
index 9d9e2cb569d..00000000000
--- a/html/changelogs/William Murdoch - Telecopic Cane.yml
+++ /dev/null
@@ -1,42 +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: William Murdoch
-
-# 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: "Adds a telecopic cane which can be found in the loadout under cane."
- - tweak: "Merges white cane and crutches under the cane option in the loadout."
\ No newline at end of file
diff --git a/html/changelogs/geeves-blood_splatter.yml b/html/changelogs/geeves-blood_splatter.yml
deleted file mode 100644
index b88a21a0425..00000000000
--- a/html/changelogs/geeves-blood_splatter.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
- - rscadd: "Attacking someone with a sharp or edged weapon now has a chance to splatter blood to any tile around them."
- - tweak: "Arterial sprays can now go onto walls."
- - tweak: "Sharp or edged weapons are now twice as likely to cover you in blood as an attacker."
\ No newline at end of file
diff --git a/html/changelogs/geeves-pilot_helmet.yml b/html/changelogs/geeves-pilot_helmet.yml
deleted file mode 100644
index fc3e84fbf7c..00000000000
--- a/html/changelogs/geeves-pilot_helmet.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
- - rscadd: "Flight helmets can now link to shuttle computers to give you a status readout on your main HUD, though the visor needs to be flipped down."
\ No newline at end of file
diff --git a/html/changelogs/geeves-shoe_tweak.yml b/html/changelogs/geeves-shoe_tweak.yml
deleted file mode 100644
index f2702e2e962..00000000000
--- a/html/changelogs/geeves-shoe_tweak.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
- - rscadd: "Added a loadout option to shoes to make them spawn in your choice of under or over their uniforms."
\ No newline at end of file