further improvements and changelog

code/modules/projectiles/gun.dm

@@ -327,14 +327,12 @@
 	var/choice = input(M,"Warning, you can only reskin your weapon once!","Reskin Gun") in options
 
 	if(src && choice && !M.stat && in_range(M,src) && !M.restrained() && M.canmove)
+		if(options[choice] == null)
+			return
 		if(sawn_state == SAWN_OFF)
 			icon_state = options[choice] + "-sawn"
-			if(icon_state == "[initial(icon_state)]-sawn")
-				return
 		else
 			icon_state = options[choice]
-			if(icon_state == initial(icon_state))
-				return
 		M << "Your gun is now skinned as [choice]. Say hello to your new friend."
 		reskinned = 1
 		return

code/modules/projectiles/guns/projectile/revolver.dm

@@ -66,11 +66,12 @@
 
 /obj/item/weapon/gun/projectile/revolver/detective/New()
 	..()
+	options["Default"] = "detective"
 	options["Leopard Spots"] = "detective_leopard"
 	options["Black Panther"] = "detective_panther"
 	options["Gold Trim"] = "detective_gold"
 	options["The Peacemaker"] = "detective_peacemaker"
-	options["Cancel"] = "detective"
+	options["Cancel"] = null
 
 /obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params)
 	if(magazine.caliber != initial(magazine.caliber))

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -144,12 +144,13 @@
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
 	..()
+	options["Default"] = "dshotgun"
 	options["Dark Red Finish"] = "dshotgun-d"
 	options["Ash"] = "dshotgun-f"
 	options["Faded Grey"] = "dshotgun-g"
 	options["Maple"] = "dshotgun-l"
 	options["Rosewood"] = "dshotgun-p"
-	options["Cancel"] = "dshotgun"
+	options["Cancel"] = null
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob, params)
 	..()

html/changelogs/Paprka-renamingandreskinning.yml

@@ -0,0 +1,6 @@
+author: Paprka
+
+delete-after: True
+
+changes: 
+  - tweak: "Reworked reskinning and renaming guns, and added the ability to reskin the bartender's shotgun. Click it with an empty active hand to reskin. Warning, you can only do this once! Rename by hitting it with a pen. This also works with miner shotguns now."