diff --git a/html/changelog.html b/html/changelog.html
index ffe79c4615c..f0e0b8e97dd 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,23 @@
Updated spacemandmm to 1.8 for the CI.
Extended OpenDream and SpacemanDMM linting coverage to the main defines used in the codebase.
Fixed a warning for path definition and an old reference to a renamed function in ZAS.
+ EMPs are now consistent across the various objects.
+ EMPs damage is now standarized with EMP_HEAVY and EMP_LIGHT.
+ Updated DCS part that deals with unique signals.
+ Added DCS signals COMSIG_ATOM_PRE_EMP_ACT and COMSIG_ATOM_EMP_ACT for EMP events.
+ Added datum component for EMP protection handling.
+ EMP explosions (empulse) are now tridimensional, spreading across the decks/zlevels of the same map.
+ EMP explosions (empulse) behave properly as a sphere between zlevels, with 9 meters being the currently assumed floor height.
+ empulse now respects the tick limit, avoiding the server lagging to death on large or expensive EMPs.
+ ELEMENT_DETACH flag was renamed to ELEMENT_DETACH_ON_HOST_DESTROY, as per TG updated name.
+ EMPs now rise signals of the events through DCS.
+ (Nearly) all emp_act now calls the parent first, properly and consistently handling signals.
+ The spiral_range search function was ported over from TG, it is used by empulse.
+ All emp_act now calls the parent.
+ All emp_act now uses the defined damage, instead of the magic numbers.
+ EMP magic number 3 do not exist anymore, standarized everything that used it back into EMP_LIGHT.
+ Some function substitution for EMP that was not meant to behave like an EMP for other objects.
+ The empulse function can now exclude types, in addition to objects.
GeneralCamo updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d3ef78a5635..402c7c4e87f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -32367,6 +32367,32 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
used in the codebase.
- bugfix: Fixed a warning for path definition and an old reference to a renamed
function in ZAS.
+ - refactor: EMPs are now consistent across the various objects.
+ - refactor: EMPs damage is now standarized with EMP_HEAVY and EMP_LIGHT.
+ - backend: Updated DCS part that deals with unique signals.
+ - rscadd: Added DCS signals COMSIG_ATOM_PRE_EMP_ACT and COMSIG_ATOM_EMP_ACT for
+ EMP events.
+ - backend: Added datum component for EMP protection handling.
+ - rscadd: EMP explosions (empulse) are now tridimensional, spreading across the
+ decks/zlevels of the same map.
+ - rscadd: EMP explosions (empulse) behave properly as a sphere between zlevels,
+ with 9 meters being the currently assumed floor height.
+ - bugfix: empulse now respects the tick limit, avoiding the server lagging to death
+ on large or expensive EMPs.
+ - backend: ELEMENT_DETACH flag was renamed to ELEMENT_DETACH_ON_HOST_DESTROY, as
+ per TG updated name.
+ - backend: EMPs now rise signals of the events through DCS.
+ - backend: (Nearly) all emp_act now calls the parent first, properly and consistently
+ handling signals.
+ - rscadd: The spiral_range search function was ported over from TG, it is used by
+ empulse.
+ - refactor: All emp_act now calls the parent.
+ - refactor: All emp_act now uses the defined damage, instead of the magic numbers.
+ - refactor: EMP magic number 3 do not exist anymore, standarized everything that
+ used it back into EMP_LIGHT.
+ - refactor: Some function substitution for EMP that was not meant to behave like
+ an EMP for other objects.
+ - rscadd: The empulse function can now exclude types, in addition to objects.
GeneralCamo:
- tweak: Protohumans ordered from cargo are now a distinct species and use a new
icon.
diff --git a/html/changelogs/fluffyghost-emprefactor.yml b/html/changelogs/fluffyghost-emprefactor.yml
deleted file mode 100644
index 5125452c7cc..00000000000
--- a/html/changelogs/fluffyghost-emprefactor.yml
+++ /dev/null
@@ -1,57 +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: 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, 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:
- - refactor: "EMPs are now consistent across the various objects."
- - refactor: "EMPs damage is now standarized with EMP_HEAVY and EMP_LIGHT."
- - backend: "Updated DCS part that deals with unique signals."
- - rscadd: "Added DCS signals COMSIG_ATOM_PRE_EMP_ACT and COMSIG_ATOM_EMP_ACT for EMP events."
- - backend: "Added datum component for EMP protection handling."
- - rscadd: "EMP explosions (empulse) are now tridimensional, spreading across the decks/zlevels of the same map."
- - rscadd: "EMP explosions (empulse) behave properly as a sphere between zlevels, with 9 meters being the currently assumed floor height."
- - bugfix: "empulse now respects the tick limit, avoiding the server lagging to death on large or expensive EMPs."
- - backend: "ELEMENT_DETACH flag was renamed to ELEMENT_DETACH_ON_HOST_DESTROY, as per TG updated name."
- - backend: "EMPs now rise signals of the events through DCS."
- - backend: "(Nearly) all emp_act now calls the parent first, properly and consistently handling signals."
- - rscadd: "The spiral_range search function was ported over from TG, it is used by empulse."
- - refactor: "All emp_act now calls the parent."
- - refactor: "All emp_act now uses the defined damage, instead of the magic numbers."
- - refactor: "EMP magic number 3 do not exist anymore, standarized everything that used it back into EMP_LIGHT."
- - refactor: "Some function substitution for EMP that was not meant to behave like an EMP for other objects."
- - rscadd: "The empulse function can now exclude types, in addition to objects."