From a6929e1e3c7976b147f7f8fb4de00bdb0b1861b0 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 3 Sep 2023 00:27:42 +0800 Subject: [PATCH 1/4] InitalCommit --- code/__DEFINES/skills.dm | 13 ++++++ code/datums/skills.dm | 44 +++++++++++++++++++ .../colonialmarines/whiskey_outpost/skills.dm | 2 + code/modules/cm_marines/overwatch.dm | 2 +- .../cm_tech/implements/xeno_handler.dm | 1 + 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index fdd1a8f083ad..5dea0306c280 100644 --- 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" @@ -142,6 +143,18 @@ #define SKILL_LEAD_MASTER 3 //XO, CO #define SKILL_LEAD_MAX 3 +//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 index 252ef07c4806..bbd4b5fe0a90 100644 --- 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, @@ -795,6 +814,7 @@ MILITARY NONCOMBATANT SKILL_PILOT = SKILL_PILOT_TRAINED, 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 +837,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 +902,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 +962,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 +1066,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 +1137,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 +1155,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 +1202,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 +1270,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 +1297,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 +1312,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 +1416,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 +1432,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 +1494,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 +1528,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 +1617,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 +1637,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 +1723,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 +1816,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 +1930,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 +1973,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 +2009,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 +2038,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 +2056,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 +2085,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 index d6dfc695c5d0..a5126627adaf 100644 --- 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 index 2dff476a7b3e..3bfce01a0300 100644 --- 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 index 45cc99d7956e..cbafec7499ee 100644 --- 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, ) From 514765bc314da3bd4b7657ca63ad2d06319e6749 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 3 Sep 2023 01:13:06 +0800 Subject: [PATCH 2/4] Consistancy --- code/datums/skills.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/skills.dm b/code/datums/skills.dm index bbd4b5fe0a90..a1d05ba19bfb 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -775,6 +775,7 @@ MILITARY NONCOMBATANT SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, ) /datum/skills/nurse @@ -793,6 +794,7 @@ MILITARY NONCOMBATANT SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, SKILL_INTEL = SKILL_INTEL_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, ) /datum/skills/pilot From 5dd7f9208d48546fae7b83bf2968e89c3e66e77e Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 3 Sep 2023 01:19:45 +0800 Subject: [PATCH 3/4] FixDup --- code/__DEFINES/skills.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 5dea0306c280..5dabb4545a32 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -135,14 +135,6 @@ #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 - //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 From 6d1c6476940c1d46e77ae220ed57c92db375283c Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:22:07 +0800 Subject: [PATCH 4/4] Update skills.dm --- code/datums/skills.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/skills.dm b/code/datums/skills.dm index a1d05ba19bfb..b77b82259297 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -775,7 +775,6 @@ MILITARY NONCOMBATANT SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, ) /datum/skills/nurse @@ -794,7 +793,6 @@ MILITARY NONCOMBATANT SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, SKILL_INTEL = SKILL_INTEL_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, ) /datum/skills/pilot @@ -816,7 +814,6 @@ MILITARY NONCOMBATANT SKILL_PILOT = SKILL_PILOT_TRAINED, 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,