Skip to content

Commit

Permalink
refactor skill.dm into multiple file inside skills folder (#4633)
Browse files Browse the repository at this point in the history 
# About the pull request
intend to make the code more organized.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# 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:
refactor: refactored some code
/:cl:

Co-authored-by: Julien <[email protected]>
  • Loading branch information
@Huffie56
Huffie56 and Julien committed Oct 18, 2023
1 parent 059ccf5 commit 5a79496
Show file tree
Hide file tree
Showing 19 changed files with 2,207 additions and 2,200 deletions.
2,199 changes: 0 additions & 2,199 deletions code/datums/skills.dm
View file

This file was deleted.

213 changes: 213 additions & 0 deletions code/datums/skills/civilian.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
/*
---------------------
CIVILIAN
---------------------
*/

/datum/skills/civilian
name = "Civilian"
skills = list(
SKILL_CQC = SKILL_CQC_DEFAULT,
SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
SKILL_ENDURANCE = SKILL_ENDURANCE_NONE,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/manager
name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things.
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,
SKILL_INTEL = SKILL_INTEL_EXPERT,
)

/datum/skills/civilian/icc_investigation
name = "ICC CL - Black Market ERT"
skills = list(
SKILL_CQC = SKILL_CQC_DEFAULT,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles
SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device
)

/datum/skills/civilian/manager/director
name = "Weyland-Yutani Director"
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,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_EXECUTION = SKILL_EXECUTION_TRAINED,
SKILL_INTEL = SKILL_INTEL_EXPERT,
)

//civilian that are survivor could be in is own file maybe

/datum/skills/civilian/survivor
name = "Survivor"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
)

/datum/skills/civilian/survivor/manager
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,
)

/datum/skills/civilian/survivor/goon
name = "Survivor Goon"
skills = list(
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/pmc
name = "Survivor PMC"
additional_skills = list(
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/pmc/medic
name = "Survivor PMC Medic"
additional_skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/pmc/engineer
name = "Survivor PMC Engineer"
additional_skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
)

/datum/skills/civilian/survivor/doctor
name = "Survivor Doctor"
additional_skills = list(
SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
SKILL_SURGERY = SKILL_SURGERY_TRAINED,
)

/datum/skills/civilian/survivor/clf
name = "Survivor CLF"
additional_skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
)

/datum/skills/civilian/survivor/scientist
name = "Survivor Scientist"
additional_skills = list(
SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
SKILL_SURGERY = SKILL_SURGERY_TRAINED,
SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
)

/datum/skills/civilian/survivor/chef
name = "Survivor Chef"
additional_skills = list(
SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER,
SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED,
)

/datum/skills/civilian/survivor/miner
name = "Survivor Miner"
additional_skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/trucker
name = "Survivor Trucker"
additional_skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
)

/datum/skills/civilian/survivor/engineer
name = "Survivor Engineer"
additional_skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/chaplain
name = "Survivor Chaplain"
additional_skills = list(
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)

/datum/skills/civilian/survivor/marshal
name = "Survivor Marshal"
skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
)

/datum/skills/civilian/survivor/prisoner
name = "Survivor Prisoner"
additional_skills = list(
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/gangleader
name = "Survivor Gang Leader"
additional_skills = list(
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)
92 changes: 92 additions & 0 deletions code/datums/skills/clf.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
-------------------------
COLONIAL LIBERATION FRONT
-------------------------
*/

/datum/skills/clf
name = "CLF Soldier"
skills = list(
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
)

/datum/skills/clf/combat_engineer
name = "CLF Engineer"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
)

/datum/skills/clf/combat_medic
name = "CLF Medic"
skills = list(
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
)

/datum/skills/clf/specialist
name = "CLF Specialist"
skills = list(
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set.
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_JTAC = SKILL_JTAC_TRAINED
)

/datum/skills/clf/leader
name = "CLF Leader"
skills = list(
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
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,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
SKILL_JTAC = SKILL_JTAC_EXPERT,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI
)

/datum/skills/clf/commander
name = "CLF Cell Commander"
skills = list(
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
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,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
SKILL_ENDURANCE = SKILL_ENDURANCE_MAX,
SKILL_JTAC = SKILL_JTAC_MASTER,
SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
SKILL_EXECUTION = SKILL_EXECUTION_TRAINED,
)
60 changes: 60 additions & 0 deletions code/datums/skills/cmb.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
---------------------
COLONIAL MARSHALS
---------------------
*/
/datum/skills/cmb
name = "CMB Deputy"
skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_CQC = SKILL_CQC_EXPERT,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
)

/datum/skills/cmb/leader
name = "CMB Marshal"
skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
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,
SKILL_FIREARMS = SKILL_FIREARMS_MAX,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT,
SKILL_JTAC = SKILL_JTAC_EXPERT,
)

/datum/skills/synthetic/cmb
name = "CMB Investigative Synthetic"
skills = list(
SKILL_CQC = SKILL_CQC_MASTER,
SKILL_ENGINEER = SKILL_ENGINEER_MASTER,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
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,
SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER,
SKILL_PILOT = SKILL_PILOT_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_MAX,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
SKILL_INTEL = SKILL_INTEL_EXPERT,
SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER
)
Loading

0 comments on commit 5a79496

Please sign in to comment.