From 653aa0f13a7926e8942bc9fc475f01c035e019ab Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:00:51 -0800 Subject: [PATCH 1/7] Update automatic.dm Should fix inhands sprites for: American 180 R91 Infiltrator MP5SD --- code/modules/projectiles/guns/ballistic/automatic.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 52498755716..d309e20711f 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -132,8 +132,10 @@ /obj/item/gun/ballistic/automatic/smg/american180 name = "American 180" desc = "An integrally suppressed submachinegun chambered in the common .22 long rifle. Top loaded drum magazine." + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "smg22" - item_state = "shotgun" + item_state = "american" mag_type = /obj/item/ammo_box/magazine/m22smg init_mag_type = /obj/item/ammo_box/magazine/m22smg weapon_class = WEAPON_CLASS_CARBINE @@ -571,8 +573,10 @@ /obj/item/gun/ballistic/automatic/smg/mp5 name = "MP-5 SD" desc = "An integrally suppressed submachinegun chambered in 9mm." + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "mp5" - item_state = "fnfal" + item_state = "mp5" mag_type = /obj/item/ammo_box/magazine/uzim9mm init_mag_type = /obj/item/ammo_box/magazine/uzim9mm weapon_class = WEAPON_CLASS_CARBINE @@ -1797,6 +1801,8 @@ name = "r91 assault rifle" desc = "The R91 was the standard US Army assault rifle, and so saw wide-spread use after the war. Most are worn out by now." icon = 'icons/obj/guns/projectile.dmi' + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "assault_rifle" item_state = "r91" mag_type = /obj/item/ammo_box/magazine/m556/rifle @@ -1831,6 +1837,8 @@ name = "infiltrator" desc = "A customized R91 assault rifle, with an integrated suppressor, small scope, cut down stock and polymer furniture. The supressor takes away stopping-power, but a cleaner action allows it to fire faster." icon = 'icons/obj/guns/projectile.dmi' + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "infiltrator" item_state = "infiltrator" weapon_class = WEAPON_CLASS_RIFLE From 61c6711f1a37e48f75af621ae6c9ead1ce492a45 Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:07:18 -0800 Subject: [PATCH 2/7] Update automatic.dm hk&g11 --- code/modules/projectiles/guns/ballistic/automatic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index d309e20711f..f1ea430f720 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2350,7 +2350,7 @@ name = "G11" desc = "This experimental gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The weight and space savings allows for a very high magazine capacity. Chambered in 4.73mm." icon_state = "g11" - item_state = "arg" + item_state = "h&kg11" mag_type = /obj/item/ammo_box/magazine/m473 init_mag_type = /obj/item/ammo_box/magazine/m473 disallowed_mags = list(/obj/item/ammo_box/magazine/m473/small, /obj/item/ammo_box/magazine/m473/small/empty) From 775043121c975ac7d0ab40a5f7a69b4e81d5cf75 Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:12:15 -0800 Subject: [PATCH 3/7] Update automatic.dm g11 hand files --- code/modules/projectiles/guns/ballistic/automatic.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index f1ea430f720..cb5b2936487 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2349,6 +2349,8 @@ /obj/item/gun/ballistic/automatic/g11 name = "G11" desc = "This experimental gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The weight and space savings allows for a very high magazine capacity. Chambered in 4.73mm." + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "g11" item_state = "h&kg11" mag_type = /obj/item/ammo_box/magazine/m473 From cf209fe5cce03547471f052aed27970414eca783 Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:14:46 -0800 Subject: [PATCH 4/7] Update shotgun.dm Intended to fix the hunting shotgun, which is lacking an inhands sprite due to an incorrect item_state path --- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 8ac23e1a021..aeb1945fe81 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -250,7 +250,7 @@ desc = "A traditional hunting shotgun with wood furniture and a four-shell capacity underneath." icon = 'icons/obj/guns/projectile.dmi' icon_state = "hunting_shotgun" - item_state = "hunting_shotgun" + item_state = "shotgunpump" icon_prefix = "shotgunpump" mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal weapon_class = WEAPON_CLASS_RIFLE From 6e4fb13d7f9788657e43a550b5649de464a5e475 Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:30:59 -0800 Subject: [PATCH 5/7] Update shotgun.dm jackhammer inhand sprite needed some attention --- code/modules/projectiles/guns/ballistic/shotgun.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index aeb1945fe81..9abc88e54cc 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -611,8 +611,10 @@ /obj/item/gun/ballistic/automatic/shotgun/pancor name = "Pancor Jackhammer" desc = "A drum-loaded, fully automatic shotgun. The pinnacle of turning things into swiss cheese." + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "pancor" - item_state = "cshotgun1" + item_state = "pancor" fire_sound = 'sound/f13weapons/repeater_fire.ogg' mag_type = /obj/item/ammo_box/magazine/d12g weapon_class = WEAPON_CLASS_RIFLE From a25b9f18d0512ee2b8ee796b543aa5ed237fdb7b Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:33:30 -0800 Subject: [PATCH 6/7] Update automatic.dm should guarantee the gaussrifle inhand sprite fix --- code/modules/projectiles/guns/ballistic/automatic.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index cb5b2936487..c48cfe81ab3 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2643,6 +2643,8 @@ name = "\improper M72 gauss rifle" desc = "The M72 rifle is of German design. It uses an electromagnetic field to propel rounds at tremendous speed... and pierce almost any obstacle. Its range, accuracy and stopping power is almost unparalleled." icon = 'icons/fallout/objects/guns/ballistic.dmi' + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "gaussf2" item_state = "gaussrifle" slot_flags = ITEM_SLOT_BACK From 9685e8db0dab7a2961e3736ac25164d96c9cce45 Mon Sep 17 00:00:00 2001 From: CaputCapital <60798623+CaputCapital@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:42:37 -0800 Subject: [PATCH 7/7] Update automatic.dm P90 fix --- code/modules/projectiles/guns/ballistic/automatic.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index c48cfe81ab3..4f8d4dd62e0 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -520,6 +520,8 @@ /obj/item/gun/ballistic/automatic/smg/p90 name = "FN P90c" desc = "The Fabrique Nationale P90c was just coming into use at the time of the war. The weapon's bullpup layout, and compact design, make it easy to control. The durable P90c is prized for its reliability, and high firepower in a ruggedly-compact package. Chambered in 10mm." + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "p90" item_state = "m90" mag_type = /obj/item/ammo_box/magazine/m10mm_p90