From 7b20362aaf1d201f39570ff58076163fcb290c72 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 9 Feb 2020 11:45:47 -0800
Subject: [PATCH 1/2] Merge pull request #6662 from
 Shadow-Quill/Baton-Intent-Change

Stunbatons will now only harmbaton on grab/harm intents
---
 code/game/objects/items/weapons/stunbaton.dm  |  2 +-
 .../ShadowQuill-Baton_Intent_Change.yml       | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/ShadowQuill-Baton_Intent_Change.yml

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 371082f1f6b..26ba924746b 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -178,7 +178,7 @@
 		var/mob/living/carbon/human/H = target
 		affecting = H.get_organ(hit_zone)
 
-	if(user.a_intent == I_HURT || user.a_intent == I_DISARM)
+	if(user.a_intent == I_GRAB || user.a_intent == I_HURT)
 		. = ..()
 		//whacking someone causes a much poorer electrical contact than deliberately prodding them.
 		agony *= 0.5
diff --git a/html/changelogs/ShadowQuill-Baton_Intent_Change.yml b/html/changelogs/ShadowQuill-Baton_Intent_Change.yml
new file mode 100644
index 00000000000..7796a4860a7
--- /dev/null
+++ b/html/changelogs/ShadowQuill-Baton_Intent_Change.yml
@@ -0,0 +1,36 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: Shadow Quill
+
+# 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: 
+  - tweak: "Batons will no longer harmbaton on disarm intent, instead only doing so on grab/harm."
\ No newline at end of file