diff --git a/html/changelogs/DreamySkrell-bapi-spacemandmm-reading.yml b/html/changelogs/DreamySkrell-bapi-spacemandmm-reading.yml
deleted file mode 100644
index 0047aa41b38..00000000000
--- a/html/changelogs/DreamySkrell-bapi-spacemandmm-reading.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-author: DreamySkrell
-
-# 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: "BAPI - spacemandmm dmm reading."
diff --git a/html/changelogs/GeneralCamo - Location Blurb Fix.yml b/html/changelogs/GeneralCamo - Location Blurb Fix.yml
deleted file mode 100644
index 3466a0b2f49..00000000000
--- a/html/changelogs/GeneralCamo - Location Blurb Fix.yml
+++ /dev/null
@@ -1,58 +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
-# - (fixes bugs)
-# wip
-# - (work in progress)
-# qol
-# - (quality of life)
-# soundadd
-# - (adds a sound)
-# sounddel
-# - (removes a sound)
-# rscadd
-# - (adds a feature)
-# rscdel
-# - (removes a feature)
-# imageadd
-# - (adds an image or sprite)
-# imagedel
-# - (removes an image or sprite)
-# spellcheck
-# - (fixes spelling or grammar)
-# experiment
-# - (experimental change)
-# balance
-# - (balance changes)
-# code_imp
-# - (misc internal code change)
-# refactor
-# - (refactors code)
-# config
-# - (makes a change to the config files)
-# admin
-# - (makes changes to administrator tools)
-# server
-# - (miscellaneous changes to server)
-#################################
-
-# Your name.
-author: GeneralCamo
-
-# 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:
- - bugfix: "The location blurb will now correctly show on the HUD plane."
diff --git a/html/changelogs/Hollyhock - feetfix.yml b/html/changelogs/Hollyhock - feetfix.yml
deleted file mode 100644
index c6228404b7d..00000000000
--- a/html/changelogs/Hollyhock - feetfix.yml
+++ /dev/null
@@ -1,58 +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
-# - (fixes bugs)
-# wip
-# - (work in progress)
-# qol
-# - (quality of life)
-# soundadd
-# - (adds a sound)
-# sounddel
-# - (removes a sound)
-# rscadd
-# - (adds a feature)
-# rscdel
-# - (removes a feature)
-# imageadd
-# - (adds an image or sprite)
-# imagedel
-# - (removes an image or sprite)
-# spellcheck
-# - (fixes spelling or grammar)
-# experiment
-# - (experimental change)
-# balance
-# - (balance changes)
-# code_imp
-# - (misc internal code change)
-# refactor
-# - (refactors code)
-# config
-# - (makes a change to the config files)
-# admin
-# - (makes changes to administrator tools)
-# server
-# - (miscellaneous changes to server)
-#################################
-
-# Your name.
-author: Hollyhock
-
-# 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:
- - bugfix: "Hopefully fixes footprints indoors on Adhomai."
diff --git a/html/changelogs/JASORN-geistbugfix.yml b/html/changelogs/JASORN-geistbugfix.yml
deleted file mode 100644
index c78123978e6..00000000000
--- a/html/changelogs/JASORN-geistbugfix.yml
+++ /dev/null
@@ -1,58 +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
-# - (fixes bugs)
-# wip
-# - (work in progress)
-# qol
-# - (quality of life)
-# soundadd
-# - (adds a sound)
-# sounddel
-# - (removes a sound)
-# rscadd
-# - (adds a feature)
-# rscdel
-# - (removes a feature)
-# imageadd
-# - (adds an image or sprite)
-# imagedel
-# - (removes an image or sprite)
-# spellcheck
-# - (fixes spelling or grammar)
-# experiment
-# - (experimental change)
-# balance
-# - (balance changes)
-# code_imp
-# - (misc internal code change)
-# refactor
-# - (refactors code)
-# config
-# - (makes a change to the config files)
-# admin
-# - (makes changes to administrator tools)
-# server
-# - (miscellaneous changes to server)
-#################################
-
-# Your name.
-author: Jasorn
-
-# 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:
- - bugfix: "Adds the Adhomai faction flag to the cavern geist so it doesn't get swarmed by hostile wildlife and die."
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
index 55057cfebec..a311bd88147 100644
--- a/html/changelogs/archive/2024-05.yml
+++ b/html/changelogs/archive/2024-05.yml
@@ -374,3 +374,39 @@
hazelmouse:
- bugfix: Fixed a bug in which you had to target the fore of the DPRA Hailstorm
offship to make contact with ship guns while facing its aft, and vice versa.
+2024-05-24:
+ Crosarius:
+ - refactor: Fixed up alcohol and butanol affect_ingest()
+ - qol: Generally buffed intoxication resistances for Unathi, Tajara, and Skrell,
+ to compensate for recent changes to alcohol potency.
+ - qol: Alcohol poisoning now no longer kills you by destroying your liver. Instead,
+ it causes the patient to fall into a coma, and stop breathing.
+ - qol: Better messages for drunkeness.
+ - qol: Ethylredoxrazine now prevents people from falling into comas from alcohol
+ toxicity alltogether.
+ - qol: Vomiting from being intoxicated now happens much less often, and at a higher
+ level of intoxication.
+ - qol: Being drunk enough to cause vomiting now has a pulsing message to go along
+ with other drunkeness messages.
+ - bugfix: You can now correctly black out or fall into an alcoholic coma while buckled
+ to a bed or laying down.
+ - bugfix: Unathi are no longer poisoned by butanol.
+ - bugfix: Unathi are now correctly poisoned by alcohol
+ - bugfix: Non-Unathi are no longer intoxicated by butanol.
+ DreamySkrell:
+ - rscadd: BAPI - spacemandmm dmm reading.
+ FluffyGhost:
+ - bugfix: Fixed exosuit frame icon not updating when you remove parts from it.
+ - code_imp: Minor exosuit code improvements.
+ - balance: Made all the design template production speed into seconds, slowing the
+ printing down.
+ - bugfix: This also works in fixing the UI hitting the rate limit.
+ GeneralCamo:
+ - bugfix: The location blurb will now correctly show on the HUD plane.
+ Hollyhock:
+ - bugfix: Hopefully fixes footprints indoors on Adhomai.
+ Jasorn:
+ - bugfix: Adds the Adhomai faction flag to the cavern geist so it doesn't get swarmed
+ by hostile wildlife and die.
+ Sparky_hotdog:
+ - bugfix: Clip-on Security radios now spawn correctly.
diff --git a/html/changelogs/cliponfix.yml b/html/changelogs/cliponfix.yml
deleted file mode 100644
index 3f7ad35c2fa..00000000000
--- a/html/changelogs/cliponfix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Sparky_hotdog
-
-delete-after: True
-
-changes:
- - bugfix: "Clip-on Security radios now spawn correctly."
diff --git a/html/changelogs/crosarius-alcoholismfixes.yml b/html/changelogs/crosarius-alcoholismfixes.yml
deleted file mode 100644
index b6339a7b0a9..00000000000
--- a/html/changelogs/crosarius-alcoholismfixes.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-author: Crosarius
-
-delete-after: True
-
-changes:
- - refactor: "Fixed up alcohol and butanol affect_ingest()"
- - qol: "Generally buffed intoxication resistances for Unathi, Tajara, and Skrell, to compensate for recent changes to alcohol potency."
- - qol: "Alcohol poisoning now no longer kills you by destroying your liver. Instead, it causes the patient to fall into a coma, and stop breathing."
- - qol: "Better messages for drunkeness."
- - qol: "Ethylredoxrazine now prevents people from falling into comas from alcohol toxicity alltogether."
- - qol: "Vomiting from being intoxicated now happens much less often, and at a higher level of intoxication."
- - qol: "Being drunk enough to cause vomiting now has a pulsing message to go along with other drunkeness messages."
- - bugfix: "You can now correctly black out or fall into an alcoholic coma while buckled to a bed or laying down."
- - bugfix: "Unathi are no longer poisoned by butanol."
- - bugfix: "Unathi are now correctly poisoned by alcohol"
- - bugfix: "Non-Unathi are no longer intoxicated by butanol."
diff --git a/html/changelogs/fluffyghost-designproductionslowdown.yml b/html/changelogs/fluffyghost-designproductionslowdown.yml
deleted file mode 100644
index 32d4886c2c0..00000000000
--- a/html/changelogs/fluffyghost-designproductionslowdown.yml
+++ /dev/null
@@ -1,59 +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
-# - (fixes bugs)
-# wip
-# - (work in progress)
-# qol
-# - (quality of life)
-# soundadd
-# - (adds a sound)
-# sounddel
-# - (removes a sound)
-# rscadd
-# - (adds a feature)
-# rscdel
-# - (removes a feature)
-# imageadd
-# - (adds an image or sprite)
-# imagedel
-# - (removes an image or sprite)
-# spellcheck
-# - (fixes spelling or grammar)
-# experiment
-# - (experimental change)
-# balance
-# - (balance changes)
-# code_imp
-# - (misc internal code change)
-# refactor
-# - (refactors code)
-# config
-# - (makes a change to the config files)
-# admin
-# - (makes changes to administrator tools)
-# server
-# - (miscellaneous changes to server)
-#################################
-
-# Your name.
-author: FluffyGhost
-
-# 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:
- - balance: "Made all the design template production speed into seconds, slowing the printing down."
- - bugfix: "This also works in fixing the UI hitting the rate limit."
diff --git a/html/changelogs/fluffyghost-fixmechpartremovalicon.yml b/html/changelogs/fluffyghost-fixmechpartremovalicon.yml
deleted file mode 100644
index 84671f858d7..00000000000
--- a/html/changelogs/fluffyghost-fixmechpartremovalicon.yml
+++ /dev/null
@@ -1,59 +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
-# - (fixes bugs)
-# wip
-# - (work in progress)
-# qol
-# - (quality of life)
-# soundadd
-# - (adds a sound)
-# sounddel
-# - (removes a sound)
-# rscadd
-# - (adds a feature)
-# rscdel
-# - (removes a feature)
-# imageadd
-# - (adds an image or sprite)
-# imagedel
-# - (removes an image or sprite)
-# spellcheck
-# - (fixes spelling or grammar)
-# experiment
-# - (experimental change)
-# balance
-# - (balance changes)
-# code_imp
-# - (misc internal code change)
-# refactor
-# - (refactors code)
-# config
-# - (makes a change to the config files)
-# admin
-# - (makes changes to administrator tools)
-# server
-# - (miscellaneous changes to server)
-#################################
-
-# Your name.
-author: FluffyGhost
-
-# 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:
- - bugfix: "Fixed exosuit frame icon not updating when you remove parts from it."
- - code_imp: "Minor exosuit code improvements."