Skip to content

Commit

Permalink
M60 -> Mk70
Browse files Browse the repository at this point in the history
  • Loading branch information
KoishiVibe committed Mar 19, 2024
1 parent 5fc544e commit 7a3c255
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions code/datums/ammo/bullet/special_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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...

Check failure on line 163 in code/datums/ammo/bullet/special_ammo.dm

View workflow job for this annotation

GitHub Actions / Run Linters

unknown variable: ARMOR_PENETRATION_TIER_0
shrapnel_chance = SHRAPNEL_CHANCE_TIER_0 //...and they tend to disintegrate into dust.

Check failure on line 164 in code/datums/ammo/bullet/special_ammo.dm

View workflow job for this annotation

GitHub Actions / Run Linters

unknown variable: SHRAPNEL_CHANCE_TIER_0

/datum/ammo/bullet/pkp
name = "machinegun bullet"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/misc.dm
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. /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"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/magazines/misc.dm
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 = "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

0 comments on commit 7a3c255

Please sign in to comment.