From 7193bb4c607338eeb2f504f281883aad39f737ba Mon Sep 17 00:00:00 2001
From: "Velden,J. van der (Joep)" <joepvelden@hotmail.com>
Date: Fri, 28 Sep 2018 12:40:03 +0200
Subject: [PATCH] Fixes the point blank shooting not working on tiles with
 multiple people

---
 code/modules/projectiles/firing.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index 08a2104383d..9d16a9c2123 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -40,6 +40,12 @@
 	if(!istype(targloc) || !istype(curloc) || !BB)
 		return 0
 	BB.ammo_casing = src
+	
+	if(target && get_dist(user, target) <= 1) //Point blank shot must always hit
+		target.bullet_act(BB, BB.def_zone)
+		QDEL_NULL(BB)
+		return 1
+
 	if(targloc == curloc)
 		if(target) //if the target is right on our location we go straight to bullet_act()
 			target.bullet_act(BB, BB.def_zone)