Refactor squads and jobs to be consistent with less repetition (#28)

Resources/Locale/en-US/.CM14/job/job-descriptions.ftl

@@ -0,0 +1,11 @@
+# command
+job-description-senior-enlisted-advisor = Advise and train inexperienced crew members and marines alike. Bark out orders to new privates to get geared.
+
+# Marines
+job-description-rifleman = Follow orders from those above you. Do your job and shoot when you're needed to shoot. Don't die in the process.
+job-description-squad-leader = Leader of one of the four marine squads. Give your squad and fireteams objectives and follow orders from Command. Keep your squad in one piece.
+job-description-fireteam-leader = Follow the squad leader's orders and command your fireteam. Co-ordinate with CAS and fire support elements.
+job-description-weapons-specialist = Gain access to heavier, more powerful weaponry and equipment. Combat professional, lead the squad if needed.
+job-description-smartgunner = Support your Squad with heavy weaponry and give the enemy suppressing fire.
+job-description-hospital-corpsman = Keep Marines in fighting condition, or as close as you can get them. Medevac those who need to be sent back to Medbay for treatment.
+job-description-combat-tech = Build or remove fortifications. Establish and maintain FOB and Power. Gain access to blocked off areas.

Resources/Locale/en-US/CM14/CM-job-intro.ftl → Resources/Locale/en-US/.CM14/job/job-intro.ftl

@@ -3,4 +3,4 @@ job-greet-introduce-job-name = Your role is: {$jobName}.
 job-greet-important-disconnect-admin-notify = You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via ahelp.
 job-greet-supervisors-warning = As the {$jobName} you answer directly to {$supervisors}. Special circumstances may change this.
 job-greet-crew-shortages = As this station was initially staffed with a skeleton crew, additional access has been added to your ID card.
-job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen.
+job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen.

Resources/Locale/en-US/.CM14/job/job-names.ftl

@@ -0,0 +1,11 @@
+# command
+job-name-senior-enlisted-advisor = Senior Enlisted Advisor
+
+# marines
+job-name-rifleman = Rifleman
+job-name-squad-leader = Squad Leader
+job-name-fireteam-leader = Fireteam Leader
+job-name-weapons-specialist = Weapons Specialist
+job-name-smartgunner = Smartgunner
+job-name-hospital-corpsman = Hospital Corpsman
+job-name-combat-tech = Combat Technician

Resources/Locale/en-US/.CM14/job/job-playtimes.ftl

@@ -0,0 +1,11 @@
+# command
+JobSeniorEnlistedAdvisor = Senior Enlisted Advisor
+
+# marines
+JobCombatTech = Combat Tech
+JobFireteamLeader = Fireteam Leader
+JobHospitalCorpsman = Hospital Corpsman
+JobRifleman = Rifleman
+JobSmartgunner = Smart Gunner
+JobSquaderLeader = Squad Leader
+JobWeaponsSpecialist = Weapons Specialist

Resources/Locale/en-US/.CM14/job/job-supervisors.ftl

@@ -0,0 +1,2 @@
+job-supervisors-command = command staff
+job-supervisors-squad-leader = the Squad Leader

Resources/Locale/en-US/.CM14/squads.ftl

@@ -0,0 +1,21 @@
+# command
+department-MarineCommand = Command
+department-MarineCommand-description = The Command Department is the brains of the USS Almayer, leading and coordinating the squads and the other support staff of the ship to fight and win against the Aliens.
+
+# military police
+department-MilitaryPolice = Military Police
+department-MilitaryPolice-description = Enforce Marine Law. Detain Criminals. Keep Shipside Personnel Safe.
+
+# marines
+department-Marine = Marine [ALL]
+department-Marine-description = They form the main fighting body of the Almayer and are sent planetside to fight all kinds of dangers throughout the Neroid Sector.
+
+squad-alpha = Alpha Squad
+squad-bravo = Bravo Squad
+squad-charlie = Charlie Squad
+squad-delta = Delta Squad
+
+squad-alpha-name = Alpha {$name}
+squad-bravo-name = Bravo {$name}
+squad-charlie-name = Charlie {$name}
+squad-delta-name = Delta {$name}

Resources/Locale/en-US/job/department.ftl

@@ -1,8 +1,8 @@
-# department-Cargo = Cargo
-# department-Civilian = Civilian
-# department-Command = Command
-# department-Engineering = Engineering
-# department-Medical = Medical
-# department-Security = Security
-# department-Science = Science
-# department-Specific = Station specific
+department-Cargo = Cargo
+department-Civilian = Civilian
+department-Command = Command
+department-Engineering = Engineering
+department-Medical = Medical
+department-Security = Security
+department-Science = Science
+department-Specific = Station specific

Resources/Prototypes/CM14/Roles/Jobs/Command/SeniorEnlistedAdvisor.yml → Resources/Prototypes/.CM14/Roles/Jobs/Command/senior_enlisted_advisor.yml

@@ -1,26 +1,26 @@
 - type: job
-  id: seniorenlistedadvisor
-  name: job-name-seniorenlistedadvisor
-  description: job-description-seniorenlistedadvisor
-  playTimeTracker: jobseniorenlistedadvisor
+  id: JobSeniorEnlistedAdvisor
+  name: job-name-senior-enlisted-advisor
+  description: job-description-senior-enlisted-advisor
+  playTimeTracker: JobSeniorEnlistedAdvisor
   requirements:
     - !type:DepartmentTimeRequirement
-      department: marine
+      department: Marine
       time: 54000 # 15 hours
     - !type:DepartmentTimeRequirement
-      department: engineering
+      department: Engineering
       time: 36000 # 10 hours
     - !type:DepartmentTimeRequirement
-      department: militarypolice
+      department: MilitaryPolice
       time: 36000 # 10 hours
     - !type:DepartmentTimeRequirement
-      department: medical
+      department: Medical
       time: 36000 # 10 hours
     - !type:DepartmentTimeRequirement
-      department: command
+      department: MarineCommand
       time: 18000 # 5 hours
   weight: 5
-  startingGear: seniorenlistedadvisorgear
+  startingGear: SeniorEnlistedAdvisorGear
   icon: "JobIconCaptain"
   requireAdminNotify: true
   joinNotifyCrew: true
@@ -30,7 +30,7 @@
   - AllAccess
 
 - type: startingGear
-  id: seniorenlistedadvisorgear
+  id: SeniorEnlistedAdvisorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCaptain
     back: ClothingBackpackCaptainFilled
@@ -41,6 +41,6 @@
     outerClothing: ClothingOuterArmorCaptainCarapace
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
-  innerclothingskirt: ClothingUniformJumpskirtCaptain
+  innerClothingSkirt: ClothingUniformJumpskirtCaptain
   satchel: ClothingBackpackSatchelCaptainFilled
   duffelbag: ClothingBackpackDuffelCaptainFilled

Resources/Prototypes/.CM14/Roles/Jobs/Marines/combat_tech.yml

@@ -0,0 +1,36 @@
+- type: job
+  id: CombatTech
+  name: job-name-combat-tech
+  description: job-description-combat-tech
+  playTimeTracker: JobCombatTech
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Marine
+      time: 3600 #1 hrs
+  startingGear: CombatTechGear
+  icon: "JobIconStationEngineer"
+  supervisors: job-supervisors-squad-leader
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+
+- type: startingGear
+  id: CombatTechGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSec
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHelmetBasic
+    outerClothing: ClothingOuterArmorBasic
+    id: SecurityPDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltSecurityFilled
+    pocket1: WeaponPistolMk58Nonlethal
+  innerClothingSkirt: ClothingUniformJumpskirtSec
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/.CM14/Roles/Jobs/Marines/fireteam_leader.yml

@@ -0,0 +1,36 @@
+- type: job
+  id: FireteamLeader
+  name: job-name-fireteam-leader
+  description: job-description-fireteam-leader
+  playTimeTracker: JobFireteamLeader
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Marine
+      time: 28800 #8 hrs
+  startingGear: FireteamLeaderGear
+  icon: "JobIconSecurityOfficer"
+  supervisors: job-supervisors-squad-leader
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+
+- type: startingGear
+  id: FireteamLeaderGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSec
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHelmetBasic
+    outerClothing: ClothingOuterArmorBasic
+    id: SecurityPDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltSecurityFilled
+    pocket1: WeaponPistolMk58Nonlethal
+  innerClothingSkirt: ClothingUniformJumpskirtSec
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/.CM14/Roles/Jobs/Marines/hospital_corpsman.yml

@@ -0,0 +1,50 @@
+- type: job
+  id: HospitalCorpsman
+  name: job-name-hospital-corpsman
+  description: job-description-hospital-corpsman
+  playTimeTracker: JobHospitalCorpsman
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Marine
+      time: 3600 #1 hrs
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 3600 #1 hrs
+  startingGear: HospitalCorpsmanGear
+  icon: "JobIconBrigmedic"
+  supervisors: job-supervisors-squad-leader
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+
+# Remove this later
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBrigmedic
+  id: ClothingBackpackBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
+
+- type: startingGear
+  id: HospitalCorpsmanGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+    outerClothing: ClothingOuterCoatAMG
+    back: ClothingBackpackBrigmedicFilled
+    shoes: ClothingShoesColorRed
+    gloves: ClothingHandsGlovesNitrile
+    eyes: ClothingEyesHudMedical
+    head: ClothingHeadHatBeretBrigmedic
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    belt: ClothingBeltMedicalFilled
+  innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled