Mk70 Returns (#282)

Co-authored-by: KoishiVibe <[email protected]>
cmss13-devs · Aug 9, 2024 · a77d5f4 · a77d5f4
1 parent 71d5dcc
commit a77d5f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm
@@ -158,7 +158,7 @@
 	accurate_range = 12
 
 /datum/ammo/bullet/m60
-	name = "M60 bullet"
+	name = "Mk70 bullet"
 	headshot_state = HEADSHOT_OVERLAY_MEDIUM
 
 	accuracy = HIT_ACCURACY_TIER_2

diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm
@@ -3,11 +3,9 @@
 	var/title //email title
 	var/entry_text //email content
 
-
 //emails for the Almayer computers
 /datum/fluff_email/almayer
 
-
 /datum/fluff_email/almayer/iwantout
 	title = "RE: I want out."
 	entry_text = {"<html>

diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
@@ -529,10 +529,10 @@
 		list("GUNNER KITS (CHOOSE 1)", 0, null, null, null),
 		list("SVD Sniper Kit", 0, /obj/effect/essentials_set/kit/svd, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
 		list("Custom Built Shotgun Kit", 0, /obj/effect/essentials_set/kit/custom_shotgun, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
-		list("M60 Machine Gun Kit", 0, /obj/effect/essentials_set/kit/m60, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
+		list("Mk70 Machine Gun Kit", 0, /obj/effect/essentials_set/kit/m60, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
 
 		list("SPECIAL AMMUNITION", 0, null, null, null),
-		list("M60 Ammo Box (7.62x51mm)", 15, /obj/item/ammo_magazine/m60, null, VENDOR_ITEM_REGULAR),
+		list("Mk70 Ammo Box (7.62x51mm)", 15, /obj/item/ammo_magazine/m60, null, VENDOR_ITEM_REGULAR),
 		list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("SVD Magazine (7.62x54mmR)", 15, /obj/item/ammo_magazine/sniper/svd, null, VENDOR_ITEM_REGULAR),
 

diff --git 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. \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, the Mk70 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"

diff --git 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 (7.62x51mm)"
+	desc = "Limited production run by Henjin-Garcia of old Earth weapons. A 100rnd belt box for their Mk70 reproduction of the M60 GPMG."
 	caliber = "7.62x51mm"
 	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi'
 	icon_state = "m60" //PLACEHOLDER