From 7ff488fd22b4b332fc151efa4195579c31f2b64e Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:10:20 -0600
Subject: [PATCH] fixes shotguns not being able to be reskined (#23336)

* fixes shotguns not being able to be reskined

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---
 .../modules/projectiles/guns/projectile/revolver.dm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 6e152145984..2436845b1eb 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -61,12 +61,13 @@
 	if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
 		return
 
-	if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
-		var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
-		C.spin()
-		chamber_round(0)
-		playsound(get_turf(user), 'sound/weapons/revolver_spin.ogg', 50, 1)
-		user.visible_message("<span class='warning'>[usr] spins [src]'s chamber.</span>", "<span class='notice'>You spin [src]'s chamber.</span>")
+	if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+		return ..()
+	var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
+	C.spin()
+	chamber_round(0)
+	playsound(get_turf(user), 'sound/weapons/revolver_spin.ogg', 50, TRUE)
+	user.visible_message("<span class='warning'>[user] spins [src]'s chamber.</span>", "<span class='notice'>You spin [src]'s chamber.</span>")
 
 /obj/item/gun/projectile/revolver/can_shoot()
 	return get_ammo(0,0)