From b8dee9dd04b634c9103446bec98d4f3fdd6f0afb Mon Sep 17 00:00:00 2001 From: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Wed, 6 Jan 2021 15:59:22 -0800 Subject: [PATCH 1/5] two handed shotties --- code/modules/projectiles/guns/projectile/shotgun.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 55f6a757a5e..a65f38ccb4a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -83,6 +83,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." sawn_state = SAWN_INTACT + weapon_weight = WEAPON_HEAVY /obj/item/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter)) @@ -308,6 +309,7 @@ origin_tech = "combat=6" mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE + weapon_weight = WEAPON_HEAVY //Dual Feed Shotgun From 2441614ff9b491a3faaf88b9ae2a589bb12cf36d Mon Sep 17 00:00:00 2001 From: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Fri, 8 Jan 2021 19:04:12 -0800 Subject: [PATCH 2/5] More two handed shotties --- code/modules/projectiles/guns/projectile/revolver.dm | 4 ++++ code/modules/projectiles/guns/projectile/shotgun.dm | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 3da05a63f43..8784f768951 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -330,6 +330,7 @@ icon_state = "dshotgun" item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_HEAVY force = 10 flags = CONDUCT slot_flags = SLOT_BACK @@ -362,6 +363,9 @@ else return ..() +/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user) + . = ..() + weapon_weight = WEAPON_MEDIUM /obj/item/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user) var/num_unloaded = 0 while(get_ammo() > 0) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index a65f38ccb4a..aa6430ebc3a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -12,7 +12,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' var/recentpump = 0 // to prevent spammage - weapon_weight = WEAPON_MEDIUM + weapon_weight = WEAPON_HEAVY /obj/item/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params) . = ..() @@ -131,6 +131,7 @@ name = "assault shotgun" desc = sawn_desc w_class = WEIGHT_CLASS_NORMAL + weapon_weight = WEAPON_MEDIUM current_skin = "riotshotgun-short" item_state = "gun" //phil235 is it different with different skin? slot_flags &= ~SLOT_BACK //you can't sling it on your back @@ -320,6 +321,7 @@ origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot/tube w_class = WEIGHT_CLASS_HUGE + weapon_weight = WEAPON_HEAVY var/toggled = 0 var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine From 91b3b5938c22a727c556f96557f1f5f7335cc149 Mon Sep 17 00:00:00 2001 From: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Sat, 9 Jan 2021 00:34:42 -0800 Subject: [PATCH 3/5] address fox --- code/modules/projectiles/guns/projectile/revolver.dm | 1 + code/modules/projectiles/guns/projectile/shotgun.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8784f768951..014beb4915d 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -366,6 +366,7 @@ /obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user) . = ..() weapon_weight = WEAPON_MEDIUM + /obj/item/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user) var/num_unloaded = 0 while(get_ammo() > 0) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index aa6430ebc3a..3db3e4a2634 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -131,7 +131,7 @@ name = "assault shotgun" desc = sawn_desc w_class = WEIGHT_CLASS_NORMAL - weapon_weight = WEAPON_MEDIUM + weapon_weight = WEAPON_HEAVY current_skin = "riotshotgun-short" item_state = "gun" //phil235 is it different with different skin? slot_flags &= ~SLOT_BACK //you can't sling it on your back From bf1b98999fa2df4815894e7ab2f75f52cd524916 Mon Sep 17 00:00:00 2001 From: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Sun, 10 Jan 2021 14:12:58 -0800 Subject: [PATCH 4/5] Address fox 2 --- code/modules/projectiles/guns/projectile/shotgun.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 3db3e4a2634..72411d85943 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -131,7 +131,6 @@ name = "assault shotgun" desc = sawn_desc w_class = WEIGHT_CLASS_NORMAL - weapon_weight = WEAPON_HEAVY current_skin = "riotshotgun-short" item_state = "gun" //phil235 is it different with different skin? slot_flags &= ~SLOT_BACK //you can't sling it on your back @@ -310,7 +309,6 @@ origin_tech = "combat=6" mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE - weapon_weight = WEAPON_HEAVY //Dual Feed Shotgun @@ -321,7 +319,6 @@ origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot/tube w_class = WEIGHT_CLASS_HUGE - weapon_weight = WEAPON_HEAVY var/toggled = 0 var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine From 6d894ad950acf209668b91e71a2b8d75788ff99a Mon Sep 17 00:00:00 2001 From: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Sun, 10 Jan 2021 15:00:04 -0800 Subject: [PATCH 5/5] Affected change --- code/modules/projectiles/guns/projectile/shotgun.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 72411d85943..8f4640da1bc 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -83,7 +83,6 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." sawn_state = SAWN_INTACT - weapon_weight = WEAPON_HEAVY /obj/item/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))