From 8ae86d253f31c2e2d2af09c6338ab53712e41da0 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Mon, 5 Mar 2012 12:52:01 -0700
Subject: [PATCH] Fixed some stupid.

---
 code/modules/projectiles/gun.dm                      | 12 +++++++-----
 code/modules/projectiles/guns/projectile/revolver.dm |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 2fb28081798..31f2cf9d261 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -86,7 +86,7 @@
 			PreFire(M,user)
 			return
 		else if(user.a_intent == "hurt" && (istype(src.in_chamber, /obj/item/projectile/beam) || istype(src.in_chamber, /obj/item/projectile/energy)\
-		 || istype(src.in_chamber, /obj/item/projectile/bullet)) && !istype(src.in_chamber, /obj/item/projectile/bullet/stunshot))
+		 || istype(src.in_chamber, /obj/item/projectile/bullet)) && !istype(src.in_chamber, /obj/item/projectile/bullet/stunshot) && load_into_chamber())
 			//Lets shoot them, then.
 			user.visible_message("\red <b> [user] fires \the [src] point blank at [M]!</b>")
 			M.bullet_act(in_chamber,"head")
@@ -99,7 +99,7 @@
 			if(M.stat != 2)	M.stat = 1
 			del(in_chamber)
 			return
-		else if(user.a_intent != "hurt" && istype(src,/obj/item/weapon/gun/energy/taser))
+		else if(user.a_intent != "hurt" && istype(src,/obj/item/weapon/gun/energy/taser) && load_into_chamber())
 			if (prob(50))
 				if (M.paralysis < 60 && (!(M.mutations & 8)) )
 					M.paralysis = 60
@@ -109,6 +109,7 @@
 			if (M.stuttering < 60 && (!(M.mutations & 8)) )
 				M.stuttering = 60
 			user.visible_message("\red <B>[M] has been stunned with the taser gun by [user]!</B>")
+			del(in_chamber)
 			return
 		else
 			return ..()
@@ -234,9 +235,10 @@
 //					if(M.type == /mob)
 //						return FindTarget(M,user,params)
 			var/mob/M = GunTrace(usr.x,usr.y,A.x,A.y,usr.z,usr)
-			if(M && ismob(M) && !target && !M.client.admin_invis)
-				Aim(M)
-				return
+			if(M && ismob(M) && !target)
+				if(!(M.client && M.client.admin_invis))
+					Aim(M)
+					return
 		if(ismob(A) && target != A)
 			Aim(A)
 		else if(lock_time < world.time + 10)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 0f1f244a2e0..32614de3a1d 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -2,7 +2,7 @@
 	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 	name = "\improper Revolver"
 	icon_state = "detective"
-	caliber = "38"
+	caliber = "357"
 	origin_tech = "combat=2;materials=2"
 	ammo_type = "/obj/item/ammo_casing/c38"