Overwatch Skill + All USCM Officers Can Now Overwatch (#4318)

# About the pull request Separates overwatch console usage out of the leadership skill and into its own skill, the Overwatch skill. Grants all USCM officers the ability to use overwatch consoles, for low-pop hours. # Explain why it's good for the game Giving people access to overwatch was constrained by the fact that the minimum leadership skill to use OW gave you a high rank order, this change now allows you to give people OW access without giving them access to strong orders. Furthermore, this now allows all officers the ability to use the OW console. This should help for low-pop hours or for when a officer wants to check the OW for information. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: A new skill has been added, the 'Overwatch' skill, allows the user to use the overwatch console. add: All USCM Officers can now use overwatch consoles. /:cl: --------- Co-authored-by: Steelpoint <[email protected]>
cmss13-devs · Sep 9, 2023 · 7abc876 · 7abc876
1 parent 4e32820
commit 7abc876
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 2 deletions.
diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm
@@ -8,6 +8,7 @@
 #define SKILL_ENGINEER "engineer"
 #define SKILL_CONSTRUCTION "construction"
 #define SKILL_LEADERSHIP "leadership"
+#define SKILL_OVERWATCH "overwatch"
 #define SKILL_MEDICAL "medical"
 #define SKILL_SURGERY "surgery"
 #define SKILL_RESEARCH "research"
@@ -134,14 +135,18 @@
 #define SKILL_POWERLOADER_MASTER 2 //Pilot, CT, Req, OT, CE
 #define SKILL_POWERLOADER_MAX 2
 
-
 //leadership skill
 #define SKILL_LEAD_NOVICE 0 //Anyone but the above. Using SL items is possible but painfully slow
 #define SKILL_LEAD_TRAINED 1 //SL
 #define SKILL_LEAD_EXPERT 2 //SOs
 #define SKILL_LEAD_MASTER 3 //XO, CO
 #define SKILL_LEAD_MAX 3
 
+//overwatch skill
+#define SKILL_OVERWATCH_DEFAULT 0
+#define SKILL_OVERWATCH_TRAINED 1 //Allows use of overwatch consoles
+#define SKILL_OVERWATCH_MAX 1
+
 
 //JTAC skill
 #define SKILL_JTAC_NOVICE 0 //Anyone but those following.

diff --git a/code/datums/skills.dm b/code/datums/skills.dm
@@ -79,6 +79,11 @@
 	else
 		REMOVE_TRAIT(owner, TRAIT_LEADERSHIP, TRAIT_SOURCE_SKILL(skill_name))
 
+/datum/skill/overwatch
+	skill_name = SKILL_OVERWATCH
+	skill_level = SKILL_OVERWATCH_DEFAULT
+	max_skill_level = SKILL_OVERWATCH_MAX
+
 /datum/skill/medical
 	skill_name = SKILL_MEDICAL
 	skill_level = SKILL_MEDICAL_DEFAULT
@@ -281,6 +286,7 @@ CIVILIAN
 	skills = list(
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -292,6 +298,7 @@ CIVILIAN
 	skills = list(
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -312,6 +319,7 @@ CIVILIAN
 	name = "Weyland-Yutani Manager"
 	skills = list(
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 	)
@@ -576,6 +584,7 @@ COMMAND STAFF
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
@@ -593,6 +602,7 @@ COMMAND STAFF
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
@@ -614,6 +624,7 @@ COMMAND STAFF
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc.
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
@@ -633,6 +644,7 @@ COMMAND STAFF
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
@@ -650,6 +662,7 @@ COMMAND STAFF
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -676,6 +689,7 @@ COMMAND STAFF
 	skills = list(
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -692,6 +706,7 @@ COMMAND STAFF
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
@@ -707,6 +722,7 @@ COMMAND STAFF
 		SKILL_PILOT = SKILL_PILOT_EXPERT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
@@ -725,6 +741,7 @@ COMMAND STAFF
 		SKILL_ENGINEER = SKILL_ENGINEER_MASTER,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
@@ -738,6 +755,7 @@ COMMAND STAFF
 	skills = list(
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
@@ -783,6 +801,7 @@ MILITARY NONCOMBATANT
 		SKILL_PILOT = SKILL_PILOT_EXPERT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
 		SKILL_JTAC = SKILL_JTAC_TRAINED,
@@ -817,6 +836,7 @@ MILITARY NONCOMBATANT
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
@@ -881,6 +901,7 @@ SYNTHETIC
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MASTER,
 		SKILL_SURGERY = SKILL_SURGERY_EXPERT,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -940,6 +961,7 @@ SYNTHETIC
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MASTER,
 		SKILL_SURGERY = SKILL_SURGERY_EXPERT,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -1043,6 +1065,7 @@ United States Colonial Marines
 	skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -1113,6 +1136,7 @@ COLONIAL LIBERATION FRONT
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
@@ -1130,6 +1154,7 @@ COLONIAL LIBERATION FRONT
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
@@ -1176,6 +1201,7 @@ FREELANCERS
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)
 
@@ -1243,6 +1269,7 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)
@@ -1269,6 +1296,7 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
@@ -1283,6 +1311,7 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
@@ -1386,6 +1415,7 @@ Private Military Contractors
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_JTAC = SKILL_JTAC_TRAINED,
@@ -1401,6 +1431,7 @@ Private Military Contractors
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -1462,6 +1493,7 @@ Private Military Contractors
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_JTAC = SKILL_JTAC_MASTER,
 		SKILL_EXECUTION = SKILL_EXECUTION_TRAINED,
@@ -1495,6 +1527,7 @@ CONTRACTORS
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
@@ -1583,6 +1616,7 @@ COLONIAL MARSHALS
 		SKILL_CQC = SKILL_CQC_EXPERT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_FIREMAN = SKILL_FIREMAN_MASTER,
@@ -1602,6 +1636,7 @@ COLONIAL MARSHALS
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, // incase the synth needs to use consoles for investigations or tracking
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED, // Not a medical Synthetic, but operate if absolutely needed.
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
@@ -1687,6 +1722,7 @@ COLONIAL MARSHALS
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
@@ -1779,6 +1815,7 @@ SPEC-OPS
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
@@ -1892,6 +1929,7 @@ MISCELLANEOUS
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_MASTER,
@@ -1934,6 +1972,7 @@ MISCELLANEOUS
 	skills = list(
 		SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
@@ -1969,6 +2008,7 @@ MISCELLANEOUS
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER, //Spartacus!
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
 		SKILL_JTAC = SKILL_JTAC_MASTER,
 	)
@@ -1997,6 +2037,7 @@ MISCELLANEOUS
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
@@ -2014,6 +2055,7 @@ MISCELLANEOUS
 		SKILL_ENGINEER = SKILL_ENGINEER_MASTER,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
 		SKILL_JTAC = SKILL_JTAC_MASTER,
 	)
@@ -2042,6 +2084,7 @@ MISCELLANEOUS
 		SKILL_ENGINEER = SKILL_ENGINEER_MAX,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX,
 		SKILL_LEADERSHIP = SKILL_LEAD_MAX,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_MAX,
 		SKILL_MEDICAL = SKILL_MEDICAL_MAX,
 		SKILL_SURGERY = SKILL_SURGERY_MAX,
 		SKILL_RESEARCH = SKILL_RESEARCH_MAX,

diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm
@@ -17,6 +17,7 @@
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)
 
@@ -37,6 +38,7 @@
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc.
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,

diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -63,7 +63,7 @@
 	if(istype(src, /obj/structure/machinery/computer/overwatch/almayer/broken))
 		return
 
-	if(!ishighersilicon(usr) && !skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) && SSmapping.configs[GROUND_MAP].map_name != MAP_WHISKEY_OUTPOST)
+	if(!ishighersilicon(usr) && !skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) && SSmapping.configs[GROUND_MAP].map_name != MAP_WHISKEY_OUTPOST)
 		to_chat(user, SPAN_WARNING("You don't have the training to use [src]."))
 		return
 

diff --git a/code/modules/cm_tech/implements/xeno_handler.dm b/code/modules/cm_tech/implements/xeno_handler.dm
@@ -55,5 +55,6 @@
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT,
 	)