From fb4a24fd38a8f466e38d04fd8ccdf3a48f3b6889 Mon Sep 17 00:00:00 2001
From: LorenLuke <LukeLLL@aol.com>
Date: Wed, 26 Apr 2017 11:26:31 -0700
Subject: [PATCH] Aim mode point blank targets on harm.

---
 code/modules/projectiles/gun.dm        |  6 ++++-
 html/changelogs/LorenLuke - GunAim.yml | 36 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/LorenLuke - GunAim.yml

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f7d963523c..bcf1cc4728 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -182,7 +182,11 @@
 	if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot)
 		handle_suicide(user)
 	else if(user.a_intent == I_HURT) //point blank shooting
-		Fire(A, user, pointblank=1)
+		if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A && A != user)
+			PreFire(A,user) //They're using the new gun system, locate what they're aiming at.
+			return
+		else
+			Fire(A, user, pointblank=1)
 	else
 		return ..() //Pistolwhippin'
 
diff --git a/html/changelogs/LorenLuke - GunAim.yml b/html/changelogs/LorenLuke - GunAim.yml
new file mode 100644
index 0000000000..5872059038
--- /dev/null
+++ b/html/changelogs/LorenLuke - GunAim.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: LorenLuke
+
+# 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: "Guns on harm intent in aim mode will target, rather than shoot pointblank on first click."