Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M60 retouch, mostly lore, a little statistical #158

Closed
wants to merge 13 commits into from
Closed

M60 retouch, mostly lore, a little statistical #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7a3c255
M60 -> Mk70
Mar 19, 2024
1b02e02
fix ammo errors
Mar 19, 2024
b3fc3b3
Update code/datums/ammo/bullet/special_ammo.dm
KoishiVibe Mar 19, 2024
af61efc
Merge branch 'master' into Mk70
KoishiVibe Mar 21, 2024
0fe3212
fixes naming for Mk70 box
Mar 21, 2024
36826e8
Merge branch 'master' into Mk70
KoishiVibe Mar 25, 2024
b4c2398
Merge branch 'master' into Mk70
KoishiVibe Mar 28, 2024
7ced9ac
adds the knockback effect and short range stun
Mar 28, 2024
5152714
Merge branch 'Mk70' of https://github.com/KoishiVibe/PVE13-KOISHI-2 i…
Mar 28, 2024
fd4815a
Merge branch 'master' into Mk70
KoishiVibe Mar 29, 2024
a1064c2
quickly fiddles with fire rate? bipod is broken for whatever reason
Apr 3, 2024
aa837d9
flavortext utility fix, newline proc was backwards
Apr 4, 2024
aaa64d4
hopefully this works if not(probably) i cry and scream and I'm going …
Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions code/datums/ammo/bullet/special_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,20 @@
accurate_range = 12

/datum/ammo/bullet/m60
name = "M60 bullet"
name = "frangible machine gun bullet"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this should be frangible rather than just ball?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zero AP and such. FMJ I think has like AP5 or AP10 or something elsewhere

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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty insane 👀

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dunno how to custom tune it
and... shit, the BIPOD. I... Okay, fine. I can split off the bipod's fire rate buff by making the inbuilt its own separate thing-


/datum/ammo/bullet/pkp
name = "machinegun bullet"
Expand Down
11 changes: 10 additions & 1 deletion code/modules/projectiles/gun_attachables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3399,11 +3399,20 @@

/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
..()

Check failure on line 3409 in code/modules/projectiles/gun_attachables.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '..', expected one of: newline, '}', '/', identifier

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"
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/guns/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. \n<b>Alt-click it to open the feed cover and allow for reloading.</b>"
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. \n<b>Alt-click to open the feed tray cover for handling reloads.</b>"
icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi'
icon_state = "m60"
item_state = "m60"
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/magazines/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading