From 7a3c2554ea15b1738edb34efd3002a86c1cf67fe Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Tue, 19 Mar 2024 08:50:18 -0500 Subject: [PATCH 1/8] M60 -> Mk70 --- code/datums/ammo/bullet/special_ammo.dm | 8 ++++---- code/modules/projectiles/guns/misc.dm | 4 ++-- code/modules/projectiles/magazines/misc.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index e0ba0084bb..705ea08197 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -152,16 +152,16 @@ accurate_range = 12 /datum/ammo/bullet/m60 - name = "M60 bullet" + name = "7.62x51mm frangible 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 = ARMOR_PENETRATION_TIER_0 //...but frangibles suck ass at punching through armor... + shrapnel_chance = SHRAPNEL_CHANCE_TIER_0 //...and they tend to disintegrate into dust. /datum/ammo/bullet/pkp name = "machinegun bullet" diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 9c8b305a4f..8e2f7595af 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" diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm index 87568c9532..2496630a9c 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 = "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 From 1b02e02121d6ee93ca2282fb386f05d68d53e8cb Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Tue, 19 Mar 2024 09:41:01 -0500 Subject: [PATCH 2/8] fix ammo errors --- code/datums/ammo/bullet/special_ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 705ea08197..b111dea5fe 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -160,8 +160,8 @@ accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 accurate_range = 12 damage = 55 //7.62x51 is scary, redux... - penetration = ARMOR_PENETRATION_TIER_0 //...but frangibles suck ass at punching through armor... - shrapnel_chance = SHRAPNEL_CHANCE_TIER_0 //...and they tend to disintegrate into dust. + penetration = 0 //...but frangibles suck ass at punching through armor... + shrapnel_chance = 0 //...and they tend to disintegrate into dust. /datum/ammo/bullet/pkp name = "machinegun bullet" From b3fc3b36874db52647cd5908f2c44ddedf00fe0b Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:26:44 -0500 Subject: [PATCH 3/8] Update code/datums/ammo/bullet/special_ammo.dm Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com> --- code/datums/ammo/bullet/special_ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index b111dea5fe..57b8e032f7 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -152,7 +152,7 @@ accurate_range = 12 /datum/ammo/bullet/m60 - name = "7.62x51mm frangible bullet" + name = "frangible machine gun bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM accuracy = HIT_ACCURACY_TIER_2 From 0fe3212fee73267e0bb2f55b23ff3d55c0207c36 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 21 Mar 2024 02:29:40 -0500 Subject: [PATCH 4/8] fixes naming for Mk70 box --- code/modules/projectiles/magazines/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm index 2496630a9c..e0b3a5bb67 100644 --- a/code/modules/projectiles/magazines/misc.dm +++ b/code/modules/projectiles/magazines/misc.dm @@ -19,7 +19,7 @@ //M60 /obj/item/ammo_magazine/m60 - name = "Mk70 belt box" + 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' From 7ced9ac710a78407172ae0acca24c6a23e85fab5 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 28 Mar 2024 12:15:31 -0500 Subject: [PATCH 5/8] adds the knockback effect and short range stun --- code/datums/ammo/bullet/special_ammo.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 57b8e032f7..2a6bd006d7 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -163,6 +163,10 @@ 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" headshot_state = HEADSHOT_OVERLAY_MEDIUM From a1064c2cb0fbefd1ef85806e0816e11c52392e90 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 3 Apr 2024 02:20:37 -0500 Subject: [PATCH 6/8] quickly fiddles with fire rate? bipod is broken for whatever reason --- code/modules/projectiles/gun_attachables.dm | 1 + code/modules/projectiles/guns/misc.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index d7ec91b8ec..71bdab0161 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3404,6 +3404,7 @@ Defined in conflicts.dm of the #defines folder. attach_icon = "bipod_m60_a" flags_attach_features = ATTACH_ACTIVATION + delay_mod = FIRE_DELAY_TIER_1 /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 8e2f7595af..255c85ba70 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -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, From aa837d966f6bbd28b5004e820bfc0a5ba5c97744 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 3 Apr 2024 23:37:09 -0500 Subject: [PATCH 7/8] flavortext utility fix, newline proc was backwards --- code/modules/projectiles/guns/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 255c85ba70..2d7d48b150 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -64,7 +64,7 @@ //M60 /obj/item/weapon/gun/m60 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." + 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" From aaa64d4b774dba1972e78cde5543436fd941f952 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 3 Apr 2024 23:57:39 -0500 Subject: [PATCH 8/8] hopefully this works if not(probably) i cry and scream and I'm going to bend beretta into a pretzel --- code/modules/projectiles/gun_attachables.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 71bdab0161..77b2a595af 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3399,12 +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_1 + 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"