TGS Test Merge (#6650)

cmss13-devs · Jul 30, 2024 · 7adf69f · 7adf69f
2 parents 29c7973 + 6bf15b8
commit 7adf69f
Show file tree

Hide file tree

Showing 78 changed files with 362 additions and 211 deletions.
diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm
@@ -70,10 +70,11 @@
 
 // engineer skill
 #define SKILL_ENGINEER_DEFAULT 0
-#define SKILL_ENGINEER_TRAINED 1   //barricade repair && c4 use (mini-engis, specs)
-#define SKILL_ENGINEER_ENGI 2   //plasteel barricade deconstruction, hacking&&planet engine fixing&&apc building, Telecomms fixing (Combat Engi, OT, etc.)
-#define SKILL_ENGINEER_MASTER 3   //Synths
-#define SKILL_ENGINEER_MAX 3
+#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)
+#define SKILL_ENGINEER_MASTER 4   //Synths
+#define SKILL_ENGINEER_MAX 4
 
 //medical skill
 #define SKILL_MEDICAL_DEFAULT 0

diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm
@@ -20,7 +20,7 @@ CIVILIAN
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 	)
@@ -31,7 +31,7 @@ CIVILIAN
 		SKILL_CQC = SKILL_CQC_DEFAULT,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //The ASRS consoles
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device
 	)
@@ -43,7 +43,7 @@ CIVILIAN
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
@@ -115,7 +115,7 @@ CIVILIAN
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 	)
@@ -131,7 +131,7 @@ CIVILIAN
 /datum/skills/civilian/survivor/clf
 	name = "Survivor CLF"
 	additional_skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
@@ -158,7 +158,7 @@ CIVILIAN
 	name = "Survivor Miner"
 	additional_skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
@@ -167,7 +167,7 @@ CIVILIAN
 	name = "Survivor Trucker"
 	additional_skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
 	)
@@ -176,7 +176,7 @@ CIVILIAN
 	name = "Survivor Engineer"
 	additional_skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -192,7 +192,7 @@ CIVILIAN
 /datum/skills/civilian/survivor/marshal
 	name = "Survivor Marshal"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
@@ -201,7 +201,7 @@ CIVILIAN
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 	)

diff --git a/code/datums/skills/clf.dm b/code/datums/skills/clf.dm
@@ -12,7 +12,7 @@ COLONIAL LIBERATION FRONT
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK,
@@ -24,7 +24,7 @@ COLONIAL LIBERATION FRONT
 	skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -48,7 +48,7 @@ COLONIAL LIBERATION FRONT
 	skills = list(
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set.
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, //to use c4 in demo set.
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
@@ -60,7 +60,7 @@ COLONIAL LIBERATION FRONT
 	name = "CLF Leader"
 	skills = list(
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, // to use their C4
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
@@ -78,7 +78,7 @@ COLONIAL LIBERATION FRONT
 	name = "CLF Cell Commander"
 	skills = list(
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,

diff --git a/code/datums/skills/cmb.dm b/code/datums/skills/cmb.dm
@@ -26,7 +26,7 @@ COLONIAL MARSHALS
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_FIREMAN = SKILL_FIREMAN_MASTER,
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,

diff --git a/code/datums/skills/commando.dm b/code/datums/skills/commando.dm
@@ -9,7 +9,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_EXPERT,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
@@ -24,7 +24,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_EXPERT,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
@@ -40,7 +40,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_EXPERT,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
@@ -56,7 +56,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
@@ -71,7 +71,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
 		SKILL_FIREMAN = SKILL_FIREMAN_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
@@ -87,7 +87,7 @@ SPEC-OPS
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
 		SKILL_FIREMAN = SKILL_FIREMAN_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
@@ -105,7 +105,7 @@ SPEC-OPS
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,

diff --git a/code/datums/skills/contractor.dm b/code/datums/skills/contractor.dm
@@ -7,7 +7,7 @@ CONTRACTORS
 	name = "Contractor Standard"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
@@ -22,7 +22,7 @@ CONTRACTORS
 /datum/skills/contractor/leader
 	name = "Contractor Leader"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
@@ -45,7 +45,7 @@ CONTRACTORS
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
@@ -76,7 +76,7 @@ CONTRACTORS
 	name = "Contractor Machinegunner"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,

diff --git a/code/datums/skills/dutch.dm b/code/datums/skills/dutch.dm
@@ -4,7 +4,7 @@
 		SKILL_CQC = SKILL_CQC_MASTER,
 		SKILL_FIREMAN = SKILL_FIREMAN_MAX,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
@@ -20,7 +20,7 @@
 	name = "Dutch's Dozen Mercenary"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
@@ -35,7 +35,7 @@
 	name = "Dutch's Dozen Medic"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,

diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm
@@ -8,7 +8,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_standard
 	name = "Reconnaissance Rifleman"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -24,7 +24,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_techician
 	name = "Reconnaissance Support Technician"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -41,7 +41,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_marksman
 	name = "Reconnaissance Designated Marksman"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -58,7 +58,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_smartgunner
 	name = "Reconnaissance Smartgunner"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -75,7 +75,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_sniper
 	name = "Reconnaissance Sniper"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -92,7 +92,7 @@ MILITARY SURVIVORS
 /datum/skills/military/survivor/forecon_squad_leader
 	name = "Reconnaissance Squad Leader"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_CQC = SKILL_CQC_SKILLED,

diff --git a/code/datums/skills/freelancer.dm b/code/datums/skills/freelancer.dm
@@ -11,7 +11,7 @@ FREELANCERS
 	skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 	)
 
@@ -20,7 +20,7 @@ FREELANCERS
 	skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
@@ -31,7 +31,7 @@ FREELANCERS
 	skills = list(
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_CQC = SKILL_CQC_TRAINED,