Merge branch 'starlight-dev' into LoudMode

Author: Spaghetti-bit

Content.Server/Electrocution/ElectrocutionSystem.cs

@@ -357,7 +357,7 @@ private bool TryDoElectrocutionPowered(
 
     private bool DoCommonElectrocutionAttempt(EntityUid uid, EntityUid? sourceUid, ref float siemensCoefficient, bool ignoreInsulation = false)
     {
-        TrySpark(uid, sourceUid); // ES
+        // TrySpark(uid, sourceUid); // ES // Starlight: This causes SMs to self-ignite
 
         var attemptEvent = new ElectrocutionAttemptEvent(uid, sourceUid, siemensCoefficient,
             ignoreInsulation ? SlotFlags.NONE : ~SlotFlags.POCKET);

Resources/Changelog/ChangelogStarlight.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: OMEGA
-  changes:
-  - message: (Bagel) Air alarms added across station.
-    type: Add
-  id: 406713
-  time: '2026-07-18T12:18:59.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5130
 - author: OMEGA
   changes:
   - message: (Bagel) Rearranged and redecorated Engineering.
@@ -2799,4 +2792,11 @@ Entries:
   id: 407112
   time: '2026-07-29T13:45:35.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/5390
+- author: redmushie
+  changes:
+  - message: Electrocution no longer causes the target to emit sparks. This would cause Supermatter tritium to ignite.
+    type: Remove
+  id: 407113
+  time: '2026-07-29T15:46:47.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5397
 Order: -1