From 274dbcd7e0788d3be6f60dc838a26481db41a361 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Sat, 22 Apr 2023 10:04:18 +0100
Subject: [PATCH] shotgun tweak

---
 code/modules/projectiles/ammunition/rounds.dm  |  8 ++++----
 code/modules/projectiles/projectile/scatter.dm | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm
index 45d2d5aad51..393122d4e4f 100644
--- a/code/modules/projectiles/ammunition/rounds.dm
+++ b/code/modules/projectiles/ammunition/rounds.dm
@@ -273,7 +273,7 @@
 
 /obj/item/ammo_casing/a12g
 	name = "shotgun slug"
-	desc = "A 12 gauge slug."
+	desc = "A 12 gauge slug shell."
 	icon_state = "slshell"
 	caliber = "12g"
 	projectile_type = /obj/item/projectile/bullet/shotgun
@@ -281,9 +281,9 @@
 
 /obj/item/ammo_casing/a12g/pellet
 	name = "shotgun shell"
-	desc = "A 12 gauge shell."
+	desc = "A 12 gauge buckshot shell."
 	icon_state = "gshell"
-	projectile_type = /obj/item/projectile/bullet/pellet/shotgun
+	projectile_type = /obj/item/projectile/scatter/shotgun //formerly /obj/item/projectile/bullet/pellet/shotgun
 
 /obj/item/ammo_casing/a12g/blank
 	name = "shotgun shell"
@@ -301,7 +301,7 @@
 
 /obj/item/ammo_casing/a12g/beanbag
 	name = "beanbag shell"
-	desc = "A beanbag shell."
+	desc = "A 12 gauge beanbag shell."
 	icon_state = "bshell"
 	projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
 	matter = list(MAT_STEEL = 180)
diff --git a/code/modules/projectiles/projectile/scatter.dm b/code/modules/projectiles/projectile/scatter.dm
index b3900f8429d..259cd82da43 100644
--- a/code/modules/projectiles/projectile/scatter.dm
+++ b/code/modules/projectiles/projectile/scatter.dm
@@ -86,6 +86,21 @@
  * Ballistic
  */
 
+/obj/item/projectile/scatter/shotgun
+	name = "Shotgun scatter projectile"
+	hud_state = "shotgun_buckshot"
+	spread_submunition_damage = FALSE
+	submunition_spread_max = 60
+	submunition_spread_min = 50
+	submunitions = list(
+		/obj/item/projectile/bullet/shotgun/scatterprojectile = 6
+		)
+
+/obj/item/projectile/bullet/shotgun/scatterprojectile
+	name = "pellet"
+	fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
+	damage = 12
+	armor_penetration = 0
 
 /obj/item/projectile/scatter/flechette
 	damage = 60