From a4fd2be7f7fd97fb74fb4607362e677b35086a7d Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Mon, 26 Aug 2019 14:45:12 -0500 Subject: [PATCH 1/4] Various Shotgun Nerfs. --- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 ++ .../projectiles/projectile/bullets/shotgun.dm | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 856dfed78b..04f24794ef 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -5,6 +5,7 @@ item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY force = 10 + fire_delay = 10 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/internal/shot @@ -205,6 +206,7 @@ name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" + fire_delay = 5 mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE unique_reskin = list("Tatical" = "cshotgun", diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index f9aa47c6a3..3595df098a 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,11 +1,11 @@ /obj/item/projectile/bullet/shotgun_slug name = "12g shotgun slug" - damage = 60 + damage = 50 /obj/item/projectile/bullet/shotgun_beanbag name = "beanbag slug" damage = 5 - stamina = 80 + stamina = 70 /obj/item/projectile/bullet/incendiary/shotgun name = "incendiary slug" @@ -47,7 +47,7 @@ /obj/item/projectile/bullet/shotgun_frag12 name ="frag12 slug" - damage = 25 + damage = 20 knockdown = 50 /obj/item/projectile/bullet/shotgun_frag12/on_hit(atom/target, blocked = FALSE) @@ -61,12 +61,12 @@ /obj/item/projectile/bullet/pellet/shotgun_buckshot name = "buckshot pellet" - damage = 12.5 + damage = 10 /obj/item/projectile/bullet/pellet/shotgun_rubbershot name = "rubbershot pellet" - damage = 3 - stamina = 25 + damage = 2 + stamina = 12.5 /obj/item/projectile/bullet/pellet/Range() ..() From 13638ed5d67a2269c9181bce3dc36294038e48bf Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Mon, 26 Aug 2019 15:08:36 -0500 Subject: [PATCH 2/4] Reverts some changes I deemed unneccesary. Undoes a fuckup --- code/modules/projectiles/guns/ballistic/shotgun.dm | 1 - code/modules/projectiles/projectile/bullets/shotgun.dm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 04f24794ef..951d227a89 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -5,7 +5,6 @@ item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY force = 10 - fire_delay = 10 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/internal/shot diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 3595df098a..3555cd3b75 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,6 +1,6 @@ /obj/item/projectile/bullet/shotgun_slug name = "12g shotgun slug" - damage = 50 + damage = 60 /obj/item/projectile/bullet/shotgun_beanbag name = "beanbag slug" @@ -47,7 +47,7 @@ /obj/item/projectile/bullet/shotgun_frag12 name ="frag12 slug" - damage = 20 + damage = 25 knockdown = 50 /obj/item/projectile/bullet/shotgun_frag12/on_hit(atom/target, blocked = FALSE) From d43b4599ef18cbea53cb2bae31380185a027e38e Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Mon, 26 Aug 2019 15:53:44 -0500 Subject: [PATCH 3/4] I was bullied to reduce click delay. --- 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 951d227a89..9962bb3424 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -205,7 +205,7 @@ name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" - fire_delay = 5 + fire_delay = 3 mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE unique_reskin = list("Tatical" = "cshotgun", From 3b2be43bd870a55a545f97435efc849576ae8e03 Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Tue, 27 Aug 2019 18:35:08 -0500 Subject: [PATCH 4/4] Slightly increased rubbershot damage from 12.5 to 15 per pellet. --- code/modules/projectiles/projectile/bullets/shotgun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 3555cd3b75..4a1c954b1b 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -66,7 +66,7 @@ /obj/item/projectile/bullet/pellet/shotgun_rubbershot name = "rubbershot pellet" damage = 2 - stamina = 12.5 + stamina = 15 /obj/item/projectile/bullet/pellet/Range() ..()