UA Armed Forces update 6

code/__DEFINES/job.dm

@@ -20,9 +20,11 @@
 // 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_SPOTTER "Spotter"
+#define JOB_SQUAD_LOADER "Weapons Loader"
 #define JOB_SQUAD_TEAM_LEADER "Squad Leader"
 #define JOB_SQUAD_SMARTGUN "Smartgunner"
 #define JOB_SQUAD_ROLES /datum/timelock/squad
@@ -109,16 +111,18 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_POLICE_ROLES /datum/timelock/mp
 #define JOB_POLICE_ROLES_LIST    list(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE)
 
-#define JOB_SEA "Senior Enlisted Advisor"
+#define JOB_DI "Drill Instructor"
 
 #define JOB_CHIEF_ENGINEER "Chief Engineer"
 #define JOB_MAINT_TECH "Maintenance Technician"
 #define JOB_ORDNANCE_TECH "Ordnance Technician"
 #define JOB_ENGINEER_ROLES   /datum/timelock/engineer
 #define JOB_ENGINEER_ROLES_LIST  list(JOB_SQUAD_ENGI, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
 
-#define JOB_CHIEF_REQUISITION "Quartermaster"
-#define JOB_CARGO_TECH "Cargo Technician"
+#define JOB_CHIEF_REQUISITION "Logistics Officer"
+#define JOB_CARGO_CHIEF "Logistics Chief"
+#define JOB_ARMORER "Armorer"
+#define JOB_CARGO_TECH "Logistics Specialist"
 #define JOB_REQUISITION_ROLES    /datum/timelock/requisition
 #define JOB_REQUISITION_ROLES_LIST   list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH)
 
@@ -202,12 +206,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_ARMY_ATFIRE "Army AT Gunner"
 #define JOB_ARMY_ENGI "Army Combat Engineering Technician"
 #define JOB_ARMY_MT "Army Technical Engineer"
+#define JOB_ARMY_CT "Army Logistics Specialist"
 #define JOB_ARMY_MEDIC "Army Combat Medical Technician"
 #define JOB_ARMY_NCO "Army Fireteam Lead"
 #define JOB_ARMY_SNCO "Army Squad Leader"
 #define JOB_ARMY_LT "Army Lieutenant"
 #define JOB_ARMY_INTEL "Army Intelligence Officer"
 #define JOB_ARMY_RESEARCHER "Army Science Officer"
+#define JOB_ARMY_QM "Army Logistics Officer"
 
 //-------- USASF --------//
 #define JOB_NAVY_CREWMAN "USASF Crewman"
@@ -217,6 +223,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_NAVY_JTAC "USASF Orbital Fire-Support Liason Officer"
 #define JOB_NAVY_PARA_TECH "USASF Para-Rescue Support Technician"
 #define JOB_NAVY_SYNTH "USASF Support Synthetic"
+#define JOB_NAVY_PILOT "USASF Pilot"
 #define JOB_NAVY_CHIEF_ENGINEER "USASF Engineering Duty Officer"
 #define JOB_NAVY_FLIGHT_BOSS "USASF Flight-Deck Officer"
 #define JOB_NAVY_SO "USASF Duty Officer"

code/__DEFINES/mob_hud.dm

@@ -39,14 +39,16 @@
 #define MOB_HUD_XENO_HOSTILE 8
 #define MOB_HUD_FACTION_MARINE 9
 #define MOB_HUD_FACTION_OBSERVER 10
-#define MOB_HUD_FACTION_UPP 11
-#define MOB_HUD_FACTION_WY 12
-#define MOB_HUD_FACTION_TWE 13
-#define MOB_HUD_FACTION_CLF 14
-#define MOB_HUD_FACTION_PMC 15
-#define MOB_HUD_HUNTER 16
-#define MOB_HUD_HUNTER_CLAN 17
-#define MOB_HUD_EXECUTE 18
+#define MOB_HUD_FACTION_ARMY 11
+#define MOB_HUD_FACTION_NAVY 12
+#define MOB_HUD_FACTION_UPP 13
+#define MOB_HUD_FACTION_WY 14
+#define MOB_HUD_FACTION_TWE 15
+#define MOB_HUD_FACTION_CLF 16
+#define MOB_HUD_FACTION_PMC 17
+#define MOB_HUD_HUNTER 18
+#define MOB_HUD_HUNTER_CLAN 19
+#define MOB_HUD_EXECUTE 20
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/mode.dm

@@ -125,13 +125,13 @@
 //=================================================
 
 //Role defines, specifically lists of roles for job bans, crew manifests and the like.
-GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN))
+GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_DI, JOB_SYNTH, JOB_WARDEN))
 
 //Marine roles
-#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
+#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_DI, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
 GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO))
 GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
-GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
+GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_DI, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
 GLOBAL_LIST_INIT(ROLES_POLICE, list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE))
 GLOBAL_LIST_INIT(ROLES_ENGINEERING, list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH))
 GLOBAL_LIST_INIT(ROLES_REQUISITION, list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION))
@@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(ROLES_AI, list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_S
 GLOBAL_LIST_INIT(ROLES_AI_UPP, list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP))
 GLOBAL_LIST_INIT(ROLES_AI_FORECON, list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO))
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
-#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
+#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_DI,\
 						JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
 #define BLURB_USCM_FLIGHT JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF
 #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE

code/__DEFINES/paygrade_defs/navy.dm

@@ -2,13 +2,13 @@
 
 // USASF, the evolution of the USN & USAF, still considered Naval for the branch prefix
 
-/// NE1, Seaman Recruit
+/// NE1, Voidsman Recruit
 #define PAY_SHORT_NE1 "NE1"
 
-/// NE2, Seaman Apprentice
+/// NE2, Voidsman Apprentice
 #define PAY_SHORT_NE2 "NE2"
 
-/// NE3, Seaman
+/// NE3, Voidsman
 #define PAY_SHORT_NE3 "NE3"
 
 /// NE4, Petty Officer 3rd Class
@@ -86,5 +86,5 @@
 /// NO10, Admiral
 #define PAY_SHORT_NO10 "NO10"
 
-/// NO10C, Chief of Naval Operations
+/// NO10C, Chief of Aerospace Operations
 #define PAY_SHORT_NO10C "NO10C"

code/__HELPERS/job.dm

@@ -57,6 +57,6 @@
 			JOB_WARDEN,
 			JOB_CHIEF_POLICE,
 			JOB_WARDEN,
-			JOB_SEA,
+			JOB_DI,
 			JOB_MARINE
 			)

code/datums/factions/army.dm

@@ -0,0 +1,49 @@
+/datum/faction/army
+	name = "United States Army"
+	faction_tag = FACTION_ARMY
+
+/datum/faction/army/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_ARMY_TROOPER)
+			hud_icon_state = "trpr"
+		if(JOB_ARMY_PROPIPE)
+			hud_icon_state = "grndr"
+		if(JOB_ARMY_GUNNER)
+			hud_icon_state = "lmg"
+		if(JOB_ARMY_SMARTGUNNER)
+			hud_icon_state = "mmg"
+		if(JOB_ARMY_MARKSMAN)
+			hud_icon_state = "snpr"
+		if(JOB_ARMY_ATLOAD)
+			hud_icon_state = "atl"
+		if(JOB_ARMY_ATFIRE)
+			hud_icon_state = "atg"
+		if(JOB_ARMY_ENGI)
+			hud_icon_state = "cet"
+		if(JOB_ARMY_MT)
+			hud_icon_state = "mt"
+		if(JOB_ARMY_CT)
+			hud_icon_state = "ct"
+		if(JOB_ARMY_MEDIC)
+			hud_icon_state = "cmt"
+		if(JOB_ARMY_NCO)
+			hud_icon_state = "tl"
+		if(JOB_ARMY_SNCO)
+			hud_icon_state = "sl"
+		if(JOB_ARMY_LT)
+			hud_icon_state = "co"
+		if(JOB_ARMY_INTEL)
+			hud_icon_state = "io"
+		if(JOB_ARMY_RESEARCHER)
+			hud_icon_state = "rsr"
+		if(JOB_ARMY_QM)
+			hud_icon_state = "qm"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "army_[hud_icon_state]")

code/datums/factions/usasf.dm

@@ -0,0 +1,39 @@
+/datum/faction/navy
+	name = "United States AeroSpace Force"
+	faction_tag = FACTION_NAVY
+
+/datum/faction/navy/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_NAVY_CREWMAN)
+			hud_icon_state = "crew"
+		if(JOB_NAVY_MEDIC)
+			hud_icon_state = "doc"
+		if(JOB_NAVY_ENGI)
+			hud_icon_state = "mt"
+		if(JOB_NAVY_SKITTLE)
+			hud_icon_state = "skittle"
+		if(JOB_NAVY_JTAC)
+			hud_icon_state = "jfo"
+		if(JOB_NAVY_PARA_TECH)
+			hud_icon_state = "para"
+		if(JOB_NAVY_SYNTH)
+			hud_icon_state = "syn"
+		if(JOB_NAVY_PILOT)
+			hud_icon_state = "pilot"
+		if(JOB_NAVY_CHIEF_ENGINEER)
+			hud_icon_state = "ce"
+		if(JOB_NAVY_FLIGHT_BOSS)
+			hud_icon_state = "prifly"
+		if(JOB_NAVY_SO)
+			hud_icon_state = "so"
+		if(JOB_NAVY_CO)
+			hud_icon_state = "co"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "navy_[hud_icon_state]")

code/datums/factions/uscm.dm

@@ -19,6 +19,8 @@
 			if(JOB_SQUAD_TEAM_LEADER) marine_rk = "tl"
 			if(JOB_SQUAD_MEDIC) marine_rk = "med"
 			if(JOB_SQUAD_SMARTGUN) marine_rk = "gun"
+			if(JOB_SQUAD_SPOTTER) marine_rk = "ass"
+			if(JOB_SQUAD_LOADER) marine_rk = "load"
 			if(JOB_XO) marine_rk = "xo"
 			if(JOB_CO) marine_rk = "co"
 			if(JOB_GENERAL) marine_rk = "general"
@@ -116,6 +118,10 @@
 				border_rk = "command"
 			if(JOB_CHIEF_REQUISITION)
 				marine_rk = "ro"
+			if(JOB_CARGO_CHIEF)
+				marine_rk = "cc"
+			if(JOB_ARMORER)
+				marine_rk = "armrr"
 			if(JOB_CARGO_TECH)
 				marine_rk = "ct"
 			if(JOB_CHIEF_ENGINEER)
@@ -136,7 +142,7 @@
 				border_rk = "command"
 			if(JOB_NURSE)
 				marine_rk = "nurse"
-			if(JOB_SEA)
+			if(JOB_DI)
 				marine_rk = "sea"
 				border_rk = "command"
 			if(JOB_SYNTH)
@@ -218,6 +224,10 @@
 			// Check squad marines here too, for the unique ones
 			if(JOB_SQUAD_ENGI)
 				marine_rk = "engi"
+			if(JOB_SQUAD_SPOTTER)
+				marine_rk = "ass"
+			if(JOB_SQUAD_LOADER)
+				marine_rk = "load"
 			if(JOB_SQUAD_MEDIC)
 				marine_rk = "med"
 			if(JOB_SQUAD_SPECIALIST)

code/datums/mob_hud.dm

@@ -12,6 +12,8 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_XENO_HOSTILE = new /datum/mob_hud/xeno_hostile(),
 	MOB_HUD_FACTION_MARINE = new /datum/mob_hud/faction(),
 	MOB_HUD_FACTION_OBSERVER = new /datum/mob_hud/faction/observer(),
+	MOB_HUD_FACTION_ARMY = new /datum/mob_hud/faction/army(),
+	MOB_HUD_FACTION_NAVY = new /datum/mob_hud/faction/navy(),
 	MOB_HUD_FACTION_UPP = new /datum/mob_hud/faction/upp(),
 	MOB_HUD_FACTION_WY = new /datum/mob_hud/faction/wy(),
 	MOB_HUD_FACTION_TWE = new /datum/mob_hud/faction/twe(),
@@ -197,6 +199,12 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	if(faction == faction_to_check || isobserver(user) || isyautja(user))
 		..()
 
+/datum/mob_hud/faction/army
+	faction_to_check = FACTION_ARMY
+
+/datum/mob_hud/faction/navy
+	faction_to_check = FACTION_NAVY
+
 /datum/mob_hud/faction/upp
 	faction_to_check = FACTION_UPP
 

code/datums/paygrades/factions/uscm/navy.dm

@@ -8,24 +8,24 @@
 
 /datum/paygrade/navy/e1
 	paygrade = PAY_SHORT_NE1
-	name = "Seaman Recruit"
-	prefix = "SR"
+	name = "Voidsman Recruit"
+	prefix = "VR"
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e1
 	ranking = 0
 	pay_multiplier = 1.8
 
 /datum/paygrade/navy/e2
 	paygrade = PAY_SHORT_NE2
-	name = "Seaman Apprentice"
-	prefix = "SA"
+	name = "Voidsman Apprentice"
+	prefix = "VA"
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e2
 	ranking = 1
 	pay_multiplier = 1.9
 
 /datum/paygrade/navy/e3
 	paygrade = PAY_SHORT_NE3
-	name = "Seaman"
-	prefix = "SN"
+	name = "Voidsman"
+	prefix = "VN"
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e3
 	ranking = 2
 	pay_multiplier = 2.1
@@ -249,8 +249,8 @@
 
 /datum/paygrade/navy/o10c
 	paygrade = PAY_SHORT_NO10C
-	name = "Chief of Naval Operations"
-	prefix = "CNO"
+	name = "Chief of Aerospace Operations"
+	prefix = "CAO"
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o10c
 	ranking = 28
 	pay_multiplier = 8.5

code/datums/skills/army.dm

@@ -58,6 +58,19 @@ United States Army
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 	)
 
+/datum/skills/cargotech
+	name = "Logistics Specialist"
+	skills = list(
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+	)
+
 /datum/skills/medic
 	name = "Combat Medical Technician"
 	skills = list(
@@ -123,3 +136,19 @@ United States Army
 		SKILL_POWERLOADER = SKILL_POWERLOADER_UNTRAINED,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,	//so they can wear the XM4 armor
 	)
+
+/datum/skills/cargoofficer
+	name = "Logistics Specialist"
+	skills = list(
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_POLICE = SKILL_POLICE_FLASH,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_PILOT = SKILL_PILOT_UNTRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+	)

code/datums/skills/usasf.dm

@@ -97,6 +97,23 @@ United States Aerospace Force
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)
 
+/datum/skills/navypilot
+	name = "Pilot"
+	skills = list(
+		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UNTRAINED,
+		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_PILOT = SKILL_PILOT_EXPERT,
+		SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
+	)
+
 /datum/skills/officer
 	name = "Duty Officer"
 	skills = list(