From 1a51aefaac8684143a02203cb50e2acd2c4c3f4d Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Sat, 1 Jun 2013 04:05:33 +0400
Subject: [PATCH] Fixes #2922 Putting gun away now properly lowers aim.
 Prevents gun from going off if it's not in active hand.

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

diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index 5480b83d847..a2aaa9dc163 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -25,6 +25,13 @@
 		user.client.remove_gun_icons()
 	return ..()
 
+/obj/item/weapon/gun/equipped(var/mob/user, var/slot)
+	if (slot != slot_l_hand && slot != slot_r_hand)
+		stop_aim()
+		if (user.client)
+			user.client.remove_gun_icons()
+	return ..()
+
 //Removes lock fro mall targets
 /obj/item/weapon/gun/proc/stop_aim()
 	if(target)
@@ -69,6 +76,7 @@
 	if(!istype(M)) return
 	if(src != M.equipped())
 		stop_aim()
+		return
 	M.last_move_intent = world.time
 	if(load_into_chamber())
 		var/firing_check = in_chamber.check_fire(T,usr) //0 if it cannot hit them, 1 if it is capable of hitting, and 2 if a special check is preventing it from firing.