From 91733e03e36b3b82b0f14c93b1b7f8ded2fc603e Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Mon, 1 Feb 2016 21:22:36 -0700 Subject: [PATCH 1/3] Fixes issue #15131. Guns will now fire point blank correctly. --- code/modules/projectiles/gun.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 509961c4393..9f583c9a9e1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -147,8 +147,9 @@ return if(flag) - handle_suicide(user, target, params) // - return + if(user.zone_sel.selecting == "mouth") + handle_suicide(user, target, params) + return //Exclude lasertag guns from the CLUMSY check. From b75bea58b13382f70c6d1e7ef24a391ccbea31f7 Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Sat, 6 Feb 2016 11:15:47 -0700 Subject: [PATCH 2/3] *click* --- code/modules/projectiles/gun.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 9f583c9a9e1..0d989c2093f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -144,6 +144,7 @@ return if(!can_shoot()) //Just because you can pull the trigger doesn't mean it can't shoot. + shoot_with_empty_chamber(user) return if(flag) From 6cabed1641d28ea73c7ec5bee55e46cdac373939 Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Tue, 9 Feb 2016 13:51:53 -0700 Subject: [PATCH 3/3] updates code to match new selecting. --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 9ea65e0a0a8..aa308644e11 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -148,7 +148,7 @@ return if(flag) - if(user.zone_sel.selecting == "mouth") + if(user.zone_selected == "mouth") handle_suicide(user, target, params) return