From 93fb95993ee80f9604895ee65ec2cd88b39ea6fd Mon Sep 17 00:00:00 2001
From: c0 <Core0verload@users.noreply.github.com>
Date: Sat, 19 Sep 2015 17:56:57 +0300
Subject: [PATCH] Instant merge is the fastest action type for this operation

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

diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index d92e39b7195..020539c1c4d 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -18,8 +18,7 @@
 
 /obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
 	var/boolets = 0
-	for (var/i = 1, i <= stored_ammo.len, i++)
-		var/obj/item/ammo_casing/bullet = stored_ammo[i]
+	for(var/obj/item/ammo_casing/bullet in stored_ammo)
 		if(bullet && (bullet.BB || countempties))
 			boolets++
 
@@ -40,7 +39,7 @@
 	stored_ammo.Insert(0, b)
 
 /obj/item/ammo_box/magazine/internal/cylinder/proc/spin()
-	for(var/i = 1, i <= rand(0, max_ammo*2), i++)
+	for(var/i in 1 to rand(0, max_ammo*2))
 		rotate()
 
 
@@ -48,7 +47,7 @@
 	if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
 		return 0
 
-	for(var/i = 1, i <= stored_ammo.len, i++)
+	for(var/i in 1 to stored_ammo.len)
 		var/obj/item/ammo_casing/bullet = stored_ammo[i]
 		if(!bullet || !bullet.BB) // found a spent ammo
 			stored_ammo[i] = R
@@ -84,9 +83,8 @@
 /obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
 	if (!countempties)
 		var/boolets = 0
-		for (var/i = 1, i <= stored_ammo.len, i++)
-			var/obj/item/ammo_casing/bullet = stored_ammo[i]
-			if (bullet.BB)
+		for(var/obj/item/ammo_casing/bullet in stored_ammo)
+			if(bullet.BB)
 				boolets++
 		return boolets
 	else
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index f654a67e058..7cc46f27a26 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -37,10 +37,10 @@
 
 /obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
+	chambered = null
 	while (get_ammo() > 0)
 		var/obj/item/ammo_casing/CB
 		CB = magazine.get_round(0)
-		chambered = null
 		if(CB)
 			CB.loc = get_turf(src.loc)
 			CB.SpinAnimation(10, 1)