From 71593d80dd2d2d2e0548dafe831d8d61200daf88 Mon Sep 17 00:00:00 2001 From: BasilHerb <168701329+BasilHerb@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:26:14 +1000 Subject: [PATCH] Adds & adjusts fireman skills for most roles. (#6339) # About the pull request This PR aims to add BASIC fireman carry skills to the overwhelming majority of roles in CM. It adds more advanced fireman skills to select roles, such as SLs and highly trained personnell such as deathsquad commandos. It also modifies some out-of-place fireman skills and changes them to stay in line. I have tested my changes with no issue in the T-Dome. Fireman carry does indeed work for the one's I've changed, though I cannot say for sure I didn't miss a few roles (approx 70-ish roles total). I did not experience any bugs or glitches during the process. # Explain why it's good for the game It is absolutely WILD that people can pass basic marine training and STILL not be able to carry another marine's weight over their backs. The average CLF guerilla has Fireman Skill *TWO*, whereas the average USCM rifleman has none at all. It's simply quite jarring to see this. In addition, CLF medics and engineers have no fireman skill either- There is a significant disparity between fireman carry skills, and so this PR has corrected them to be more in line (e.g. CLF soldier, medic & engineer now have fireman 1). Other, more advanced factions such as the super-trained Bri'ish and W-Y PMCs have skilled fireman carries already (Hell, even VAIPO contractors have it). It's simply a logical step to give the USCM basic fireman carrying skills. There will of course, be concerns of balance- Will adding fireman carry to your average marine affect gameplay balance significantly? In my opinion, it's an obvious 'no'. Fireman carrying is a NICHE skill. At the basic level, it is more efficient AND safe to simply drag a downed marine 6 tiles to a medic than to spend 3 seconds standing still (easy target) to carry them first. Fireman carrying is a skill intended for long-hauls. The vast majority of casualties need only be dragged less than one screen away to a medic. Circumstances where you fireman carry someone all the way to FOB are much rarer. In addition, fireman carrying and dragging are both completely and utterly outshined by roller beds- A tool which any marine can use and carry, a tool which can be pre-primed such that you can INSTANTLY put a marine on a bed and run off at Mach 7 before a xeno can say 'Mommy'. Roller beds are already commonly used to great effect, and as such fireman carrying will remain a niche tool that will not significantly impact the round. I hope this PR can be testmerged to get a feel for whether it will be suitable for the game. I suspect the number of roles who get the skill may be too much, but at the very least I'm hoping for enlisted frontline USCM & UPP personnel to gain the skill. # Testing Photographs and Procedure ![Screenshot 2024-05-27 152425](https://github.com/cmss13-devs/cmss13/assets/168701329/f499ecc4-1dc8-4c04-b9c3-b52442406726) # Changelog /:cl: add: Fireman carry to any roles that didn't already have them, except for colony civilians. balance: Nerfed CLF Guerilla fireman carry from Skilled to Trained. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/skills/civilian.dm | 12 ++++++++++++ code/datums/skills/clf.dm | 4 +++- code/datums/skills/commando.dm | 8 ++++++++ code/datums/skills/dutch.dm | 1 + code/datums/skills/forecon.dm | 6 ++++++ code/datums/skills/freelancer.dm | 3 +++ code/datums/skills/gladiator.dm | 3 +++ code/datums/skills/mercenary.dm | 6 ++++++ code/datums/skills/misc.dm | 2 ++ code/datums/skills/upp.dm | 7 +++++++ code/datums/skills/uscm.dm | 13 +++++++++++++ 11 files changed, 64 insertions(+), 1 deletion(-) diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index 9dc4afd78826..0ff13ae67225 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -29,6 +29,7 @@ CIVILIAN name = "ICC CL - Black Market ERT" skills = list( SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, @@ -57,11 +58,13 @@ CIVILIAN skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, ) /datum/skills/civilian/survivor/manager name = "Weyland-Yutani Manager" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -120,6 +123,7 @@ CIVILIAN /datum/skills/civilian/survivor/doctor name = "Survivor Doctor" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, ) @@ -136,6 +140,7 @@ CIVILIAN /datum/skills/civilian/survivor/scientist name = "Survivor Scientist" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, @@ -144,6 +149,7 @@ CIVILIAN /datum/skills/civilian/survivor/chef name = "Survivor Chef" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, ) @@ -151,6 +157,7 @@ CIVILIAN /datum/skills/civilian/survivor/miner name = "Survivor Miner" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -159,6 +166,7 @@ CIVILIAN /datum/skills/civilian/survivor/trucker name = "Survivor Trucker" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, @@ -167,6 +175,7 @@ CIVILIAN /datum/skills/civilian/survivor/engineer name = "Survivor Engineer" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, @@ -176,6 +185,7 @@ CIVILIAN /datum/skills/civilian/survivor/chaplain name = "Survivor Chaplain" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) @@ -199,6 +209,7 @@ CIVILIAN /datum/skills/civilian/survivor/prisoner name = "Survivor Prisoner" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, @@ -208,6 +219,7 @@ CIVILIAN /datum/skills/civilian/survivor/gangleader name = "Survivor Gang Leader" additional_skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, diff --git a/code/datums/skills/clf.dm b/code/datums/skills/clf.dm index 6042febb6b48..88aa14a41f79 100644 --- a/code/datums/skills/clf.dm +++ b/code/datums/skills/clf.dm @@ -10,7 +10,7 @@ COLONIAL LIBERATION FRONT SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -22,6 +22,7 @@ COLONIAL LIBERATION FRONT /datum/skills/clf/combat_engineer name = "CLF Engineer" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -34,6 +35,7 @@ COLONIAL LIBERATION FRONT /datum/skills/clf/combat_medic name = "CLF Medic" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, diff --git a/code/datums/skills/commando.dm b/code/datums/skills/commando.dm index dabae682bd0b..ed5e5ee086e4 100644 --- a/code/datums/skills/commando.dm +++ b/code/datums/skills/commando.dm @@ -8,6 +8,7 @@ SPEC-OPS name = "Commando" skills = list( SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -22,6 +23,7 @@ SPEC-OPS name = "Commando Medic" skills = list( SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -37,6 +39,7 @@ SPEC-OPS name = "Commando Leader" skills = list( SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -52,6 +55,7 @@ SPEC-OPS name = "Deathsquad" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -66,6 +70,7 @@ SPEC-OPS name = "Deathsquad Leader" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -81,6 +86,7 @@ SPEC-OPS name = "Deathsquad Officer" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -97,6 +103,7 @@ SPEC-OPS name = "Spy" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, @@ -109,6 +116,7 @@ SPEC-OPS name = "Ninja" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, diff --git a/code/datums/skills/dutch.dm b/code/datums/skills/dutch.dm index 5c2c63a8c463..4f19233e66d0 100644 --- a/code/datums/skills/dutch.dm +++ b/code/datums/skills/dutch.dm @@ -2,6 +2,7 @@ name = "Dutch" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm index 4799dd68d617..724a49ee98ca 100644 --- a/code/datums/skills/forecon.dm +++ b/code/datums/skills/forecon.dm @@ -12,6 +12,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, @@ -27,6 +28,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -43,6 +45,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SCOUT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -59,6 +62,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -75,6 +79,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SNIPER, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -91,6 +96,7 @@ MILITARY SURVIVORS SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_JTAC = SKILL_JTAC_TRAINED, diff --git a/code/datums/skills/freelancer.dm b/code/datums/skills/freelancer.dm index 7f7256318edb..09df9f32369c 100644 --- a/code/datums/skills/freelancer.dm +++ b/code/datums/skills/freelancer.dm @@ -9,6 +9,7 @@ FREELANCERS /datum/skills/freelancer name = "Freelancer Private" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -17,6 +18,7 @@ FREELANCERS /datum/skills/freelancer/combat_medic name = "Freelancer Medic" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -27,6 +29,7 @@ FREELANCERS /datum/skills/freelancer/SL name = "Freelancer Leader" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, diff --git a/code/datums/skills/gladiator.dm b/code/datums/skills/gladiator.dm index 7ba2c9eff455..7757fd928972 100644 --- a/code/datums/skills/gladiator.dm +++ b/code/datums/skills/gladiator.dm @@ -2,6 +2,7 @@ name = "Gladiator" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, @@ -13,6 +14,7 @@ name = "Gladiator Champion" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -24,6 +26,7 @@ name = "Gladiator Leader" skills = list( SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, //Spartacus! diff --git a/code/datums/skills/mercenary.dm b/code/datums/skills/mercenary.dm index 8d842ea30dd2..1dc18eaa2fbc 100644 --- a/code/datums/skills/mercenary.dm +++ b/code/datums/skills/mercenary.dm @@ -2,6 +2,7 @@ name = "Mercenary" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -14,6 +15,7 @@ name = "Elite Mercenary" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -28,6 +30,7 @@ name = "Elite Mercenary Medic" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -42,6 +45,7 @@ name = "Elite Mercenary Engineer" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -57,6 +61,7 @@ name = "Elite Mercenary Heavy" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -72,6 +77,7 @@ name = "Elite Mercenary Leader" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, diff --git a/code/datums/skills/misc.dm b/code/datums/skills/misc.dm index e4f78219b5c6..0f0ca657f995 100644 --- a/code/datums/skills/misc.dm +++ b/code/datums/skills/misc.dm @@ -12,6 +12,7 @@ MISCELLANEOUS SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, ) @@ -36,6 +37,7 @@ MISCELLANEOUS skills = list( SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, diff --git a/code/datums/skills/upp.dm b/code/datums/skills/upp.dm index 77401ab62878..e367372719d6 100644 --- a/code/datums/skills/upp.dm +++ b/code/datums/skills/upp.dm @@ -37,6 +37,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, ) @@ -47,6 +48,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, @@ -61,6 +63,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -162,6 +165,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, @@ -178,6 +182,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -197,6 +202,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_LARGE, ) @@ -209,6 +215,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 9c56e7f62a88..f694e8789dcd 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -18,6 +18,7 @@ United States Colonial Marines /datum/skills/combat_medic name = "Combat Medic" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_JTAC = SKILL_JTAC_BEGINNER, @@ -33,6 +34,7 @@ United States Colonial Marines /datum/skills/combat_engineer name = "Combat Engineer" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -42,6 +44,7 @@ United States Colonial Marines /datum/skills/smartgunner name = "Squad Smartgunner" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_JTAC = SKILL_JTAC_BEGINNER, ) @@ -49,6 +52,7 @@ United States Colonial Marines /datum/skills/specialist name = "Squad Weapons Specialist" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. @@ -61,6 +65,7 @@ United States Colonial Marines /datum/skills/tl name = "Fireteam Leader" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_JTAC = SKILL_JTAC_EXPERT, @@ -84,6 +89,7 @@ United States Colonial Marines /datum/skills/intel name = "Intelligence Officer" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -103,6 +109,7 @@ MILITARY NONCOMBATANT /datum/skills/doctor name = "Doctor" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, @@ -133,6 +140,7 @@ MILITARY NONCOMBATANT SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -145,6 +153,7 @@ MILITARY NONCOMBATANT SKILL_PILOT = SKILL_PILOT_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -187,6 +196,7 @@ MILITARY NONCOMBATANT /datum/skills/OT name = "Ordnance Technician" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, @@ -195,6 +205,7 @@ MILITARY NONCOMBATANT /datum/skills/MT name = "Maintenance Technician" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, @@ -206,6 +217,7 @@ MILITARY NONCOMBATANT skills = list( SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, // need to hunt food somehow SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER ) @@ -213,6 +225,7 @@ MILITARY NONCOMBATANT /datum/skills/CT name = "Cargo Technician" skills = list( + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, )