diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 3f1ccd4ff10..649cb9eb536 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -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 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 3ff9114204c..9084dbcd534 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -60,7 +60,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. diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index db1b0855240..41e4ee894b6 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -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