From 1c216ff1324415f73fc2c7df7bf03b1eb7c71e82 Mon Sep 17 00:00:00 2001
From: TaG2e <66538683+TaG2e@users.noreply.github.com>
Date: Sun, 28 Jun 2020 17:52:08 -0500
Subject: [PATCH] Fix Conflict: The 2nd Attempt

---
 code/modules/projectiles/guns/ballistic/shotgun.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index afa787599cd..398ce598a4d 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -247,7 +247,6 @@
 	desc = "Range isn't an issue when you can bring your victim to you."
 	icon_state = "hookshotgun"
 	inhand_icon_state = "shotgun"
-	worn_icon_state = "shotgun"
 	load_sound = 'sound/weapons/gun/shotgun/insert_shell.ogg'
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/bounty
 	w_class = WEIGHT_CLASS_BULKY