Changes shotguns to be more sane

cmss13-devs · Oct 14, 2023 · b7afa75 · b7afa75
1 parent b3a8c4d
commit b7afa75
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm
@@ -1219,19 +1219,29 @@
 
 	accuracy_var_low = PROJECTILE_VARIANCE_TIER_5
 	accuracy_var_high = PROJECTILE_VARIANCE_TIER_5
-	accurate_range = 5
-	max_range = 8
-	damage = 140
+	accurate_range = 4
+	max_range = 4
+	damage = 65
 	damage_var_low = PROJECTILE_VARIANCE_TIER_8
 	damage_var_high = PROJECTILE_VARIANCE_TIER_8
-	penetration = ARMOR_PENETRATION_TIER_4
-	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_6
+	penetration = ARMOR_PENETRATION_TIER_1
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3
 	shell_speed = AMMO_SPEED_TIER_2
 	damage_armor_punch = 0
 	pen_armor_punch = 0
 	handful_state = "buckshot_shell"
 	multiple_handful_name = TRUE
 
+/datum/ammo/bullet/shotgun/buckshot/special
+	name = "buckshot shell, USCM special type"
+	bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/special
+
+	accurate_range = 8
+	max_range = 8
+	damage = 140
+	penetration = ARMOR_PENETRATION_TIER_4
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_6
+
 /datum/ammo/bullet/shotgun/buckshot/incendiary
 	name = "incendiary buckshot shell"
 	handful_state = "incen_buckshot"
@@ -1258,17 +1268,25 @@
 
 	accuracy_var_low = PROJECTILE_VARIANCE_TIER_6
 	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
-	accurate_range = 5
-	max_range = 8
-	damage = 140
+	accurate_range = 4
+	max_range = 4
+	damage = 65
 	damage_var_low = PROJECTILE_VARIANCE_TIER_8
 	damage_var_high = PROJECTILE_VARIANCE_TIER_8
-	penetration = ARMOR_PENETRATION_TIER_4
+	penetration = ARMOR_PENETRATION_TIER_1
 	shell_speed = AMMO_SPEED_TIER_2
 	scatter = SCATTER_AMOUNT_TIER_1
 	damage_armor_punch = 0
 	pen_armor_punch = 0
 
+/datum/ammo/bullet/shotgun/spread/special
+	name = "additional buckshot, USCM special type"
+
+	accurate_range = 8
+	max_range = 8
+	damage = 140
+	penetration = ARMOR_PENETRATION_TIER_4
+
 /datum/ammo/bullet/shotgun/spread/masterkey
 	damage = 20
 

diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
@@ -1189,6 +1189,9 @@ can cause issues with ammo types getting mixed up during the burst.
 
 //-------------------------------------------------------
 
+/obj/item/weapon/gun/shotgun/pump/special
+	current_mag = /obj/item/ammo_magazine/internal/shotgun/special
+
 /obj/item/weapon/gun/shotgun/pump/dual_tube
 	name = "generic dual-tube pump shotgun"
 	desc = "A twenty-round pump action shotgun with dual internal tube magazines. You can switch the active internal magazine by toggling the shotgun tube."

diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
@@ -145,6 +145,9 @@ also doesn't really matter. You can only reload them with handfuls.
 /obj/item/ammo_magazine/internal/shotgun/cmb/m3717
 	max_rounds = 5
 
+/obj/item/ammo_magazine/internal/shotgun/special
+	default_ammo = /datum/ammo/bullet/shotgun/buckshot/special
+
 //-------------------------------------------------------
 
 /*
@@ -192,6 +195,10 @@ var/list/shotgun_handfuls_12g = list(
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot
 	handful_state = "buckshot_shell"
 
+/obj/item/ammo_magazine/handful/shotgun/buckshot/special
+	name = "handful of shotgun buckshot shells, USCM special type (12g)"
+	default_ammo = /datum/ammo/bullet/shotgun/buckshot/special
+
 /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary
 	name = "handful of incendiary buckshot shells (12g)"
 	icon_state = "incen_buckshot_5"