From 8d7427a9f42307b5eaf75abfabe83df0449a1bb9 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 8 Dec 2019 22:33:25 -0600
Subject: [PATCH] Automatic changelog generation for PR #9538 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-9538.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-9538.yml

diff --git a/html/changelogs/AutoChangeLog-pr-9538.yml b/html/changelogs/AutoChangeLog-pr-9538.yml
new file mode 100644
index 0000000000..a036a8d24a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9538.yml
@@ -0,0 +1,5 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "Combat defibs now instant stun on disarm rather than 1 second again"
+  - balance: "Defibs are now always emagged when emagged with an emag rather than EMP."