US Armed Forces update 3 (#525)

code/__DEFINES/skills.dm

@@ -40,6 +40,8 @@
 //spec_weapons skill
 //hidden. who can and can't use specialist weapons
 #define SKILL_SPEC_DEFAULT 7
+/// No training in spec equipment
+#define SKILL_SPEC_UNTRAINED 0
 /// Is trained to use specialist gear, but hasn't picked a kit.
 #define SKILL_SPEC_TRAINED 1
 /// Is trained to use specialist gear & HAS picked a kit. (Functionally same as SPEC_ROCKET)
@@ -63,13 +65,15 @@
 
 //construction skill
 #define SKILL_CONSTRUCTION_DEFAULT 2
+#define SKILL_CONSTRUCTION_UNTRAINED 0	//No training to build anything
 #define SKILL_CONSTRUCTION_TRAINED 1   //metal barricade construction (CT, mini-engis)
 #define SKILL_CONSTRUCTION_ENGI 2   //plasteel barricade, windows and girder construction, building machine&computer frames, (Combat Engi, OT, etc.)
 #define SKILL_CONSTRUCTION_MASTER 3   //Synths
 #define SKILL_CONSTRUCTION_MAX 3
 
 // engineer skill
 #define SKILL_ENGINEER_DEFAULT 2
+#define SKILL_ENGINEER_UNTRAINED 0	//no training
 #define SKILL_ENGINEER_NOVICE 1   //barricade repair && c4 use (mini-engis, specs)
 #define SKILL_ENGINEER_TRAINED 2   //plasteel barricade deconstruction, hacking&&planet engine fixing&&apc building, Telecomms fixing  (OT, etc.)
 #define SKILL_ENGINEER_ENGI 3      // Slightly faster at everything (Combat Technicians)
@@ -134,6 +138,7 @@
 //hidden
 //proficiency with powerloader, changes powerloader speed.
 #define SKILL_POWERLOADER_DEFAULT 1
+#define SKILL_POWERLOADER_UNTRAINED 0 //No training
 #define SKILL_POWERLOADER_TRAINED 1 //
 #define SKILL_POWERLOADER_MASTER 2 //Pilot, CT, Req, OT, CE
 #define SKILL_POWERLOADER_MAX 2
@@ -170,6 +175,7 @@
 
 //pilot skill, hidden
 #define SKILL_PILOT_DEFAULT 1
+#define SKILL_PILOT_UNTRAINED 0 //No training
 #define SKILL_PILOT_TRAINED 1 // DCC
 #define SKILL_PILOT_EXPERT 2 // Pilot, Synth
 #define SKILL_PILOT_MAX 2
@@ -197,6 +203,8 @@
 //multitile vehicle skills
 
 #define SKILL_VEHICLE_DEFAULT 2
+//Can't drive
+#define SKILL_VEHICLE_UNTRAINED 0
 //Can drive small vehicles (truck)
 #define SKILL_VEHICLE_SMALL 1
 //Can drive large vehicles (apc, tank)
@@ -214,6 +222,7 @@
 
 // Fireman carry - Separated from police skills for further rebalances. Determines how fast you carry someone.
 #define SKILL_FIREMAN_DEFAULT 3
+#define SKILL_FIREMAN_UNTRAINED 0
 #define SKILL_FIREMAN_TRAINED 1
 #define SKILL_FIREMAN_SKILLED 2
 #define SKILL_FIREMAN_EXPERT 3

code/datums/skills/army.dm

@@ -9,6 +9,11 @@ United States Army
 	skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 	)
 
@@ -21,6 +26,8 @@ United States Army
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 	)
 
@@ -31,6 +38,11 @@ United States Army
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,	//so they can wear the XM4 armor
 	)
@@ -43,6 +55,11 @@ United States Army
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 	)
 
 /datum/skills/snco
@@ -55,6 +72,11 @@ United States Army
 		SKILL_JTAC = SKILL_JTAC_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 	)
 
 /datum/skills/lt
@@ -68,5 +90,9 @@ United States Army
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_SPEC = 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

@@ -14,6 +14,8 @@ United States Aerospace Force
 		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
 		SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER,
 	)
 
@@ -27,6 +29,7 @@ United States Aerospace Force
 		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 	)
 
@@ -38,6 +41,11 @@ United States Aerospace Force
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
+		SKILL_ENGINEER = SKILL_ENGINEER_UNTRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
 	)
 
 /datum/skills/eng_tech
@@ -50,6 +58,7 @@ United States Aerospace Force
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED,
+		SKILL_SPEC = SKILL_SPEC_UNTRAINED,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 	)
 
@@ -60,6 +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_FIREMAN = SKILL_FIREMAN_EXPERT,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
@@ -78,6 +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_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
@@ -94,9 +105,13 @@ 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_POLICE = SKILL_POLICE_FLASH,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
+		SKILL_ENGINEER = SKILL_ENGINEER_UNTRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
@@ -112,10 +127,13 @@ 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_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_PILOT = SKILL_PILOT_EXPERT,
 		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_ENGINEER = SKILL_ENGINEER_UNTRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_UNTRAINED,
 	)
 
 /datum/skills/navycengi
@@ -130,6 +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_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_PILOT = SKILL_PILOT_TRAINED,
 		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
@@ -146,6 +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_CQC = SKILL_CQC_EXPERT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,

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

@@ -13,7 +13,7 @@
 
 /datum/job/trooper/medic
 	title = JOB_ARMY_MEDIC
-	gear_preset = /datum/equipment_preset/usasf/chief_engineer
+	gear_preset = /datum/equipment_preset/usa/medic
 
 /datum/job/trooper/nco
 	title = JOB_ARMY_NCO

code/modules/gear_presets/synths.dm

@@ -104,6 +104,7 @@
 	name = "USASF Synthetic"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
 	faction = FACTION_NAVY
+	faction_group = FACTION_LIST_MARINE
 	idtype = /obj/item/card/id/gold
 	assignment = JOB_NAVY_SYNTH
 	rank = "Synthetic"