Final initial changes

Tidying up .DMI files, changing ComTech preset to combat engineer, flight crew tidy up

code/__DEFINES/job.dm

@@ -20,7 +20,7 @@
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
 #define JOB_SQUAD_LEADER "Section Sergeant"
-#define JOB_SQUAD_ENGI "Combat Technician"
+#define JOB_SQUAD_ENGI "Combat Engineer"
 #define JOB_SQUAD_MEDIC "Corpsman"
 #define JOB_SQUAD_SPECIALIST "Weapons Specialist"
 #define JOB_SQUAD_TEAM_LEADER "Squad Sergeant"

code/modules/clothing/under/ties.dm

@@ -410,6 +410,11 @@
 	desc = "A fire-resistant shoulder patch, worn by the men and women of USCM FORECON. Swift, Silent, Deadly."
 	icon_state = "forecon_patch"
 
+/obj/item/clothing/accessory/patch/sapper
+	name = "USCM Combat Engineering patch"
+	desc = "A fire-resistant shoulder patch, worn by the men and women of the 4th Combat Engineering Battalion, part of the USCM 2nd Colonial Support Group."
+	icon_state = "forecon_patch"
+
 /obj/item/clothing/accessory/patch/royal_marines
 	name = "TWE Royal Marines Commando patch"
 	desc = "A fire-resistant shoulder patch, worn by the men and women of the royal marines commando."

code/modules/gear_presets/usasf.dm

@@ -70,23 +70,13 @@
 
 /datum/equipment_preset/usasf/crew/flight
 	name = "USASF Flight-Deck Crewman"
+	assignment = JOB_NAVY_SKITTLE
 	rank = JOB_NAVY_SKITTLE
 	paygrades = list(PAY_SHORT_NE5 = JOB_PLAYTIME_TIER_0)
-	role_comm_title = "Ordnc"
+	role_comm_title = "Flight Crew"
 	flags = EQUIPMENT_PRESET_EXTRA
 	skills = /datum/skills/flight_crew
 
-/datum/equipment_preset/usasf/crew/flight/get_assignment(mob/living/carbon/human/new_human)
-	if(prob(20))
-		return "USASF Flight-Deck Ordnance Crewman"
-	if(prob(20))
-		return "USASF Flight-Deck Maintenance Crewman"
-	if(prob(20))
-		return "USASF Flight-Deck Fuel Crewman"
-	if(prob(20))
-		return "USASF Flight-Deck Safety Crewman"
-	return "USASF Flight-Deck Handler Crewman"
-
 #define USAF_ORDNANCE_CREW "USASF Flight-Deck Ordnance Crewman"
 #define USAF_MAINT_CREW "USASF Flight-Deck Maintenance Crewman"
 #define USAF_FUEL_CREW "USASF Flight-Deck Fuel Crewman"

code/modules/gear_presets/uscm.dm

@@ -648,14 +648,14 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/uscm/engineer_equipped
-	name = "USCM Squad Combat Technician (Equipped)"
+	name = "USCM Squad Combat Engineer (Equipped)"
 	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
 
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING)
 	assignment = JOB_SQUAD_ENGI
 	rank = JOB_SQUAD_ENGI
 	paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_3)
-	role_comm_title = "ComTech"
+	role_comm_title = "ComEng"
 	skills = /datum/skills/combat_engineer
 
 	minimap_icon = "engi"
@@ -683,6 +683,7 @@
 	add_uscm_goggles(new_human)
 	//uniform
 	add_uscm_uniform(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/sapper, WEAR_ACCESSORY)
 	//jacket
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/m3/mag/mk1(new_human), WEAR_ACCESSORY)