diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index e0ba0084bb..2a6bd006d7 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -152,16 +152,20 @@ accurate_range = 12 /datum/ammo/bullet/m60 - name = "M60 bullet" + name = "frangible machine gun bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM accuracy = HIT_ACCURACY_TIER_2 accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 accurate_range = 12 - damage = 45 //7.62x51 is scary - penetration= ARMOR_PENETRATION_TIER_6 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + damage = 55 //7.62x51 is scary, redux... + penetration = 0 //...but frangibles suck ass at punching through armor... + shrapnel_chance = 0 //...and they tend to disintegrate into dust. + +/datum/ammo/bullet/m60/on_hit_mob(mob/entity, obj/projectile/bullet) + slowdown(entity, bullet) + pushback(entity, bullet, 3) //at close range you can juggle back a horde which should be nice. /datum/ammo/bullet/pkp name = "machinegun bullet" diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index d7ec91b8ec..77b2a595af 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3399,11 +3399,20 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/bipod/m60 name = "bipod" - desc = "A simple set of telescopic poles to keep a weapon stabilized during firing. This one looks rather old.\nGreatly increases accuracy and reduces recoil when properly placed, but also increases weapon size and slows firing speed." + desc = "The bipod of an H-G Mk70 machine gun. Wait, how did you get this off of the gun?! \nReduces unbraced fire effectiveness, but substantially improves the performance of the Mk70 when braced correctly." icon_state = "bipod_m60" attach_icon = "bipod_m60_a" flags_attach_features = ATTACH_ACTIVATION + delay_mod = FIRE_DELAY_TIER_10 +/obj/item/attachable/bipod/m60 + ..() + + delay_mod = FIRE_DELAY_TIER_10 + wield_delay_mod = WIELD_DELAY_FAST + accuracy_mod = -HIT_ACCURACY_MULT_TIER_5 + scatter_mod = SCATTER_AMOUNT_TIER_9 + recoil_mod = RECOIL_AMOUNT_TIER_5 /obj/item/attachable/bipod/vulture name = "heavy bipod" diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 9c8b305a4f..2d7d48b150 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -63,8 +63,8 @@ //M60 /obj/item/weapon/gun/m60 - name = "\improper M60 General Purpose Machine Gun" - desc = "The M60. The Pig. The Action Hero's wet dream. \nAlt-click it to open the feed cover and allow for reloading." + name = "\improper H-G Mk70 Machine Gun" + desc = "Part of the Henjin-Garcia repro line, found surprising niche in Frontier colony home defense against aggressive, largescale xenofauna. \nAlt-click to open the feed tray cover for handling reloads." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' icon_state = "m60" item_state = "m60" @@ -76,6 +76,7 @@ force = 25 flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_CAN_POINTBLANK gun_category = GUN_CATEGORY_HEAVY + fire_delay = FIRE_DELAY_TIER_9 attachable_allowed = list( /obj/item/attachable/m60barrel, /obj/item/attachable/bipod/m60, diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm index 87568c9532..e0b3a5bb67 100644 --- a/code/modules/projectiles/magazines/misc.dm +++ b/code/modules/projectiles/magazines/misc.dm @@ -19,8 +19,8 @@ //M60 /obj/item/ammo_magazine/m60 - name = "M60 ammo box (7.62x51mm)" - desc = "A blast from the past chambered in 7.62X51mm NATO." + name = "\improper Mk70 belt box" + desc = "A limited production run by Henjin-Garcia of old Earth weapons. This is a 100rnd box magazine for their Mk70 reproduction of the M60 GPMG. \nHolds 100 rounds of cased 7.62x51mm frangible ammunition. Open the feed tray cover with alt-click before loading!" caliber = "7.62x51mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi' icon_state = "m60" //PLACEHOLDER