From 3a85951a28493e49bf478fc9450ce033f2bdbdfe Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Fri, 9 Jul 2021 23:10:11 -0700
Subject: [PATCH] Automatic changelog generation for PR #60085 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-60085.yml b/html/changelogs/AutoChangeLog-pr-60085.yml
new file mode 100644
index 00000000000..7ece411b2dc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-60085.yml
@@ -0,0 +1,4 @@
+author: "Nari Harimoto"
+delete-after: True
+changes: 
+  - qol: "Stunbatons will now harm-baton on left-click if you are in combat mode and the baton is off"