diff --git a/Resources/Locale/en-US/.CM14/job/job-descriptions.ftl b/Resources/Locale/en-US/.CM14/job/job-descriptions.ftl new file mode 100644 index 00000000000000..fda8e09e5c914c --- /dev/null +++ b/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. diff --git a/Resources/Locale/en-US/CM14/CM-job-intro.ftl b/Resources/Locale/en-US/.CM14/job/job-intro.ftl similarity index 93% rename from Resources/Locale/en-US/CM14/CM-job-intro.ftl rename to Resources/Locale/en-US/.CM14/job/job-intro.ftl index d999c0d92d1db0..b4213c080409e3 100644 --- a/Resources/Locale/en-US/CM14/CM-job-intro.ftl +++ b/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. \ No newline at end of file +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. diff --git a/Resources/Locale/en-US/.CM14/job/job-names.ftl b/Resources/Locale/en-US/.CM14/job/job-names.ftl new file mode 100644 index 00000000000000..41ef827c2f0a61 --- /dev/null +++ b/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 diff --git a/Resources/Locale/en-US/.CM14/job/job-playtimes.ftl b/Resources/Locale/en-US/.CM14/job/job-playtimes.ftl new file mode 100644 index 00000000000000..4b2b3b2bdff4f3 --- /dev/null +++ b/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 diff --git a/Resources/Locale/en-US/.CM14/job/job-supervisors.ftl b/Resources/Locale/en-US/.CM14/job/job-supervisors.ftl new file mode 100644 index 00000000000000..dea563c41b5ad1 --- /dev/null +++ b/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 diff --git a/Resources/Locale/en-US/.CM14/squads.ftl b/Resources/Locale/en-US/.CM14/squads.ftl new file mode 100644 index 00000000000000..773cf9bf1d3dea --- /dev/null +++ b/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} diff --git a/Resources/Locale/en-US/CM14/CM-department.ftl b/Resources/Locale/en-US/CM14/CM-department.ftl deleted file mode 100644 index 84593edec037d0..00000000000000 --- a/Resources/Locale/en-US/CM14/CM-department.ftl +++ /dev/null @@ -1,24 +0,0 @@ -# name # - -# department-command = Command -# department-militarypolice = Military Police -# department-requisitions = Requisitions -# department-medical = Medical -# department-engineering = Engineering - -department-command = Command - -#marines -department-marine = Marine [ALL] -department-marine-alpha = Alpha Squad -department-marine-bravo = Bravo Squad -department-marine-charlie = Charlie Squad -department-marine-delta = Delta Squad - -# description # - -#command -department-command-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. - -#marines -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. \ No newline at end of file diff --git a/Resources/Locale/en-US/CM14/CM-job-names.ftl b/Resources/Locale/en-US/CM14/CM-job-names.ftl deleted file mode 100644 index ecd3ff86c39367..00000000000000 --- a/Resources/Locale/en-US/CM14/CM-job-names.ftl +++ /dev/null @@ -1,70 +0,0 @@ -# names # - -# command -job-name-seniorenlistedadvisor = Senior Enlisted Advisor - -# marines -job-name-alpha-rifleman = Alpha Rifleman -job-name-bravo-rifleman = Bravo Rifleman -job-name-charlie-rifleman = Charlie Rifleman -job-name-delta-rifleman = Delta Rifleman - -job-name-alpha-squadleader = Alpha Squad Leader -job-name-bravo-squadleader = Bravo Squad Leader -job-name-charlie-squadleader = Charlie Squad Leader -job-name-delta-squadleader = Delta Squad Leader - -job-name-alpha-fireteamleader = Alpha Fireteam Leader -job-name-bravo-fireteamleader = Bravo Fireteam Leader -job-name-charlie-fireteamleader = Charlie Fireteam Leader -job-name-delta-fireteamleader = Delta Fireteam Leader - -job-name-alpha-weaponsspecialist = Alpha Weapons Specialist -job-name-bravo-weaponsspecialist = Bravo Weapons Specialist -job-name-charlie-weaponsspecialist = Charlie Weapons Specialist -job-name-delta-weaponsspecialist = Delta Weapons Specialist - -job-name-alpha-smartgunner = Alpha Smartgunner -job-name-bravo-smartgunner = Bravo Smartgunner -job-name-charlie-smartgunner = Charlie Smartgunner -job-name-delta-smartgunner = Delta Smartgunner - -job-name-alpha-hospitalcorpsman = Alpha Hospital Corpsman -job-name-bravo-hospitalcorpsman = Bravo Hospital Corpsman -job-name-charlie-hospitalcorpsman = Charlie Hospital Corpsman -job-name-delta-hospitalcorpsman = Delta Hospital Corpsman - -job-name-alpha-combattech = Alpha Combat Technician -job-name-bravo-combattech = Bravo Combat Technician -job-name-charlie-combattech = Charlie Combat Technician -job-name-delta-combattech = Delta Combat Technician - - -# descriptions # - -# command -job-description-seniorenlistedadvisor = 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-squadleader = 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-fireteamleader = Follow the squad leader's orders and command your fireteam. Co-ordinate with CAS and fire support elements. -job-description-weaponsspecialist = 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-hospitalcorpsman = 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-combattech = Build or remove fortifications. Establish and maintain FOB and Power. Gain access to blocked off areas. - - -# Role timers (translation) # - -# command -jobseniorenlistedadvisor = Senior Enlisted Advisor - -# marines -jobrifleman = Rifleman -jobsquadleader = Squad Leader -jobfireteamleader = Fireteam Leader -jobweaponsspecialist = Weapons Specialist -jobsmartgunner = Smartgunner -jobhospitalcorpsman = Hospital Corpsman -jobcombattech = Combat Technician \ No newline at end of file diff --git a/Resources/Locale/en-US/CM14/CM-job-supervisors.ftl b/Resources/Locale/en-US/CM14/CM-job-supervisors.ftl deleted file mode 100644 index adfdf4454fec05..00000000000000 --- a/Resources/Locale/en-US/CM14/CM-job-supervisors.ftl +++ /dev/null @@ -1,20 +0,0 @@ -# job-supervisors-centcom = CentCom official -# job-supervisors-captain = the captain -# job-supervisors-hop = the head of personnel -# job-supervisors-hos = the head of security -# job-supervisors-ce = the chief engineer -# job-supervisors-cmo = the chief medical officer -# job-supervisors-rd = the research director -# job-supervisors-qm = the quartermaster -# job-supervisors-service = chefs, botanists, the bartender, and the head of personnel -# job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer -# job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer -# job-supervisors-security = security officers, the senior officer, the warden, and the head of security -# job-supervisors-science = scientists, the senior researcher, and the research director -# job-supervisors-hire = whoever hires you -# job-supervisors-everyone = absolutely everyone - -job-supervisors-squadleader = the Squad Leader -job-supervisors-command = command staff -job-supervisors-executiveofficer = the Executive Officer -job-supervisors-commandingofficer = the Commanding Officer \ No newline at end of file diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 0c97f91ef197c4..508a0459cf60c0 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Command/SeniorEnlistedAdvisor.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Command/senior_enlisted_advisor.yml similarity index 69% rename from Resources/Prototypes/CM14/Roles/Jobs/Command/SeniorEnlistedAdvisor.yml rename to Resources/Prototypes/.CM14/Roles/Jobs/Command/senior_enlisted_advisor.yml index 4c95cf9ef3962b..add15c6a9de6ad 100644 --- a/Resources/Prototypes/CM14/Roles/Jobs/Command/SeniorEnlistedAdvisor.yml +++ b/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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/combat_tech.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/combat_tech.yml new file mode 100644 index 00000000000000..be2befe7d854ec --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/fireteam_leader.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/fireteam_leader.yml new file mode 100644 index 00000000000000..9cf90704df0022 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/hospital_corpsman.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/hospital_corpsman.yml new file mode 100644 index 00000000000000..0e92415dce5700 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/rifleman.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/rifleman.yml new file mode 100644 index 00000000000000..66b5121dc73ac7 --- /dev/null +++ b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/rifleman.yml @@ -0,0 +1,32 @@ +- type: job + id: Rifleman + name: job-name-rifleman + description: job-description-rifleman + playTimeTracker: JobRifleman + startingGear: RiflemanGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-squad-leader + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + +- type: startingGear + id: RiflemanGear + 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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/smart_gunner.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/smart_gunner.yml new file mode 100644 index 00000000000000..5c887ae00d23ff --- /dev/null +++ b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/smart_gunner.yml @@ -0,0 +1,36 @@ +- type: job + id: Smartgunner + name: job-name-smartgunner + description: job-description-smartgunner + playTimeTracker: JobSmartgunner + requirements: + - !type:DepartmentTimeRequirement + department: Marine + time: 18000 #5 hrs + startingGear: SmartgunnerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-squad-leader + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + +- type: startingGear + id: SmartgunnerGear + 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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/squad_leader.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/squad_leader.yml new file mode 100644 index 00000000000000..09929e3a48904f --- /dev/null +++ b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/squad_leader.yml @@ -0,0 +1,39 @@ +- type: job + id: SquadLeader + name: job-name-squad-leader + description: job-description-squad-leader + playTimeTracker: JobSquadLeader + requirements: + - !type:DepartmentTimeRequirement + department: Marine + time: 36000 #10 hrs + - !type:RoleTimeRequirement + role: JobFireteamLeader + time: 10800 #3 hrs + startingGear: SquadLeaderGear + icon: "JobIconCaptain" + supervisors: job-supervisors-command + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + +- type: startingGear + id: SquadLeaderGear + 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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/Marines/weapons_specialist.yml b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/weapons_specialist.yml new file mode 100644 index 00000000000000..b1ed25a59a3de4 --- /dev/null +++ b/Resources/Prototypes/.CM14/Roles/Jobs/Marines/weapons_specialist.yml @@ -0,0 +1,36 @@ +- type: job + id: WeaponsSpecialist + name: job-name-weapons-specialist + description: job-description-weapons-specialist + playTimeTracker: JobWeaponsSpecialist + requirements: + - !type:DepartmentTimeRequirement + department: Marine + time: 18000 #5 hrs + startingGear: WeaponsSpecialistGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-squad-leader + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + +- type: startingGear + id: WeaponsSpecialistGear + 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 diff --git a/Resources/Prototypes/.CM14/Roles/Jobs/departments.yml b/Resources/Prototypes/.CM14/Roles/Jobs/departments.yml new file mode 100644 index 00000000000000..41f031e7d8bf80 --- /dev/null +++ b/Resources/Prototypes/.CM14/Roles/Jobs/departments.yml @@ -0,0 +1,47 @@ +- type: department + id: MarineCommand + description: department-MarineCommand-description + color: "#334E6D" + roles: + - JobSeniorEnlistedAdvisor + +- type: department + id: MilitaryPolice + description: department-MilitaryPolice-description + color: "#DE3A3A" + roles: + - JobSeniorEnlistedAdvisor + +- type: department + id: Marine + description: department-Marine-description + color: "#DE3A3A" + roles: + - Rifleman + - SquadLeader + - FireteamLeader + - WeaponsSpecialist + - Smartgunner + - HospitalCorpsman + - CombatTech + + +#- type: department +# id: marine-alpha +# description: department-marine-description +# color: "#FF747E" +# +#- type: department +# id: marine-bravo +# description: department-marine-description +# color: "#A46106" +# +#- type: department +# id: marine-charlie +# description: department-marine-description +# color: "#D381C9" +# +#- type: department +# id: marine-delta +# description: department-marine-description +# color: "#334E6D" diff --git a/Resources/Prototypes/CM14/CM-play_time_trackers.yml b/Resources/Prototypes/.CM14/play_time_trackers.yml similarity index 58% rename from Resources/Prototypes/CM14/CM-play_time_trackers.yml rename to Resources/Prototypes/.CM14/play_time_trackers.yml index e2ba90524954c4..f81f227e62a51b 100644 --- a/Resources/Prototypes/CM14/CM-play_time_trackers.yml +++ b/Resources/Prototypes/.CM14/play_time_trackers.yml @@ -2,27 +2,27 @@ # command - type: playTimeTracker - id: jobseniorenlistedadvisor + id: JobSeniorEnlistedAdvisor # marine - type: playTimeTracker - id: jobrifleman - + id: JobRifleman + - type: playTimeTracker - id: jobsquadleader + id: JobSquadLeader - type: playTimeTracker - id: jobfireteamleader - + id: JobFireteamLeader + - type: playTimeTracker - id: jobweaponsspecialist - + id: JobWeaponsSpecialist + - type: playTimeTracker - id: jobsmartgunner + id: JobSmartgunner - type: playTimeTracker - id: hospitalcorpsman - + id: JobHospitalCorpsman + - type: playTimeTracker - id: combattech + id: JobCombatTech diff --git a/Resources/Prototypes/CM14/Roles/Jobs/CM-departments.yml b/Resources/Prototypes/CM14/Roles/Jobs/CM-departments.yml deleted file mode 100644 index 42ad3761beb74a..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/CM-departments.yml +++ /dev/null @@ -1,146 +0,0 @@ -# - type: department - # id: Cargo - # description: department-Cargo-description - # color: "#A46106" - - -# fallback -- type: department - id: Civilian - description: department-Civilian-description - color: "#9FED58" - roles: - - Passenger - - Captain - - -- type: department - id: command - description: department-command-description - color: "#334E6D" - roles: - - seniorenlistedadvisor - -# - type: department - # id: Engineering - # description: department-Engineering-description - # color: "#EFB341" - - -# - type: department - # id: Medical - # description: department-Medical-description - # color: "#52B4E9" - - -# - type: department - # id: Security - # description: department-Security-description - # color: "#DE3A3A" - - -# - type: department - # id: Science - # description: department-Science-description - # color: "#D381C9" - - -# - type: department - # id: Specific - # description: department-Specific-description - # color: "#9FED58" - -- type: department - id: marine - description: department-marine-description - color: "#DE3A3A" - roles: - # - rifleman - # - squadleader - # - fireteamleader - # - weaponsspecialist - # - smartgunner - # - hospitalcorpsman - # - combattech - - alpharifleman - - alphasquadleader - - alphafireteamleader - - alphaweaponsspecialist - - alphasmartgunner - - alphahospitalcorpsman - - alphacombattech - - bravorifleman - - bravosquadleader - - bravofireteamleader - - bravoweaponsspecialist - - bravosmartgunner - - bravohospitalcorpsman - - bravocombattech - - charlierifleman - - charliesquadleader - - charliefireteamleader - - charlieweaponsspecialist - - charliesmartgunner - - charliehospitalcorpsman - - charliecombattech - - deltarifleman - - deltasquadleader - - deltafireteamleader - - deltaweaponsspecialist - - deltasmartgunner - - deltahospitalcorpsman - - deltacombattech - -- type: department - id: marine-alpha - description: department-marine-description - color: "#DE3A3A" - roles: - - alpharifleman - - alphasquadleader - - alphafireteamleader - - alphaweaponsspecialist - - alphasmartgunner - - alphahospitalcorpsman - - alphacombattech - -- type: department - id: marine-bravo - description: department-marine-description - color: "#A46106" - roles: - - bravorifleman - - bravosquadleader - - bravofireteamleader - - bravoweaponsspecialist - - bravosmartgunner - - bravohospitalcorpsman - - bravocombattech - -- type: department - id: marine-charlie - description: department-marine-description - color: "#D381C9" - roles: - - charlierifleman - - charliesquadleader - - charliefireteamleader - - charlieweaponsspecialist - - charliesmartgunner - - charliehospitalcorpsman - - charliecombattech - -- type: department - id: marine-delta - description: department-marine-description - color: "#334E6D" - roles: - - deltarifleman - - deltasquadleader - - deltafireteamleader - - deltaweaponsspecialist - - deltasmartgunner - - deltahospitalcorpsman - - deltacombattech - - diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/CombatTechnician.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/CombatTechnician.yml deleted file mode 100644 index d236221ba752ff..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/CombatTechnician.yml +++ /dev/null @@ -1,116 +0,0 @@ -# - type: job - # id: combattech - # name: job-name-combattech - # description: job-description-combattech - # playTimeTracker: combattech - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 3600 #1 hrs - # startingGear: combattechgear - # icon: "JobIconStationEngineer" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphacombattech - name: job-name-alpha-combattech - description: job-description-combattech - playTimeTracker: combattech - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - startingGear: combattechgear - icon: "JobIconStationEngineer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravocombattech - name: job-name-bravo-combattech - description: job-description-combattech - playTimeTracker: combattech - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - startingGear: combattechgear - icon: "JobIconStationEngineer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charliecombattech - name: job-name-charlie-combattech - description: job-description-combattech - playTimeTracker: combattech - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - startingGear: combattechgear - icon: "JobIconStationEngineer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltacombattech - name: job-name-delta-combattech - description: job-description-combattech - playTimeTracker: combattech - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - startingGear: combattechgear - icon: "JobIconStationEngineer" - supervisors: job-supervisors-squadleader - 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/FireteamLeader.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/FireteamLeader.yml deleted file mode 100644 index 635ab2337ed914..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/FireteamLeader.yml +++ /dev/null @@ -1,116 +0,0 @@ -# - type: job - # id: fireteamleader - # name: job-name-fireteamleader - # description: job-description-fireteamleader - # playTimeTracker: jobfireteamleader - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 28800 #8 hrs - # startingGear: fireteamleadergear - # icon: "JobIconSecurityOfficer" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphafireteamleader - name: job-name-alpha-fireteamleader - description: job-description-fireteamleader - playTimeTracker: jobfireteamleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 28800 #8 hrs - startingGear: fireteamleadergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravofireteamleader - name: job-name-bravo-fireteamleader - description: job-description-fireteamleader - playTimeTracker: jobfireteamleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 28800 #8 hrs - startingGear: fireteamleadergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charliefireteamleader - name: job-name-charlie-fireteamleader - description: job-description-fireteamleader - playTimeTracker: jobfireteamleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 28800 #8 hrs - startingGear: fireteamleadergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltafireteamleader - name: job-name-delta-fireteamleader - description: job-description-fireteamleader - playTimeTracker: jobfireteamleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 28800 #8 hrs - startingGear: fireteamleadergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/HospitalCorpsman.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/HospitalCorpsman.yml deleted file mode 100644 index 7d429a18776b26..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/HospitalCorpsman.yml +++ /dev/null @@ -1,141 +0,0 @@ -# - type: job - # id: hospitalcorpsman - # name: job-name-hospitalcorpsman - # description: job-description-hospitalcorpsman - # playTimeTracker: hospitalcorpsman - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 3600 #1 hrs - # - !type:DepartmentTimeRequirement - # department: Medical - # time: 3600 #1 hrs - # startingGear: hospitalcorpsmangear - # icon: "JobIconBrigmedic" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphahospitalcorpsman - name: job-name-alpha-hospitalcorpsman - description: job-description-hospitalcorpsman - playTimeTracker: hospitalcorpsman - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 3600 #1 hrs - startingGear: hospitalcorpsmangear - icon: "JobIconBrigmedic" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravohospitalcorpsman - name: job-name-bravo-hospitalcorpsman - description: job-description-hospitalcorpsman - playTimeTracker: hospitalcorpsman - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 3600 #1 hrs - startingGear: hospitalcorpsmangear - icon: "JobIconBrigmedic" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charliehospitalcorpsman - name: job-name-charlie-hospitalcorpsman - description: job-description-hospitalcorpsman - playTimeTracker: hospitalcorpsman - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 3600 #1 hrs - startingGear: hospitalcorpsmangear - icon: "JobIconBrigmedic" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltahospitalcorpsman - name: job-name-delta-hospitalcorpsman - description: job-description-hospitalcorpsman - playTimeTracker: hospitalcorpsman - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 3600 #1 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 3600 #1 hrs - startingGear: hospitalcorpsmangear - icon: "JobIconBrigmedic" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/JobRifleman.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/JobRifleman.yml deleted file mode 100644 index 3e823f65176e3d..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/JobRifleman.yml +++ /dev/null @@ -1,96 +0,0 @@ -# - type: job - # id: rifleman - # name: job-name-rifleman - # description: job-description-rifleman - # playTimeTracker: jobrifleman - # startingGear: riflemangear - # icon: "JobIconSecurityOfficer" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alpharifleman - name: job-name-alpha-rifleman - description: job-description-rifleman - playTimeTracker: jobrifleman - startingGear: riflemangear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravorifleman - name: job-name-bravo-rifleman - description: job-description-rifleman - playTimeTracker: jobrifleman - startingGear: riflemangear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charlierifleman - name: job-name-charlie-rifleman - description: job-description-rifleman - playTimeTracker: jobrifleman - startingGear: riflemangear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltarifleman - name: job-name-delta-rifleman - description: job-description-rifleman - playTimeTracker: jobrifleman - startingGear: riflemangear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: startingGear - id: riflemangear - 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/Smartgunner.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/Smartgunner.yml deleted file mode 100644 index c983b805053706..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/Smartgunner.yml +++ /dev/null @@ -1,116 +0,0 @@ -# - type: job - # id: smartgunner - # name: job-name-smartgunner - # description: job-description-smartgunner - # playTimeTracker: jobsmartgunner - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 18000 #5 hrs - # startingGear: smartgunnergear - # icon: "JobIconSecurityOfficer" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphasmartgunner - name: job-name-alpha-smartgunner - description: job-description-smartgunner - playTimeTracker: jobsmartgunner - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: smartgunnergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravosmartgunner - name: job-name-bravo-smartgunner - description: job-description-smartgunner - playTimeTracker: jobsmartgunner - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: smartgunnergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charliesmartgunner - name: job-name-charlie-smartgunner - description: job-description-smartgunner - playTimeTracker: jobsmartgunner - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: smartgunnergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltasmartgunner - name: job-name-delta-smartgunner - description: job-description-smartgunner - playTimeTracker: jobsmartgunner - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: smartgunnergear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: startingGear - id: smartgunnergear - 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/SquadLeader.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/SquadLeader.yml deleted file mode 100644 index e0f28021df02f7..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/SquadLeader.yml +++ /dev/null @@ -1,131 +0,0 @@ -# - type: job - # id: squadleader - # name: job-name-squadleader - # description: job-description-squadleader - # playTimeTracker: jobsquadleader - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 36000 #10 hrs - # - !type:RoleTimeRequirement - # role: JobAtmosphericTechnician # replace this with fireteam leader - # time: 10800 #3 hrs - # startingGear: squadleadergear - # icon: "JobIconCaptain" - # supervisors: job-supervisors-command - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphasquadleader - name: job-name-alpha-squadleader - description: job-description-squadleader - playTimeTracker: jobsquadleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 36000 #10 hrs - - !type:RoleTimeRequirement - role: fireteamleader - time: 10800 #3 hrs - startingGear: squadleadergear - icon: "JobIconCaptain" - supervisors: job-supervisors-command - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravosquadleader - name: job-name-bravo-squadleader - description: job-description-squadleader - playTimeTracker: jobsquadleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 36000 #10 hrs - - !type:RoleTimeRequirement - role: fireteamleader - time: 10800 #3 hrs - startingGear: squadleadergear - icon: "JobIconCaptain" - supervisors: job-supervisors-command - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charliesquadleader - name: job-name-charlie-squadleader - description: job-description-squadleader - playTimeTracker: jobsquadleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 36000 #10 hrs - - !type:RoleTimeRequirement - role: fireteamleader - time: 10800 #3 hrs - startingGear: squadleadergear - icon: "JobIconCaptain" - supervisors: job-supervisors-command - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltasquadleader - name: job-name-delta-squadleader - description: job-description-squadleader - playTimeTracker: jobsquadleader - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 36000 #10 hrs - - !type:RoleTimeRequirement - role: fireteamleader - time: 10800 #3 hrs - startingGear: squadleadergear - icon: "JobIconCaptain" - supervisors: job-supervisors-command - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: startingGear - id: squadleadergear - 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 diff --git a/Resources/Prototypes/CM14/Roles/Jobs/Marines/WeaponsSpecialist.yml b/Resources/Prototypes/CM14/Roles/Jobs/Marines/WeaponsSpecialist.yml deleted file mode 100644 index 2fb0650d50af70..00000000000000 --- a/Resources/Prototypes/CM14/Roles/Jobs/Marines/WeaponsSpecialist.yml +++ /dev/null @@ -1,116 +0,0 @@ -# - type: job - # id: weaponsspecialist - # name: job-name-weaponsspecialist - # description: job-description-weaponsspecialist - # playTimeTracker: jobweaponspecialist - # requirements: - # - !type:DepartmentTimeRequirement - # department: Marine - # time: 18000 #5 hrs - # startingGear: weaponsspecialistgear - # icon: "JobIconSecurityOfficer" - # supervisors: job-supervisors-squadleader - # canBeAntag: false - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - -- type: job - id: alphaweaponsspecialist - name: job-name-alpha-weaponsspecialist - description: job-description-weaponsspecialist - playTimeTracker: jobweaponspecialist - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: weaponsspecialistgear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: bravoweaponsspecialist - name: job-name-bravo-weaponsspecialist - description: job-description-weaponsspecialist - playTimeTracker: jobweaponspecialist - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: weaponsspecialistgear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: charlieweaponsspecialist - name: job-name-charlie-weaponsspecialist - description: job-description-weaponsspecialist - playTimeTracker: jobweaponspecialist - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: weaponsspecialistgear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: job - id: deltaweaponsspecialist - name: job-name-delta-weaponsspecialist - description: job-description-weaponsspecialist - playTimeTracker: jobweaponspecialist - requirements: - - !type:DepartmentTimeRequirement - department: Marine - time: 18000 #5 hrs - startingGear: weaponsspecialistgear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-squadleader - canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - -- type: startingGear - id: weaponsspecialistgear - 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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6e64d82b0cb934..70cc6790f4ea3c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,101 +1,101 @@ -# - type: department - # id: Cargo - # description: department-Cargo-description - # color: "#A46106" - # roles: - # - CargoTechnician - # - Quartermaster - # - SalvageSpecialist + - type: department + id: Cargo + description: department-Cargo-description + color: "#A46106" + roles: + - CargoTechnician + - Quartermaster + - SalvageSpecialist -# - type: department - # id: Civilian - # description: department-Civilian-description - # color: "#9FED58" - # roles: - # - Bartender - # - Botanist - # - Borg - # - Boxer - # - Chaplain - # - Chef - # - Clown - # - HeadOfPersonnel - # - Janitor - # - Lawyer - # - Librarian - # - Mime - # - Musician - # - Passenger - # - Reporter - # - Zookeeper - # - ServiceWorker + - type: department + id: Civilian + description: department-Civilian-description + color: "#9FED58" + roles: + - Bartender + - Botanist + - Borg + - Boxer + - Chaplain + - Chef + - Clown + - HeadOfPersonnel + - Janitor + - Lawyer + - Librarian + - Mime + - Musician + - Passenger + - Reporter + - Zookeeper + - ServiceWorker -# - type: department - # id: Command - # description: department-Command-description - # color: "#334E6D" - # roles: - # - Captain - # - CentralCommandOfficial - # - ChiefEngineer - # - ChiefMedicalOfficer - # - HeadOfPersonnel - # - HeadOfSecurity - # - ResearchDirector - # - Quartermaster + - type: department + id: Command + description: department-Command-description + color: "#334E6D" + roles: + - Captain + - CentralCommandOfficial + - ChiefEngineer + - ChiefMedicalOfficer + - HeadOfPersonnel + - HeadOfSecurity + - ResearchDirector + - Quartermaster -# - type: department - # id: Engineering - # description: department-Engineering-description - # color: "#EFB341" - # roles: - # - AtmosphericTechnician - # - ChiefEngineer - # - SeniorEngineer - # - StationEngineer - # - TechnicalAssistant + - type: department + id: Engineering + description: department-Engineering-description + color: "#EFB341" + roles: + - AtmosphericTechnician + - ChiefEngineer + - SeniorEngineer + - StationEngineer + - TechnicalAssistant -# - type: department - # id: Medical - # description: department-Medical-description - # color: "#52B4E9" - # roles: - # - Chemist - # - ChiefMedicalOfficer - # - MedicalDoctor - # - MedicalIntern - # - Psychologist - # - Paramedic - # - SeniorPhysician + - type: department + id: Medical + description: department-Medical-description + color: "#52B4E9" + roles: + - Chemist + - ChiefMedicalOfficer + - MedicalDoctor + - MedicalIntern + - Psychologist + - Paramedic + - SeniorPhysician -# - type: department - # id: Security - # description: department-Security-description - # color: "#DE3A3A" - # roles: - # - HeadOfSecurity - # - SecurityCadet - # - SecurityOfficer - # - SeniorOfficer - # - Detective - # - Warden + - type: department + id: Security + description: department-Security-description + color: "#DE3A3A" + roles: + - HeadOfSecurity + - SecurityCadet + - SecurityOfficer + - SeniorOfficer + - Detective + - Warden -# - type: department - # id: Science - # description: department-Science-description - # color: "#D381C9" - # roles: - # - ResearchDirector - # - SeniorResearcher - # - Scientist - # - ResearchAssistant + - type: department + id: Science + description: department-Science-description + color: "#D381C9" + roles: + - ResearchDirector + - SeniorResearcher + - Scientist + - ResearchAssistant -# - type: department - # id: Specific - # description: department-Specific-description - # color: "#9FED58" - # roles: - # - Boxer - # - Reporter - # - Zookeeper - # - Psychologist + - type: department + id: Specific + description: department-Specific-description + color: "#9FED58" + roles: + - Boxer + - Reporter + - Zookeeper + - Psychologist