diff --git a/html/changelog.html b/html/changelog.html
index 4e0b8f226a..d93e00f98c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,36 @@
-->
+
24 May 2018
+
Anewbe updated:
+
+ - Moving items out of one's active hand cancels any zoom-in they may be providing.
+ - Meteor events should be a lot less brutal.
+
+
Arokha updated:
+
+ - Added a 'Client FPS' setting in the Global tab of character setup for adjusting the FPS to your preference.
+ - Added a 'fake SSAO' toggle to Global in character setup, ported from /tg/. Looks like drop shadows on (almost) everything.
+
+
Atermonera updated:
+
+ - Laptops no longer consume IDs indefinitely.
+
+
Mechoid updated:
+
+ - Promethean limbs store more damage.
+ - Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage.
+ - Limbs can now spread their damage to neighbors with the spread_dam var, when reaching max damage.
+
+
PrismaticGynoid updated:
+
+ - Added laser pointers. Available in your loadout, and printed and upgraded by R&D.
+
+
lorwp updated:
+
+ - Search and Rescue can now add certain medical restricted items to their loadouts
+
+
01 May 2018
Mechoid updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cb2bc20df1..88ae4c130d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4116,3 +4116,27 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
here.
PrismaticGynoid:
- rscadd: Adds new skrell sprites to hardsuit helmets that were missing them.
+2018-05-24:
+ Anewbe:
+ - bugfix: Moving items out of one's active hand cancels any zoom-in they may be
+ providing.
+ - tweak: Meteor events should be a lot less brutal.
+ Arokha:
+ - rscadd: Added a 'Client FPS' setting in the Global tab of character setup for
+ adjusting the FPS to your preference.
+ - rscadd: Added a 'fake SSAO' toggle to Global in character setup, ported from /tg/.
+ Looks like drop shadows on (almost) everything.
+ Atermonera:
+ - bugfix: Laptops no longer consume IDs indefinitely.
+ Mechoid:
+ - rsctweak: Promethean limbs store more damage.
+ - rsctweak: Promethean limbs, in addition to normal severing rules, have a higher
+ chance to be splattered or ashed once they reach maximum damage.
+ - rscadd: Limbs can now spread their damage to neighbors with the spread_dam var,
+ when reaching max damage.
+ PrismaticGynoid:
+ - rscadd: Added laser pointers. Available in your loadout, and printed and upgraded
+ by R&D.
+ lorwp:
+ - tweak: Search and Rescue can now add certain medical restricted items to their
+ loadouts
diff --git a/html/changelogs/Anewbe - Item Zoom.yml b/html/changelogs/Anewbe - Item Zoom.yml
deleted file mode 100644
index c6086329c3..0000000000
--- a/html/changelogs/Anewbe - Item Zoom.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Anewbe
-
-# 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:
- - bugfix: "Moving items out of one's active hand cancels any zoom-in they may be providing."
diff --git a/html/changelogs/Anewbe - Meteors.yml b/html/changelogs/Anewbe - Meteors.yml
deleted file mode 100644
index fc76aad41a..0000000000
--- a/html/changelogs/Anewbe - Meteors.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Anewbe
-
-# 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:
- - tweak: "Meteor events should be a lot less brutal."
diff --git a/html/changelogs/Mechoid - Prometheans.yml b/html/changelogs/Mechoid - Prometheans.yml
deleted file mode 100644
index fa812e227e..0000000000
--- a/html/changelogs/Mechoid - Prometheans.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-author: Mechoid
-
-delete-after: True
-
-changes:
- - rsctweak: "Promethean limbs store more damage."
- - rsctweak: "Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage."
- - rscadd: "Limbs can now spread their damage with the spread_dam var, when reaching max damage."
diff --git a/html/changelogs/arokha - client fps.yml b/html/changelogs/arokha - client fps.yml
deleted file mode 100644
index 30bd21a046..0000000000
--- a/html/changelogs/arokha - client fps.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Arokha
-
-# 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 'Client FPS' setting in the Global tab of character setup for adjusting the FPS to your preference."
diff --git a/html/changelogs/arokha - ssao.yml b/html/changelogs/arokha - ssao.yml
deleted file mode 100644
index 9dd89cfcef..0000000000
--- a/html/changelogs/arokha - ssao.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.
-author: Arokha
-
-# 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 'fake SSAO' toggle to Global in character setup, ported from /tg/. Looks like drop shadows on everything."
diff --git a/html/changelogs/atermonera - laptopID.yml b/html/changelogs/atermonera - laptopID.yml
deleted file mode 100644
index b89efeffa1..0000000000
--- a/html/changelogs/atermonera - laptopID.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Atermonera
-delete-after: True
-changes:
- - bugfix: "Laptops no longer consume IDs indefinitely."
diff --git a/html/changelogs/lorwp - SARLoadout.yml b/html/changelogs/lorwp - SARLoadout.yml
deleted file mode 100644
index caedef1f56..0000000000
--- a/html/changelogs/lorwp - SARLoadout.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: lorwp
-
-delete-after: True
-
-changes:
- - tweak: "Search and Rescue can now add certain medical restricted items to their loadouts"
diff --git a/html/changelogs/prismaticgynoid-laserpointers.yml b/html/changelogs/prismaticgynoid-laserpointers.yml
deleted file mode 100644
index 8552709c41..0000000000
--- a/html/changelogs/prismaticgynoid-laserpointers.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PrismaticGynoid
-delete-after: True
-changes:
- - rscadd: "Added laser pointers. Available in your loadout, and printed and upgraded by R&D."