Combat shotgun changes (#90475)

This commit is contained in:
necromanceranne
2025-04-15 20:11:40 +10:00
committed by GitHub
parent f8f9e90f5e
commit 5306ca7934
3 changed files with 6 additions and 5 deletions

View File

@@ -24,7 +24,7 @@
/obj/item/ammo_box/magazine/internal/shot/com
name = "combat shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
max_ammo = 6
/obj/item/ammo_box/magazine/internal/shot/com/compact

View File

@@ -61,7 +61,7 @@
var/projectile_wound_bonus = 0
/// The most reasonable way to modify projectile speed values for projectile fired from this gun. Honest.
/// Lower values are better, higher values are worse.
/// Lower values are worse, higher values are better.
var/projectile_speed_multiplier = 1
var/spread = 0 //Spread induced by the gun itself.

View File

@@ -62,16 +62,17 @@
desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
icon_state = "cshotgun"
inhand_icon_state = "shotgun_combat"
fire_delay = 5
projectile_damage_multiplier = 1.5
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "compact shotgun"
desc = "A compact version of the semi automatic combat shotgun. For close encounters."
name = "compact combat shotgun"
desc = "A compact version of the semi automatic combat shotgun. Lower magazine capacity, but more easily carried."
icon_state = "cshotgunc"
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM
//Dual Feed Shotgun