[(99.5%) MODULAR] Marine ERT Rework: Pass The Ammunition (#14321)

* marine modsuit code

* modsuit icons pt1

* marine icons pt2

* modified equipment

* modified gear

* stray space

* module updates

* moar icons!

* creatin' custom fire sounds!!

* m44a firing noise

* fixin' stuff

* m44a pulse rifle

* m44a variants

* fixin' shit

* more fixes

* one line fix

* woo more fixes

* final fixes(?)

* honestly quite incredible

* mag icon fixes

* m44a ammo belt

* marine survival box

* pulse rifles for everyone!

* more updates

* honestly quite incredible

* honestly quite incredible

* balancing

* underbarrel shotgun adjustments

* buckshot > slugs

* buckshot again

* god bless buckshot, yo

* crowbar dont fit

* ninety-nine > 99

* hammer time

* hammer time

* woot

* marine smartgun

* smartgunner modsuit

* blessing from god

* cleaning code

* icon fixes

* dme checks

* more icon fixes

* << massive idiot

* << lol

* goodbye old turret

* use more gun™️

* we did it boys, syndicate smartgun is no more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* we did it boys, syndicate smartgun is more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* we did it boys, attack_item is more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* single letter subtype? cringe!

* see above

* YEP

* linter issue (ツ)

* stray s moment

* merge master of upstream

* fix the dme

* Revert "Fixing14321"

* //

* woo

* refactor these nuts

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* sniping’s a good job mate

* shieldin’

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* fuck (fuck)

* fuck

* UNGA

* req changes

Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: nevimer <foxmail@protonmail.com>

modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm

@@ -1,9 +1,54 @@
-/datum/outfit/centcom/ert/marine
-	suit_store = /obj/item/gun/ballistic/automatic/cmg
-	belt = /obj/item/storage/belt/military/assault/full/cmg
-
-/datum/outfit/centcom/ert/marine/medic
-	suit_store = /obj/item/storage/belt/holster/detective/full/ert/skyrat
-
-/datum/outfit/centcom/ert/marine/engineer
-	suit_store = /obj/item/gun/ballistic/shotgun/automatic/as2
+/datum/outfit/centcom/ert/marine //commander
+	suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher
+	belt = /obj/item/storage/belt/military/assault/full/m44a
+	back = /obj/item/mod/control/pre_equipped/marine
+	backpack_contents = list(
+		/obj/item/storage/box/survival/engineer/marine = 1,
+		/obj/item/melee/baton/security/loaded = 1,
+		/obj/item/storage/box/handcuffs = 1,
+		/obj/item/ammo_box/a40mm = 2, //gods must be strong
+	)
+	l_hand = null
+	r_hand = null
+	
+/datum/outfit/centcom/ert/marine/security //generic and/or heavy
+	suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun
+	belt = /obj/item/storage/belt/military/assault/full/m44a
+	back = /obj/item/mod/control/pre_equipped/marine
+	backpack_contents = list(
+		/obj/item/storage/box/survival/engineer/marine = 1,
+		/obj/item/melee/baton/security/loaded = 1,
+		/obj/item/storage/box/handcuffs = 1,
+		/obj/item/ammo_box/advanced/s12gauge/buckshot/marine = 2,
+	)
+	l_hand = null
+	r_hand = null
+	
+/datum/outfit/centcom/ert/marine/medic //medic
+	suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/scoped
+	belt = /obj/item/storage/belt/military/assault/full/m44a
+	back = /obj/item/mod/control/pre_equipped/marine
+	backpack_contents = list(
+		/obj/item/storage/box/survival/engineer/marine = 1,
+		/obj/item/reagent_containers/hypospray/combat = 1,
+		/obj/item/storage/medkit/regular = 1,
+		/obj/item/storage/medkit/advanced = 1,
+		/obj/item/sensor_device = 1,
+		/obj/item/pinpointer/crew/prox = 1,
+		/obj/item/stack/medical/gauze/twelve = 1,
+		/obj/item/reagent_containers/syringe = 1,
+		/obj/item/reagent_containers/glass/bottle/formaldehyde = 1,
+		/obj/item/stack/sticky_tape/surgical = 1,
+	)
+	l_hand = /obj/item/gun/medbeam
+	r_hand = null
+	
+/datum/outfit/centcom/ert/marine/engineer //engineer
+	suit_store = /obj/item/melee/hammer //doesn't need a rifle
+	back = /obj/item/mod/control/pre_equipped/marine/engineer
+	backpack_contents = list(
+		/obj/item/storage/box/survival/engineer/marine = 1,
+		/obj/item/ammo_box/magazine/smartgun_drum = 4, //AND WE'LL ALL STAY FREE
+	)
+	l_hand = null
+	r_hand = null

modular_skyrat/modules/modular_ert/code/marine_override/modified_gear.dm

@@ -1,12 +1,19 @@
-/obj/item/storage/belt/holster/detective/full/ert/skyrat
+/obj/item/storage/belt/military/assault/full/m44a
 
-/obj/item/storage/belt/holster/detective/full/ert/skyrat/PopulateContents()
+/obj/item/storage/belt/military/assault/full/m44a/PopulateContents()
 	generate_items_inside(list(
-		/obj/item/gun/ballistic/automatic/pistol/firefly = 1,
-		/obj/item/ammo_box/magazine/multi_sprite/firefly = 2,
+		/obj/item/ammo_box/magazine/m44a = 6,
 	), src)
 
-/obj/item/storage/belt/military/assault/full/cmg/PopulateContents()
-	generate_items_inside(list(
-		/obj/item/ammo_box/magazine/multi_sprite/cmg/lethal = 6,
-	), src)
+/obj/item/ammo_box/advanced/s12gauge/buckshot/marine
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/storage/box/survival/engineer/marine
+	name = "military survival box"
+	desc = "A box issued to Nanotrasen space marines, containing field essentials. This one is labelled to contain an extended-capacity tank."
+	illustration = "extendedtank"
+	internal_type = /obj/item/tank/internals/emergency_oxygen/engi
+
+/obj/item/storage/box/survival/engineer/marine/PopulateContents()
+	..()
+	new /obj/item/storage/crayons(src) //absolutely required