refresh:clip p.3/frontiersmenening p.2: clip vs frontiersmen (#3238)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

It's a lot of files changed. I know. this is what happens when you
repath things.
In order:
- Adds all the CLIP guns (minus one which i was unhappy with the sprite)
and repathed them to use their new name.
- Adds all the Frontiersmen weapons i drew.
- Adds behavior to support the bolt type the clip weapons are supposed
to use. This should make them feel more unique while reloading
- Adds a 556 box to cargo after it was requested many times
- Some inteq weapons were given a facelift
- Updates outfits for both CLIP and Frontiersmen to use their intended
guns

Credits:
https://github.com/tgstation/TerraGov-Marine-Corps for the Gun sounds
tgstation/TerraGov-Marine-Corps#13409 for the
Good Gun Sounds

## Changelog

:cl: retlaw34, rye-rice, Apogee-dev
add: Adds CLIPs weapons
add: Adds the New Frontiersmen weapons
add: 556 ammo box to cargo
add: inteq sprites should look better
/:cl:

---------

Signed-off-by: rye-rice <[email protected]>
Co-authored-by: retlaw34 <[email protected]>
Co-authored-by: meem <[email protected]>

_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm

@@ -393,7 +393,7 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/cm82{
 	pixel_y = 7;
 	pixel_x = -9
 	},

_maps/map_files/generic/CentCom.dmm

@@ -1084,11 +1084,11 @@
 /area/centcom/control)
 "apm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -4;
 	pixel_y = -2
 	},

_maps/shuttles/inteq/inteq_colossus.dmm

@@ -3423,13 +3423,13 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 8
 	},
-/obj/item/ammo_box/magazine/gal{
+/obj/item/ammo_box/magazine/f4_308{
 	pixel_x = -5
 	},
-/obj/item/ammo_box/magazine/gal{
+/obj/item/ammo_box/magazine/f4_308{
 	pixel_x = 5
 	},
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -8;
 	pixel_y = 3
 	},

code/__DEFINES/guns.dm

@@ -24,6 +24,9 @@
 ///Gun has a bolt, it locks back when empty. It can be released to chamber a round if a magazine is in.
 /// Example: Pistols with a slide lock, some SMGs
 #define BOLT_TYPE_LOCKING 4
+///Gun has an HK-style locking charging handle, so you can slap it. Only use this for flavor, otherwise modern-style automatics should use BOLT_TYPE_LOCKING.
+/// Example: everything made by lanchester
+#define BOLT_TYPE_CLIP 5
 //Sawn off nerfs
 ///accuracy penalty of sawn off guns
 #define SAWN_OFF_ACC_PENALTY 25
@@ -61,6 +64,7 @@
 #define MANUFACTURER_BRAZIL "a green flag with a blue circle and a yellow diamond around it"
 #define MANUFACTURER_INTEQ "an orange crest with the letters 'IRMG'"
 #define MANUFACTURER_MINUTEMAN "the Lanchester City Firearms Plant logo"
+#define MANUFACTURER_MINUTEMAN_LASER "the Clover Photonics logo"
 #define MANUFACTURER_DONKCO "the Donk! Co. logo"
 #define MANUFACTURER_PGF "the Etherbor Industries emblem"
 #define MANUFACTURER_IMPORT "Lanchester Import Co."

code/game/objects/items/attachments/stock.dm

@@ -38,3 +38,7 @@
 
 /obj/item/attachment/foldable_stock/inteq
 	icon_state = "skm-inteqsmg-stock"
+
+/obj/item/attachment/foldable_stock/spitter
+	icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+	icon_state = "spitter_stock"

code/modules/cargo/packs/ammo.dm

@@ -134,7 +134,7 @@
 /datum/supply_pack/ammo/gal308_ammo
 	name = "CM-GAL .308 Magazine Crate"
 	desc = "Contains a .308 CM-GAL magazine for the CM-GAL rifle, containing ten rounds."
-	contains = list(/obj/item/ammo_box/magazine/gal)
+	contains = list(/obj/item/ammo_box/magazine/f4_308)
 	cost = 1000
 
 /datum/supply_pack/ammo/gar_ammo
@@ -169,10 +169,16 @@
 
 /datum/supply_pack/ammo/a762_ammo_box
 	name = "7.62x40mm CLIP Ammo Box Crate"
-	desc = "Contains a eighty-round 7.62x40mm CLIP box for the SKM rifles."
+	desc = "Contains a one hundred and twenty-round 7.62x40mm CLIP box for the SKM rifles."
 	contains = list(/obj/item/ammo_box/a762_40)
 	cost = 500
 
+/datum/supply_pack/ammo/a556_ammo_box
+	name = "5.56x39mm CLIP Ammo Box Crate"
+	desc = "Contains a one hundred and twenty-round 5.56x39mm CLIP box for most newer rifles."
+	contains = list(/obj/item/ammo_box/a556_39)
+	cost = 450
+
 /datum/supply_pack/ammo/a357_ammo_box
 	name = ".357 Ammo Box Crate"
 	desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."

code/modules/clothing/factions/clip.dm

@@ -415,26 +415,31 @@
 
 	supports_variations = VOX_VARIATION
 
-/obj/item/storage/belt/military/clip/p16/PopulateContents()
+/obj/item/storage/belt/military/clip/cm82/PopulateContents()
 	for(var/i in 1 to 4)
 		new /obj/item/ammo_box/magazine/p16(src)
 	new /obj/item/grenade/frag(src)
 
-/obj/item/storage/belt/military/clip/gal/PopulateContents()
+/obj/item/storage/belt/military/clip/f4/PopulateContents()
 	for(var/i in 1 to 4)
-		new /obj/item/ammo_box/magazine/gal(src)
+		new /obj/item/ammo_box/magazine/f4_308(src)
 	new /obj/item/grenade/frag(src)
 
 /obj/item/storage/belt/military/clip/cm5/PopulateContents()
 	for(var/i in 1 to 4)
-		new /obj/item/ammo_box/magazine/smgm9mm(src)
+		new /obj/item/ammo_box/magazine/cm5_9mm(src)
 	new /obj/item/grenade/frag(src)
 
 /obj/item/storage/belt/military/clip/cm15/PopulateContents()
 	for(var/i in 1 to 5)
-		new /obj/item/ammo_box/magazine/cm15_mag(src)
+		new /obj/item/ammo_box/magazine/cm15_12g(src)
 	new /obj/item/grenade/frag(src)
 
+/obj/item/storage/belt/military/clip/e50/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/storage/belt/military/clip/e50/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/stock_parts/cell/gun/large(src)

code/modules/clothing/factions/frontiersmen.dm

@@ -254,9 +254,14 @@
 		new /obj/item/ammo_box/magazine/skm_762_40(src)
 	new /obj/item/grenade/frag(src)
 
-/obj/item/storage/belt/security/military/frontiersmen/aps_mp_ammo/PopulateContents() //replace with spitter. remind me.
+/obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo/PopulateContents()
 	for(var/i in 1 to 4)
-		new /obj/item/ammo_box/magazine/pistolm9mm(src)
+		new /obj/item/ammo_box/magazine/m9mm_mauler(src)
+	new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/security/military/frontiersmen/spitter_ammo/PopulateContents()
+	for(var/i in 1 to 4)
+		new /obj/item/ammo_box/magazine/spitter_9mm(src)
 	new /obj/item/grenade/frag(src)
 
 /obj/item/storage/belt/security/military/frontiersmen/flamer/PopulateContents()

code/modules/clothing/outfits/ert/frontiersmen_ert.dm

@@ -139,16 +139,29 @@
 	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
 
 /datum/outfit/job/frontiersmen/ert/grunt/skm
-	name = "ERT - Frontiersman Grunt (SKM-24)"
+	name = "ERT - Frontiersman Grunt (SKM-24 AR)"
 
 	suit_store = /obj/item/gun/ballistic/automatic/assault/skm
 	belt = /obj/item/storage/belt/security/military/frontiersmen/skm_ammo
 
-/datum/outfit/job/frontiersmen/ert/grunt/aps_mp //remember. Remind me to replace this with the spitter.
-	name = "ERT - Frontiersman Grunt (Stechkin APS)"
+/datum/outfit/job/frontiersmen/ert/grunt/mauler_mp
+	name = "ERT - Frontiersman Grunt (Mauler MP)"
 
-	suit_store = /obj/item/gun/ballistic/automatic/pistol/APS
-	belt = /obj/item/storage/belt/security/military/frontiersmen/aps_mp_ammo
+	suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+	belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo
+
+/datum/outfit/job/frontiersmen/ert/grunt/spitter_mp
+	name = "ERT - Frontiersman Grunt (Spitter MP)"
+
+	suit_store = /obj/item/gun/ballistic/automatic/pistol/spitter
+	belt = /obj/item/storage/belt/security/military/frontiersmen/spitter_ammo
+
+/datum/outfit/job/frontiersmen/ert/grunt/pounder_smg
+	name = "ERT - Frontiersman Grunt (Pounder SMG)"
+
+	suit_store = /obj/item/gun/ballistic/automatic/smg/pounder
+	belt = null
+	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen=1, /obj/item/ammo_box/magazine/c22lr_pounder_pan=2)
 
 /datum/outfit/job/frontiersmen/ert/leader
 	name = "ERT - Frontiersman Officer"
@@ -177,9 +190,9 @@
 	mask = /obj/item/clothing/mask/surgical
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	belt = /obj/item/storage/belt/medical/webbing/frontiersmen/surgery
-	suit_store = /obj/item/gun/ballistic/automatic/pistol/APS
+	suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3, /obj/item/ammo_box/magazine/pistolm9mm=2)
+	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
 
 
 /datum/outfit/job/frontiersmen/ert/engineer
@@ -211,7 +224,7 @@
 
 
 /datum/outfit/job/frontiersmen/ert/sentry_lmg
-	name = "ERT - Frontiersman Sentry (SKM-24v)"
+	name = "ERT - Frontiersman Sentry (SKM-24v LMG)"
 
 	head = /obj/item/clothing/head/helmet/marine/frontier
 	mask = /obj/item/clothing/mask/gas/sechailer/balaclava
@@ -222,3 +235,18 @@
 	belt = /obj/item/gun/ballistic/revolver/mateba
 
 	backpack_contents = list(/obj/item/ammo_box/magazine/skm_762_40/drum=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
+
+/datum/outfit/job/frontiersmen/ert/sentry_shredder
+	name = "ERT - Frontiersman Sentry (Shredder LMG)"
+
+	head = /obj/item/clothing/head/helmet/marine/frontier
+	mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+	suit = /obj/item/clothing/suit/armor/vest/marine/frontier
+	gloves = /obj/item/clothing/gloves/combat
+
+	belt = /obj/item/gun/ballistic/revolver/mateba
+
+
+	l_hand = /obj/item/gun/ballistic/automatic/hmg/shredder // this doesnt even fit on the suit storage slot
+
+	backpack_contents = list(/obj/item/ammo_box/magazine/m12_shredder=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)

code/modules/clothing/outfits/ert/minutemen_ert.dm

@@ -4,7 +4,7 @@
 	job_icon = "clip_cmm2"
 
 	suit = /obj/item/clothing/suit/armor/vest/marine/heavy
-	suit_store = /obj/item/gun/ballistic/shotgun/bulldog/minutemen
+	suit_store = /obj/item/gun/ballistic/shotgun/cm15
 	mask = /obj/item/clothing/mask/gas/clip
 	head = /obj/item/clothing/head/helmet/riot/clip
 	belt = /obj/item/storage/belt/military/clip/cm15
@@ -58,7 +58,7 @@
 	belt = /obj/item/storage/belt/military/clip/e50
 	uniform = /obj/item/clothing/under/clip/officer
 	suit = /obj/item/clothing/suit/armor/vest/marine
-	suit_store = /obj/item/gun/energy/laser/e50
+	suit_store = /obj/item/gun/energy/laser/e50/clip
 	r_pocket = /obj/item/grenade/c4
 	l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack
 

code/modules/clothing/outfits/factions/minutemen.dm

@@ -552,16 +552,16 @@
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/armed
-	name = "CLIP Minutemen - Minuteman (Armed - CM-16)"
+	name = "CLIP Minutemen - Minuteman (Armed - CM-82)"
 
-	suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
-	belt = /obj/item/storage/belt/military/clip/p16
+	suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
+	belt = /obj/item/storage/belt/military/clip/cm82
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4 //f4 is rename of GAL, don't wanna repath upon adding the clip guns though, if i forget to remove this during then, fucking yell at me
-	name = "CLIP Minutemen - Minuteman (Armed - CM-GAL)"
+/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4
+	name = "CLIP Minutemen - Minuteman (Armed - F4)"
 
-	suit_store = /obj/item/gun/ballistic/automatic/marksman/gal
-	belt = /obj/item/storage/belt/military/clip/gal
+	suit_store = /obj/item/gun/ballistic/automatic/marksman/f4
+	belt = /obj/item/storage/belt/military/clip/f4
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/armed/cm5
 	name = "CLIP Minutemen - Minuteman (Armed - CM-5)"
@@ -580,9 +580,9 @@
 	belt = /obj/item/storage/belt/military/clip/engi
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
-	name = "CLIP Minutemen - Field Engineer (Armed - CM-16)"
+	name = "CLIP Minutemen - Field Engineer (Armed - CM-82)"
 
-	suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+	suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chili_macaroni=1, /obj/item/grenade/c4=2, /obj/item/ammo_box/magazine/p16=3)
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/med
@@ -598,20 +598,25 @@
 
 	suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/smgm9mm=3)
+	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/cm5_9mm=3)
+
+/obj/item/storage/belt/military/clip/gunner/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/belt/military/clip/gunner/PopulateContents()
 	for(var/i in 1 to 5)
-		new /obj/item/ammo_box/magazine/skm_762_40/extended(src)
+		new /obj/item/ammo_box/magazine/cm40_762_40_box(src)
 	new /obj/item/grenade/frag(src)
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
-	name = "CLIP Minutemen - Field Gunner (Armed - SKM-24u)" //See above, replace with CLIP LMG when added
+	name = "CLIP Minutemen - Field Gunner (Armed - CM-40)"
 	id_assignment = "Machinegunner"
 
 	accessory = /obj/item/clothing/accessory/armband
 	belt = /obj/item/storage/belt/military/clip/gunner
-	suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended
+	suit_store = /obj/item/gun/ballistic/automatic/hmg/cm40
 
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1)
 
@@ -639,8 +644,8 @@
 /datum/outfit/job/clip/minutemen/grunt/lead/armed
 	name = "CLIP Minutemen - Field Sergeant (Armed)"
 
-	suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
-	belt = /obj/item/storage/belt/military/clip/p16
+	suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
+	belt = /obj/item/storage/belt/military/clip/cm82
 	//replace commander with the cm23 when its impemented, see the cm-f4 above
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
 

code/modules/projectiles/ammunition/ballistic/rifle.dm

@@ -39,8 +39,8 @@
 // 5.56x39mm (M-90gl Carbine & P-16)
 
 /obj/item/ammo_casing/a556_39
-	name = "5.56x39mm bullet casing"
-	desc = "A 5.56x39mm bullet casing."
+	name = "5.56x39mm CLIP bullet casing"
+	desc = "A 5.56x39mm CLIP bullet casing."
 	icon_state = "rifle-brass"
 	caliber = "5.56x45mm"
 	projectile_type = /obj/projectile/bullet/a556_45
@@ -91,3 +91,10 @@
 	caliber = ".299 caseless"
 	projectile_type = /obj/projectile/bullet/c299
 	bullet_per_box = 100
+
+/obj/item/ammo_casing/a65clip
+	name = "6.5x57mm CLIP bullet casing"
+	desc = "A 6.5x57mm CLIP bullet casing."
+	icon_state = "big-brass"
+	caliber = "6.5CLIP"
+	projectile_type = /obj/projectile/bullet/a65clip

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -398,6 +398,13 @@
 /obj/item/ammo_box/a762_40/inteq
 	icon_state = "a762_40box_big_inteq"
 
+/obj/item/ammo_box/a556_39
+	name = "ammo box (5.56x39mm CLIP)"
+	icon_state = "a556_39box_big"
+	ammo_type = /obj/item/ammo_casing/a556_39
+	max_ammo = 120
+	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/ammo_box/a308
 	name = "ammo box (.308)"
 	icon_state = "a308box"

code/modules/projectiles/boxes_magazines/external/rifle.dm

@@ -85,17 +85,17 @@
 	. = ..()
 	icon_state = "ebr_mag-[!!ammo_count()]"
 
-/obj/item/ammo_box/magazine/gal
-	name = "\improper GAL Magazine (.308)"
-	desc = "A standard 10-round magazine for GAL platform DMRs. These rounds do good damage with significant armor penetration."
+/obj/item/ammo_box/magazine/f4_308
+	name = "\improper F4 Magazine (.308)"
+	desc = "A standard 10-round magazine for F4 platform DMRs. These rounds do good damage with significant armor penetration."
 	icon_state = "gal_mag-1"
 	base_icon_state = "gal_mag"
 	ammo_type = /obj/item/ammo_casing/a308
 	caliber = ".308"
 	max_ammo = 10
 	multiple_sprites = AMMO_BOX_FULL_EMPTY
 
-/obj/item/ammo_box/magazine/p16
+/obj/item/ammo_box/magazine/p16 //repath to /obj/item/ammo_box/magazine/generic_556 sometime
 	name = "assault rifle magazine (5.56x45mm)"
 	desc = "A simple, 30-round magazine for 5.56x45mm assault rifles. These rounds do moderate damage with good armor penetration."
 	icon_state = "p16_mag-1"

code/modules/projectiles/boxes_magazines/external/shotgun.dm

@@ -37,7 +37,7 @@
 	max_ammo = 6
 	w_class = WEIGHT_CLASS_SMALL //Smaller, holds less
 
-/obj/item/ammo_box/magazine/cm15_mag
+/obj/item/ammo_box/magazine/cm15_12g
 	name = "CM-15 magazine (12g buckshot)"
 	desc = "An almost straight, 8-round magazine designed for the CM-15 shotgun."
 	icon_state = "cm15_mag-1"