Skip to content

Commit

Permalink
Adds & adjusts fireman skills for most roles.
Browse files Browse the repository at this point in the history
  • Loading branch information
BasilHerb committed May 27, 2024
1 parent 17cf367 commit d7c77ae
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 1 deletion.
14 changes: 14 additions & 0 deletions code/datums/skills/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CIVILIAN
name = "Civilian"
skills = list(
SKILL_CQC = SKILL_CQC_DEFAULT,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
SKILL_ENDURANCE = SKILL_ENDURANCE_NONE,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
Expand All @@ -17,6 +18,7 @@ CIVILIAN
name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things.
skills = list(
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
Expand All @@ -29,6 +31,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,
Expand Down Expand Up @@ -57,11 +60,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,
Expand Down Expand Up @@ -120,6 +125,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,
)
Expand All @@ -136,6 +142,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,
Expand All @@ -144,13 +151,15 @@ 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,
)

/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,
Expand All @@ -159,6 +168,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,
Expand All @@ -167,6 +177,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,
Expand All @@ -176,6 +187,7 @@ CIVILIAN
/datum/skills/civilian/survivor/chaplain
name = "Survivor Chaplain"
additional_skills = list(
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)

Expand All @@ -199,6 +211,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,
Expand All @@ -208,6 +221,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,
Expand Down
4 changes: 3 additions & 1 deletion code/datums/skills/clf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 8 additions & 0 deletions code/datums/skills/commando.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions code/datums/skills/dutch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions code/datums/skills/forecon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions code/datums/skills/freelancer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions code/datums/skills/gladiator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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!
Expand Down
6 changes: 6 additions & 0 deletions code/datums/skills/mercenary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions code/datums/skills/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -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,
Expand All @@ -50,6 +52,7 @@ MISCELLANEOUS
name = "Souto Man"
skills = list(
SKILL_CQC = SKILL_CQC_MASTER,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
Expand Down
Loading

0 comments on commit d7c77ae

Please sign in to comment.