From 71b64bbb5aab0b255fe2196208d6b361f900f188 Mon Sep 17 00:00:00 2001
From: TullyBurnalot <tullybburnalot@gmail.com>
Date: Sat, 12 Nov 2016 01:32:50 +0000
Subject: [PATCH] Fixes Gun Renaming

- Renaming guns now only produces 1 input box
---
 code/modules/projectiles/gun.dm                      | 1 -
 code/modules/projectiles/guns/projectile/revolver.dm | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 6ede088c4ce..6cafcce56c3 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -334,7 +334,6 @@ obj/item/weapon/gun/proc/newshot()
 
 /obj/item/weapon/gun/proc/rename_gun(mob/M)
 	var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
-
 	if(src && input && !M.stat && in_range(M,src) && !M.restrained() && M.canmove)
 		name = input
 		to_chat(M, "You name the gun [input]. Say hello to your new friend.")
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index affc16de296..884b97c8ffb 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -34,10 +34,6 @@
 		update_icon()
 		chamber_round(0)
 
-	if(unique_rename)
-		if(istype(A, /obj/item/weapon/pen))
-			rename_gun(user)
-
 /obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
 	chambered = null