US Armed Forces quickfix and update 4 (#528)

code/__DEFINES/job.dm

@@ -194,6 +194,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 //-------- US Army --------//
 #define JOB_ARMY_TROOPER "Army Trooper"
+#define JOB_ARMY_GUNNER "Army Gunner"
 #define JOB_ARMY_ENGI "Army Sapper"
 #define JOB_ARMY_MEDIC "Army Medic"
 #define JOB_ARMY_NCO "Army Fireteam Lead"

code/datums/skills/army.dm

@@ -11,7 +11,7 @@ United States Army
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
@@ -27,7 +27,7 @@ United States Army
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_BEGINNER,
 		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 	)
 
@@ -40,7 +40,7 @@ United States Army
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
 		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
@@ -57,7 +57,7 @@ United States Army
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 	)
@@ -74,7 +74,7 @@ United States Army
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 	)
@@ -92,7 +92,7 @@ United States Army
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,	//so they can wear the XM4 armor
 	)

code/datums/skills/usasf.dm

@@ -69,7 +69,7 @@ United States Aerospace Force
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
@@ -88,7 +88,7 @@ United States Aerospace Force
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
@@ -105,7 +105,7 @@ United States Aerospace Force
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
@@ -127,7 +127,7 @@ United States Aerospace Force
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_JTAC = SKILL_JTAC_TRAINED,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_PILOT = SKILL_PILOT_EXPERT,
 		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
@@ -148,7 +148,7 @@ United States Aerospace Force
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_JTAC = SKILL_JTAC_MASTER,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
@@ -165,7 +165,7 @@ United States Aerospace Force
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_MASTER,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
-		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
 		SKILL_CQC = SKILL_CQC_EXPERT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,

code/game/jobs/job/special/army.dm

@@ -7,6 +7,10 @@
 	entry_message_body = "You are a rank-and-file Soldier of your standing army, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the platoon. Hoo-ah!"
 	return ..()
 
+/datum/job/trooper/gunner
+	title = JOB_ARMY_GUNNER
+	gear_preset = /datum/equipment_preset/usa/gunner
+
 /datum/job/trooper/sapper
 	title = JOB_ARMY_ENGI
 	gear_preset = /datum/equipment_preset/usa/sapper

code/game/objects/items/devices/radio/headset.dm

@@ -1145,7 +1145,7 @@
 
 /obj/item/device/radio/headset/distress/USASF/command
 	name = "\improper USASF Command earpiece"
-	desc = "A sleek headset used by officers of the United States Aerospace Force, manufactured in Sol. Low profile and surprisngly comfortable, this one has a reinforced brace. Featured channels include: ; - USASF, :o - Colony, :g - public, :v - marine command, :J - JTAC."
+	desc = "A sleek headset used by officers of the United States Aerospace Force, manufactured in Sol. Low profile and surprisngly comfortable, this one has a reinforced brace. Featured channels include: ; - USASF, :o - Colony, :g - public, :v - command, :J - JTAC."
 	icon_state = "navcom_headset"
 	initial_keys = list(/obj/item/device/encryptionkey/usasf/command)
 	volume = RADIO_VOLUME_CRITICAL
@@ -1172,7 +1172,7 @@
 
 /obj/item/device/radio/headset/distress/army/command
 	name = "\improper Army Command headset"
-	desc = "A robust headset used by officers of the United States Army. Built to outlast those it's issued to. This model features a reinforced brace complete with blinky light to make you seem even more important to the grunts you lead! Featured channels include: ; - US Army, :o - Colony, :v - marine command, :J - JTAC."
+	desc = "A robust headset used by officers of the United States Army. Built to outlast those it's issued to. This model features a reinforced brace complete with blinky light to make you seem even more important to the grunts you lead! Featured channels include: ; - US Army, :o - Colony, :v - command, :J - JTAC."
 	icon_state = "armcom_headset"
 	initial_keys = list(/obj/item/device/encryptionkey/army/command)
 	volume = RADIO_VOLUME_CRITICAL

code/game/objects/items/storage/backpack.dm

@@ -418,7 +418,7 @@
 
 /obj/item/storage/backpack/marine
 	name = "\improper lightweight IMP backpack"
-	desc = "The standard-issue pack of the USCM forces. Designed to lug gear into the battlefield."
+	desc = "The standard-issue pack of the USCM and US Army forces. Designed to lug gear into the battlefield using the Intuitive Mounting Point system on M3 armor."
 	icon_state = "marinepack"
 	item_state = "marinepack"
 	has_gamemode_skin = TRUE //replace this with the atom_flag NO_SNOW_TYPE at some point, just rename it to like, NO_MAP_VARIANT_SKIN
@@ -1170,3 +1170,8 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	desc = "A heavy-duty pack, used for telecommunications between army elements in the field and higher command elements."
 	networks_receive = list(FACTION_MARINE, FACTION_ARMY)
 	networks_transmit = list(FACTION_MARINE, FACTION_ARMY)
+
+/obj/item/storage/backpack/marine/medic/army
+	name = "\improper Army combat medic backpack"
+	desc = "A standard-issue backpack worn by US Army medics."
+	has_gamemode_skin = FALSE

code/game/objects/items/storage/belt.dm

@@ -606,6 +606,10 @@
 	for(var/i = 1 to storage_slots)
 		new /obj/item/ammo_magazine/rifle/m41aMK1 (src)
 
+/obj/item/storage/belt/marine/m41e2ap/fill_preset_inventory()
+	for(var/i = 1 to storage_slots)
+		new /obj/item/ammo_magazine/rifle/lmg/ap (src)
+
 /obj/item/storage/belt/marine/m39/fill_preset_inventory()
 	for(var/i = 1 to storage_slots)
 		new /obj/item/ammo_magazine/smg/m39 (src)

code/modules/gear_presets/usa.dm

@@ -67,11 +67,55 @@
 
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/full, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_BACK)
 
 /datum/equipment_preset/usa/trooper/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_AE2 = JOB_PLAYTIME_TIER_0)
 
+
+/datum/equipment_preset/usa/gunner
+	name = "Army Gunner"
+	assignment = JOB_ARMY_GUNNER
+	rank = JOB_ARMY_GUNNER
+	paygrades = list(PAY_SHORT_AE4 = JOB_PLAYTIME_TIER_0)
+	role_comm_title = "GNR"
+	flags = EQUIPMENT_PRESET_EXTRA
+	skills = /datum/skills/trooper	//trooper with a big gun, no fancy skills
+
+/datum/equipment_preset/usa/gunner/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/army, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/standard/army, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big/orange, WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/army/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/army, WEAR_ACCESSORY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/army/infantry, WEAR_ACCESSORY)
+
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium/rto/army, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET)
+
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/lmg/army, WEAR_J_STORE)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41e2ap, WEAR_WAIST)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/stack/folding_barricade/three, WEAR_BACK)
+// Todo- replace HPR with smartgunner once custom armour PR's put through
+
+/datum/equipment_preset/usa/gunner/lesser_rank
+	name = parent_type::name + " (Lesser Rank)"
+	paygrades = list(PAY_SHORT_AE3 = JOB_PLAYTIME_TIER_0)
+
+
 /datum/equipment_preset/usa/sapper
 	name = "Army Sapper"
 	assignment = JOB_ARMY_ENGI
@@ -105,6 +149,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/engikit/full, WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_BACK)
+
 
 /datum/equipment_preset/usa/medic
 	name = "Army Combat Medical Technician"
@@ -131,8 +178,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_ACCESSORY)
 
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium/rto/army, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET)
 
@@ -141,6 +188,12 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic/army, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK)
 
 
 /datum/equipment_preset/usa/nco
@@ -210,6 +263,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full, WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto/army, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94/signal, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_BACK)
 
 /datum/equipment_preset/usa/snco/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"

code/modules/projectiles/guns/rifles.dm

@@ -1295,6 +1295,13 @@
 /obj/item/weapon/gun/rifle/lmg/tactical/set_gun_config_values()
 	..()
 	damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2//equal to m41a dmg
+
+/obj/item/weapon/gun/rifle/lmg/army
+	current_mag = /obj/item/ammo_magazine/rifle/lmg/ap
+	starting_attachment_types = list(/obj/item/attachable/magnetic_harness, /obj/item/attachable/extended_barrel, /obj/item/attachable/bipod)
+/obj/item/weapon/gun/rifle/lmg/army/set_gun_config_values()
+	..()
+	damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2//equal to m41a dmg
 //-------------------------------------------------------