From 86b7f81701e7a7a72bbb2e78ff6ab06d2a2fd4b2 Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Tue, 13 Apr 2021 20:56:18 +0100
Subject: [PATCH] bye-bye sticks, come with me if you want to live

---
 .../projectiles/guns/projectile/revolver.dm   |  18 ++++++++++++++++--
 .../projectiles/guns/projectile/shotgun.dm    |  17 ++++++++++++++++-
 icons/mob/inhands/64x64_guns_lefthand.dmi     | Bin 0 -> 2520 bytes
 icons/mob/inhands/64x64_guns_righthand.dmi    | Bin 0 -> 2507 bytes
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 icons/mob/inhands/64x64_guns_lefthand.dmi
 create mode 100644 icons/mob/inhands/64x64_guns_righthand.dmi

diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index d265a420c26..639a34e1da5 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -328,7 +328,11 @@
 	name = "double-barreled shotgun"
 	desc = "A true classic."
 	icon_state = "dshotgun"
-	item_state = "shotgun"
+	item_state = "shotgun_db"
+	lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	w_class = WEIGHT_CLASS_BULKY
 	weapon_weight = WEAPON_HEAVY
 	force = 10
@@ -358,8 +362,10 @@
 		var/obj/item/melee/energy/W = A
 		if(W.active)
 			sawoff(user)
+			item_state = "ishotgun_sawn"
 	if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))
 		sawoff(user)
+		item_state = "ishotgun_sawn"
 	else
 		return ..()
 
@@ -389,7 +395,11 @@
 	name = "improvised shotgun"
 	desc = "Essentially a tube that aims shotgun shells."
 	icon_state = "ishotgun"
-	item_state = "shotgun"
+	item_state = "ishotgun"
+	lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	w_class = WEIGHT_CLASS_BULKY
 	force = 10
 	slot_flags = null
@@ -406,6 +416,7 @@
 		if(C.use(10))
 			slot_flags = SLOT_BACK
 			icon_state = "ishotgunsling"
+			item_state = "ishotgunsling"
 			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
 			slung = 1
 			update_icon()
@@ -420,6 +431,7 @@
 	if(slung && (slot_flags & SLOT_BELT) )
 		slung = 0
 		icon_state = "ishotgun-sawn"
+		item_state = "ishotgun_sawn"
 
 /obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
 	. = ..()
@@ -436,6 +448,8 @@
 	icon = 'icons/obj/items.dmi'
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	inhand_x_dimension = 32
+	inhand_y_dimension = 32
 	icon_state = "cane"
 	item_state = "stick"
 	sawn_state = SAWN_OFF
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index d50865457dc..f710416258e 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -3,6 +3,10 @@
 	desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
 	icon_state = "shotgun"
 	item_state = "shotgun"
+	lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	w_class = WEIGHT_CLASS_BULKY
 	force = 10
 	flags = CONDUCT
@@ -80,6 +84,7 @@
 	name = "riot shotgun"
 	desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
 	icon_state = "riotshotgun"
+	item_state = "shotgun_riot"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
 	sawn_desc = "Come with me if you want to live."
 	sawn_state = SAWN_INTACT
@@ -131,7 +136,7 @@
 	desc = sawn_desc
 	w_class = WEIGHT_CLASS_NORMAL
 	current_skin = "riotshotgun-short"
-	item_state = "gun"			//phil235 is it different with different skin?
+	item_state = "shotgun_assault"			//phil235 is it different with different skin?
 	slot_flags &= ~SLOT_BACK    //you can't sling it on your back
 	slot_flags |= SLOT_BELT     //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
 	sawn_state = SAWN_OFF
@@ -208,6 +213,10 @@
 	desc = "This piece of junk looks like something that could have been used 700 years ago."
 	icon_state = "moistnugget"
 	item_state = "moistnugget"
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+	inhand_x_dimension = 32
+	inhand_y_dimension = 32
 	slot_flags = 0 //no SLOT_BACK sprite, alas
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction
 	fire_sound = 'sound/weapons/gunshots/gunshot_rifle.ogg'
@@ -305,6 +314,7 @@
 	name = "combat shotgun"
 	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
 	icon_state = "cshotgun"
+	item_state = "shotgun_combat"
 	origin_tech = "combat=6"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_HUGE
@@ -315,6 +325,11 @@
 	name = "cycler shotgun"
 	desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
 	icon_state = "cycler"
+	inhand_x_dimension = 32
+	inhand_y_dimension = 32
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+	item_state = "bulldog"
 	origin_tech = "combat=4;materials=2"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
 	w_class = WEIGHT_CLASS_HUGE
diff --git a/icons/mob/inhands/64x64_guns_lefthand.dmi b/icons/mob/inhands/64x64_guns_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..81a6f463ad093eb0ab14b5678fa08eae591220e0
GIT binary patch
literal 2520
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
QBl=hQtToQ6`V=wozaGlGg8%>k

literal 0
HcmV?d00001

diff --git a/icons/mob/inhands/64x64_guns_righthand.dmi b/icons/mob/inhands/64x64_guns_righthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1182cae992849e8bbf105a531c5d2971bd66cba3
GIT binary patch
literal 2507
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
HgNXkF6)vn+

literal 0
HcmV?d00001