From dfd3ee2c5d63dfef72b2d0678e02f04c4e72347d Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Sat, 5 Oct 2019 17:49:45 +0200
Subject: [PATCH] point blank aiming (#7090)

---
 code/modules/projectiles/gun.dm       |  5 ++++
 html/changelogs/geeves-pointSpank.yml | 41 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 html/changelogs/geeves-pointSpank.yml

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index e485ba3bd0a..d86366c64a9 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -220,6 +220,11 @@
 /obj/item/weapon/gun/attack(atom/A, mob/living/user, def_zone)
 	if (A == user && user.zone_sel.selecting == "mouth" && !mouthshoot)
 		handle_suicide(user)
+	else if(user.a_intent != I_HURT && user.aiming && user.aiming.active) //if aim mode, don't pistol whip
+		if (user.aiming.aiming_at != A)
+			PreFire(A, user)
+		else
+			Fire(A, user, pointblank=1)
 	else if(user.a_intent == I_HURT) //point blank shooting
 		Fire(A, user, pointblank=1)
 	else if(bayonet)
diff --git a/html/changelogs/geeves-pointSpank.yml b/html/changelogs/geeves-pointSpank.yml
new file mode 100644
index 00000000000..dae15a0618b
--- /dev/null
+++ b/html/changelogs/geeves-pointSpank.yml
@@ -0,0 +1,41 @@
+################################
+# 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: Geeves, code by WezYo
+
+# 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: 
+  - rscadd: "Aiming at someone with a gun in point blank distance is now possible (as long as you're not on harm intent)."