From bcd8b4d6dbce8fb6555d2ff53f5259033e790f34 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:04:54 +0100 Subject: [PATCH] lying in the bed i made --- Resources/Locale/en-US/job/department.ftl | 5 + .../prison_chef.yml => Civilian/chef.yml} | 0 .../Loadouts/Jobs/Command/captain.yml | 130 ++++++++ .../Jobs/{ => SP14}/Inmate/gardener.yml | 0 .../Loadouts/Jobs/SP14/Inmate/prison_chef.yml | 66 ++++ .../Jobs/{ => SP14}/Inmate/prisoner.yml | 0 .../Maintenance/atmospheric_specialist.yml | 0 .../Maintenance/maintenance_engineer.yml | 0 .../security}/chief-custodial-officer.yml | 0 .../SP14 => SP14/security}/inspector.yml | 0 .../SP14 => SP14/security}/prison_officer.yml | 0 .../security}/probationary_prison_officer.yml | 0 .../Prototypes/Loadouts/role_loadouts.yml | 309 ------------------ .../Loadouts/sp14_role_loadouts.yml | 308 +++++++++++++++++ .../Prototypes/Roles/Jobs/Civilian/chef.yml | 30 ++ .../Engineering => Civilian}/janitor.yml | 6 +- .../Jobs/{Depriciated => Command}/captain.yml | 3 +- .../Engineering/atmospheric_technician.yml | 6 +- .../Engineering/chief_engineer.yml | 3 +- .../Engineering/station_engineer.yml | 6 +- .../Engineering/technical_assistant.yml | 6 +- .../Guards/chief-custodial-officer.yml | 0 .../Jobs/{ => SP14}/Guards/inspector.yml | 0 .../Jobs/{ => SP14}/Guards/prison_officer.yml | 0 .../Jobs/{ => SP14}/Guards/rookie_officer.yml | 0 .../Jobs/{ => SP14}/Guards/sp-warden.yml | 0 .../Jobs/{ => SP14}/Infirmary/chemist.yml | 0 .../{ => SP14}/Infirmary/infirmary_doctor.yml | 0 .../{ => SP14}/Infirmary/medical_director.yml | 0 .../{ => SP14}/Infirmary/psychologist.yml | 0 .../Roles/Jobs/{ => SP14}/Inmate/gardener.yml | 0 .../Jobs/{ => SP14}/Inmate/prison_chef.yml | 0 .../Roles/Jobs/{ => SP14}/Inmate/prisoner.yml | 0 .../Maintenance/atmospheric_specialist.yml | 0 .../Maintenance/head_of_maintenance.yml | 0 .../Maintenance/maintenance_engineer.yml | 0 .../Maintenance/maintenance_worker.yml | 0 .../Jobs/{ => SP14}/Maintenance/sp-borg.yml | 0 .../SPCargo/sp_cargo_technician.yml | 0 .../{ => SP14}/SPCargo/sp_quartermaster.yml | 0 .../{ => SP14}/SPCivilian/sp-chaplain.yml | 0 .../Jobs/{ => SP14}/SPCivilian/sp-clown.yml | 0 .../{ => SP14}/SPCivilian/sp-reporter.yml | 0 .../{ => SP14}/SPCommand/welfare_officer.yml | 0 .../Roles/Jobs/SP14/sp14_departments.yml | 78 +++++ .../Roles/Jobs/{Civilian => Science}/borg.yml | 0 .../research_assistant.yml | 6 +- .../research_director.yml | 3 +- .../{Depriciated => Science}/scientist.yml | 6 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 38 +++ .../Jobs/{Depriciated => Wildcards}/boxer.yml | 6 +- .../Roles/Jobs/Wildcards/psychologist.yml | 24 ++ .../Roles/Jobs/Wildcards/reporter.yml | 21 ++ .../{Depriciated => Wildcards}/zookeeper.yml | 6 +- .../Prototypes/Roles/Jobs/departments.yml | 124 ++++--- 55 files changed, 809 insertions(+), 381 deletions(-) rename Resources/Prototypes/Loadouts/Jobs/{Inmate/prison_chef.yml => Civilian/chef.yml} (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Command/captain.yml rename Resources/Prototypes/Loadouts/Jobs/{ => SP14}/Inmate/gardener.yml (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml rename Resources/Prototypes/Loadouts/Jobs/{ => SP14}/Inmate/prisoner.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{ => SP14}/Maintenance/atmospheric_specialist.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{ => SP14}/Maintenance/maintenance_engineer.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Security/SP14 => SP14/security}/chief-custodial-officer.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Security/SP14 => SP14/security}/inspector.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Security/SP14 => SP14/security}/prison_officer.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Security/SP14 => SP14/security}/probationary_prison_officer.yml (100%) create mode 100644 Resources/Prototypes/Loadouts/sp14_role_loadouts.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/chef.yml rename Resources/Prototypes/Roles/Jobs/{Depriciated/Engineering => Civilian}/janitor.yml (95%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => Command}/captain.yml (96%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => }/Engineering/atmospheric_technician.yml (92%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => }/Engineering/chief_engineer.yml (96%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => }/Engineering/station_engineer.yml (92%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => }/Engineering/technical_assistant.yml (94%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Guards/chief-custodial-officer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Guards/inspector.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Guards/prison_officer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Guards/rookie_officer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Guards/sp-warden.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Infirmary/chemist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Infirmary/infirmary_doctor.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Infirmary/medical_director.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Infirmary/psychologist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Inmate/gardener.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Inmate/prison_chef.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Inmate/prisoner.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Maintenance/atmospheric_specialist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Maintenance/head_of_maintenance.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Maintenance/maintenance_engineer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Maintenance/maintenance_worker.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/Maintenance/sp-borg.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCargo/sp_cargo_technician.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCargo/sp_quartermaster.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCivilian/sp-chaplain.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCivilian/sp-clown.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCivilian/sp-reporter.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => SP14}/SPCommand/welfare_officer.yml (100%) create mode 100644 Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml rename Resources/Prototypes/Roles/Jobs/{Civilian => Science}/borg.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => Science}/research_assistant.yml (94%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => Science}/research_director.yml (96%) rename Resources/Prototypes/Roles/Jobs/{Depriciated => Science}/scientist.yml (92%) create mode 100644 Resources/Prototypes/Roles/Jobs/Security/warden.yml rename Resources/Prototypes/Roles/Jobs/{Depriciated => Wildcards}/boxer.yml (91%) create mode 100644 Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml rename Resources/Prototypes/Roles/Jobs/{Depriciated => Wildcards}/zookeeper.yml (92%) diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 1d4c574cee..a3d8dbcffc 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -5,5 +5,10 @@ department-Medical = Medical department-Security = Security #PS14 +department-SPCargo = Cargo +department-SPCommand = Command +department-SPCivilian = Civilian +department-SPMedical = Medical +department-SPSecurity = Security department-Inmate = Inmate department-Maintenance = Maintenance \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/prison_chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/prison_chef.yml rename to Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml new file mode 100644 index 0000000000..50786d6154 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -0,0 +1,130 @@ +# Jumpsuit +- type: loadout + id: CaptainJumpsuit + equipment: CaptainJumpsuit + +- type: startingGear + id: CaptainJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitCaptain + +- type: loadout + id: CaptainJumpskirt + equipment: CaptainJumpskirt + +- type: startingGear + id: CaptainJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtCaptain + +- type: loadout + id: CaptainFormalSuit + equipment: CaptainFormalSuit + +- type: startingGear + id: CaptainFormalSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCapFormal + +- type: loadout + id: CaptainFormalSkirt + equipment: CaptainFormalSkirt + +- type: startingGear + id: CaptainFormalSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCapFormalDress + +# Head +- type: loadout + id: CaptainHead + equipment: CaptainHead + +- type: startingGear + id: CaptainHead + equipment: + head: ClothingHeadHatCaptain + +- type: loadout + id: CaptainCap + equipment: CaptainCap + +- type: startingGear + id: CaptainCap + equipment: + head: ClothingHeadHatCapcap + +# Neck +- type: loadout + id: CaptainCloak + equipment: CaptainCloak + +- type: startingGear + id: CaptainCloak + equipment: + neck: ClothingNeckCloakCap + +- type: loadout + id: CaptainCloakFormal + equipment: CaptainCloakFormal + +- type: startingGear + id: CaptainCloakFormal + equipment: + neck: ClothingNeckCloakCapFormal + +- type: loadout + id: CaptainMantle + equipment: CaptainMantle + +- type: startingGear + id: CaptainMantle + equipment: + neck: ClothingNeckMantleCap + +# Back +- type: loadout + id: CaptainBackpack + equipment: CaptainBackpack + +- type: startingGear + id: CaptainBackpack + equipment: + back: ClothingBackpackCaptain + +- type: loadout + id: CaptainSatchel + equipment: CaptainSatchel + +- type: startingGear + id: CaptainSatchel + equipment: + back: ClothingBackpackSatchelCaptain + +- type: loadout + id: CaptainDuffel + equipment: CaptainDuffel + +- type: startingGear + id: CaptainDuffel + equipment: + back: ClothingBackpackDuffelCaptain + +# Outer clothing +- type: loadout + id: CaptainOuterClothing + equipment: CaptainOuterClothing + +- type: startingGear + id: CaptainOuterClothing + equipment: + outerClothing: ClothingOuterArmorCaptainCarapace + +- type: loadout + id: CaptainWintercoat + equipment: CaptainWintercoat + +- type: startingGear + id: CaptainWintercoat + equipment: + outerClothing: ClothingOuterWinterCap \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/gardener.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/gardener.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/gardener.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml new file mode 100644 index 0000000000..5e647acb75 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml @@ -0,0 +1,66 @@ +# Head +- type: loadout + id: ChefHead + equipment: ChefHead + +- type: startingGear + id: ChefHead + equipment: + head: ClothingHeadHatChef + +# Mask +- type: loadout + id: ChefMask + equipment: ChefMask + +- type: startingGear + id: ChefMask + equipment: + mask: ClothingMaskItalianMoustache + +# Jumpsuit +- type: loadout + id: ChefJumpsuit + equipment: ChefJumpsuit + +- type: startingGear + id: ChefJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChef + +- type: loadout + id: ChefJumpskirt + equipment: ChefJumpskirt + +- type: startingGear + id: ChefJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtChef + +# Outer clothing +- type: loadout + id: ChefApron + equipment: ChefApron + +- type: startingGear + id: ChefApron + equipment: + outerClothing: ClothingOuterApronChef + +- type: loadout + id: ChefJacket + equipment: ChefJacket + +- type: startingGear + id: ChefJacket + equipment: + outerClothing: ClothingOuterJacketChef + +- type: loadout + id: ChefWintercoat + equipment: ChefWintercoat + +- type: startingGear + id: ChefWintercoat + equipment: + outerClothing: ClothingOuterWinterChef \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prisoner.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prisoner.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/atmospheric_specialist.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Maintenance/atmospheric_specialist.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/atmospheric_specialist.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Maintenance/maintenance_engineer.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/chief-custodial-officer.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/security/chief-custodial-officer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Security/SP14/chief-custodial-officer.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/security/chief-custodial-officer.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/inspector.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/security/inspector.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Security/SP14/inspector.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/security/inspector.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/prison_officer.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/security/prison_officer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Security/SP14/prison_officer.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/security/prison_officer.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/probationary_prison_officer.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/security/probationary_prison_officer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Security/SP14/probationary_prison_officer.yml rename to Resources/Prototypes/Loadouts/Jobs/SP14/security/probationary_prison_officer.yml diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f6255de627..83dd30f6b7 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -1,32 +1,3 @@ -# SP14 Command -- type: roleLoadout - id: JobSPWarden - groups: - - HeadofSecurityHead - - HeadofSecurityNeck - - HeadofSecurityJumpsuit - - SecurityBackpack - - SecurityBelt - - HeadofSecurityOuterClothing - - SecurityShoes - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - -- type: roleLoadout - id: JobWelfareOfficer - groups: - - GroupTankHarness - - HoPHead - - HoPNeck - - HoPJumpsuit - - HoPBackpack - - HoPOuterClothing - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - # Command - type: roleLoadout id: JobCaptain @@ -54,46 +25,6 @@ - Trinkets - GroupSpeciesBreathTool -# SP14 Civilian -- type: roleLoadout - id: JobSPChaplain - groups: - - GroupTankHarness - - ChaplainHead - - ChaplainMask - - ChaplainNeck - - ChaplainJumpsuit - - CommonBackpack - - ChaplainOuterClothing - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobSPClown - groups: - - GroupTankHarness - - ClownHead - - ClownJumpsuit - - ClownBackpack - - ClownOuterClothing - - ClownShoes - - Glasses - - SurvivalClown - - Trinkets - -- type: roleLoadout - id: JobSPReporter - groups: - - GroupTankHarness - - ReporterJumpsuit - - CommonBackpack - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - # Civilian - type: roleLoadout id: JobPassenger @@ -250,37 +181,6 @@ - Instruments - GroupSpeciesBreathTool -# SP Cargo - -- type: roleLoadout - id: JobSPQuartermaster - groups: - - GroupTankHarness - - QuartermasterHead - - QuartermasterNeck - - QuartermasterJumpsuit - - CargoTechnicianBackpack - - QuartermasterOuterClothing - - QuartermasterShoes - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobSPCargoTechnician - groups: - - GroupTankHarness - - CargoTechnicianHead - - CargoTechnicianJumpsuit - - CargoTechnicianBackpack - - CargoTechnicianOuterClothing - - CargoTechnicianShoes - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - # Cargo - type: roleLoadout id: JobQuartermaster @@ -374,105 +274,6 @@ - Trinkets - GroupSpeciesBreathTool -# SP14 Inmate -- type: roleLoadout - id: JobPrisoner - groups: - - GroupTankHarness - - PrisonerJumpsuit - - CommonBackpack - - PassengerFace - - PassengerGloves - - PassengerOuterClothing - - PassengerShoes - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobPrisonChef - groups: - - GroupTankHarness - - ChefHead - - ChefMask - - PrisonerJumpsuit - - CommonBackpack - - ChefOuterClothing - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobGardener - groups: - - GroupTankHarness - - BotanistHead - - PrisonerJumpsuit - - BotanistBackpack - - BotanistOuterClothing - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - -# SP14 Maintenance -- type: roleLoadout - id: JobHeadOfMaintenance - groups: - - GroupTankHarness - - ChiefEngineerHead - - ChiefEngineerJumpsuit - - StationEngineerBackpack - - ChiefEngineerNeck - - ChiefEngineerOuterClothing - - ChiefEngineerShoes - - SurvivalExtended - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobAtmosphericSpecialist - groups: - - GroupTankHarness - - AtmosphericTechnicianJumpsuit - - AtmosphericTechnicianBackpack - - AtmosphericTechnicianOuterClothing - - AtmosphericTechnicianShoes - - SurvivalExtended - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobMaintenanceEngineer - groups: - - GroupTankHarness - - StationEngineerHead - - StationEngineerJumpsuit - - StationEngineerBackpack - - StationEngineerOuterClothing - - StationEngineerShoes - - StationEngineerID - - SurvivalExtended - - Trinkets - - GroupSpeciesBreathTool - -- type: roleLoadout - id: JobMaintenanceWorker - groups: - - GroupTankHarness - - JanitorHead - - JanitorJumpsuit - - JanitorGloves - - CommonBackpack - - JanitorOuterClothing - - Glasses - - Survival - - Trinkets - - JanitorPlunger - - GroupSpeciesBreathTool - # Science - type: roleLoadout id: JobResearchDirector @@ -518,57 +319,6 @@ - Trinkets - GroupSpeciesBreathTool -# SP14 Security -- type: roleLoadout - id: JobInspector - groups: - - GroupTankHarness - - DetectiveHead - - DetectiveNeck - - DetectiveJumpsuit - - SecurityBackpack - - DetectiveOuterClothing - - SecurityShoes - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - -- type: roleLoadout - id: JobChiefCustodialOfficer - groups: - - WardenHead - - WardenJumpsuit - - SecurityBackpack - - SecurityBelt - - WardenOuterClothing - - SecurityShoes - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - -- type: roleLoadout - id: JobPrisonOfficer - groups: - - SecurityHead - - SecurityJumpsuit - - SecurityBackpack - - SecurityOuterClothing - - SecurityShoes - - SecurityPDA - - SecurityBelt - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - -- type: roleLoadout - id: JobRookieOfficer - groups: - - SecurityCadetJumpsuit - - SecurityBackpack - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - # Security - type: roleLoadout @@ -621,65 +371,6 @@ - Trinkets - GroupSpeciesBreathToolSecurity -# SP14 Medical -- type: roleLoadout - id: JobMedicalDirector - groups: - - GroupTankHarness - - ChiefMedicalOfficerHead - - MedicalMask - - ChiefMedicalOfficerJumpsuit - - MedicalGloves - - MedicalBackpack - - ChiefMedicalOfficerOuterClothing - - ChiefMedicalOfficerNeck - - ChiefMedicalOfficerShoes - - Glasses - - SurvivalMedical - - Trinkets - - GroupSpeciesBreathToolMedical - -- type: roleLoadout - id: JobInfirmaryDoctor - groups: - - GroupTankHarness - - MedicalDoctorHead - - MedicalMask - - MedicalDoctorJumpsuit - - MedicalGloves - - MedicalBackpack - - MedicalDoctorOuterClothing - - MedicalShoes - - MedicalDoctorPDA - - Glasses - - SurvivalMedical - - Trinkets - - GroupSpeciesBreathToolMedical - -- type: roleLoadout - id: JobSPChemist - groups: - - GroupTankHarness - - MedicalMask - - ChemistJumpsuit - - MedicalGloves - - ChemistBackpack - - ChemistOuterClothing - - MedicalShoes - - SurvivalMedical - - Trinkets - - GroupSpeciesBreathToolMedical - -- type: roleLoadout - id: JobSPPsychologist - groups: - - GroupTankHarness - - MedicalBackpack - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - # Medical - type: roleLoadout id: JobChiefMedicalOfficer diff --git a/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml b/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml new file mode 100644 index 0000000000..69f57894ac --- /dev/null +++ b/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml @@ -0,0 +1,308 @@ +# SP14 Command +- type: roleLoadout + id: JobSPWarden + groups: + - HeadofSecurityHead + - HeadofSecurityNeck + - HeadofSecurityJumpsuit + - SecurityBackpack + - SecurityBelt + - HeadofSecurityOuterClothing + - SecurityShoes + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +- type: roleLoadout + id: JobWelfareOfficer + groups: + - GroupTankHarness + - HoPHead + - HoPNeck + - HoPJumpsuit + - HoPBackpack + - HoPOuterClothing + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +# SP14 Civilian +- type: roleLoadout + id: JobSPChaplain + groups: + - GroupTankHarness + - ChaplainHead + - ChaplainMask + - ChaplainNeck + - ChaplainJumpsuit + - CommonBackpack + - ChaplainOuterClothing + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobSPClown + groups: + - GroupTankHarness + - ClownHead + - ClownJumpsuit + - ClownBackpack + - ClownOuterClothing + - ClownShoes + - Glasses + - SurvivalClown + - Trinkets + +- type: roleLoadout + id: JobSPReporter + groups: + - GroupTankHarness + - ReporterJumpsuit + - CommonBackpack + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +# SP Cargo + +- type: roleLoadout + id: JobSPQuartermaster + groups: + - GroupTankHarness + - QuartermasterHead + - QuartermasterNeck + - QuartermasterJumpsuit + - CargoTechnicianBackpack + - QuartermasterOuterClothing + - QuartermasterShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobSPCargoTechnician + groups: + - GroupTankHarness + - CargoTechnicianHead + - CargoTechnicianJumpsuit + - CargoTechnicianBackpack + - CargoTechnicianOuterClothing + - CargoTechnicianShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +# SP14 Inmate +- type: roleLoadout + id: JobPrisoner + groups: + - GroupTankHarness + - PrisonerJumpsuit + - CommonBackpack + - PassengerFace + - PassengerGloves + - PassengerOuterClothing + - PassengerShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobPrisonChef + groups: + - GroupTankHarness + - ChefHead + - ChefMask + - PrisonerJumpsuit + - CommonBackpack + - ChefOuterClothing + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobGardener + groups: + - GroupTankHarness + - BotanistHead + - PrisonerJumpsuit + - BotanistBackpack + - BotanistOuterClothing + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +# SP14 Maintenance +- type: roleLoadout + id: JobHeadOfMaintenance + groups: + - GroupTankHarness + - ChiefEngineerHead + - ChiefEngineerJumpsuit + - StationEngineerBackpack + - ChiefEngineerNeck + - ChiefEngineerOuterClothing + - ChiefEngineerShoes + - SurvivalExtended + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobAtmosphericSpecialist + groups: + - GroupTankHarness + - AtmosphericTechnicianJumpsuit + - AtmosphericTechnicianBackpack + - AtmosphericTechnicianOuterClothing + - AtmosphericTechnicianShoes + - SurvivalExtended + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobMaintenanceEngineer + groups: + - GroupTankHarness + - StationEngineerHead + - StationEngineerJumpsuit + - StationEngineerBackpack + - StationEngineerOuterClothing + - StationEngineerShoes + - StationEngineerID + - SurvivalExtended + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobMaintenanceWorker + groups: + - GroupTankHarness + - JanitorHead + - JanitorJumpsuit + - JanitorGloves + - CommonBackpack + - JanitorOuterClothing + - Glasses + - Survival + - Trinkets + - JanitorPlunger + - GroupSpeciesBreathTool + +# SP14 Security +- type: roleLoadout + id: JobInspector + groups: + - GroupTankHarness + - DetectiveHead + - DetectiveNeck + - DetectiveJumpsuit + - SecurityBackpack + - DetectiveOuterClothing + - SecurityShoes + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +- type: roleLoadout + id: JobChiefCustodialOfficer + groups: + - WardenHead + - WardenJumpsuit + - SecurityBackpack + - SecurityBelt + - WardenOuterClothing + - SecurityShoes + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +- type: roleLoadout + id: JobPrisonOfficer + groups: + - SecurityHead + - SecurityJumpsuit + - SecurityBackpack + - SecurityOuterClothing + - SecurityShoes + - SecurityPDA + - SecurityBelt + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +- type: roleLoadout + id: JobRookieOfficer + groups: + - SecurityCadetJumpsuit + - SecurityBackpack + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +# SP14 Medical +- type: roleLoadout + id: JobMedicalDirector + groups: + - GroupTankHarness + - ChiefMedicalOfficerHead + - MedicalMask + - ChiefMedicalOfficerJumpsuit + - MedicalGloves + - MedicalBackpack + - ChiefMedicalOfficerOuterClothing + - ChiefMedicalOfficerNeck + - ChiefMedicalOfficerShoes + - Glasses + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical + +- type: roleLoadout + id: JobInfirmaryDoctor + groups: + - GroupTankHarness + - MedicalDoctorHead + - MedicalMask + - MedicalDoctorJumpsuit + - MedicalGloves + - MedicalBackpack + - MedicalDoctorOuterClothing + - MedicalShoes + - MedicalDoctorPDA + - Glasses + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical + +- type: roleLoadout + id: JobSPChemist + groups: + - GroupTankHarness + - MedicalMask + - ChemistJumpsuit + - MedicalGloves + - ChemistBackpack + - ChemistOuterClothing + - MedicalShoes + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical + +- type: roleLoadout + id: JobSPPsychologist + groups: + - GroupTankHarness + - MedicalBackpack + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml new file mode 100644 index 0000000000..0d8d1911e5 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -0,0 +1,30 @@ +- type: job + id: Chef + name: job-name-chef + description: job-description-chef + playTimeTracker: JobChef + requirements: + - !type:DepartmentTimeRequirement + department: Civilian + time: 1800 + startingGear: ChefGear + icon: "JobIconChef" + supervisors: job-supervisors-hop + access: + - Service + - Maintenance + - Kitchen + extendedAccess: + - Hydroponics + - Bar + +- type: startingGear + id: ChefGear + equipment: + shoes: ClothingShoesColorBlack + id: ChefPDA + ears: ClothingHeadsetService + belt: ClothingBeltChefFilled + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml similarity index 95% rename from Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/janitor.yml rename to Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index d361348a6e..83fd9ae5d2 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -22,9 +22,9 @@ id: JanitorPDA ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvival - type: startingGear id: JanitorMaidGear diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml similarity index 96% rename from Resources/Prototypes/Roles/Jobs/Depriciated/captain.yml rename to Resources/Prototypes/Roles/Jobs/Command/captain.yml index 79634aa5d9..1e93ff73cc 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -42,5 +42,6 @@ ears: ClothingHeadsetAltCommand storage: back: + - BoxSurvival - Flash - # - StationCharter + # - StationCharter \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml similarity index 92% rename from Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/atmospheric_technician.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 9810b48571..49a8978633 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -23,6 +23,6 @@ id: AtmosPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvivalEngineering \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml similarity index 96% rename from Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/chief_engineer.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 0ee0b6736c..8cc934d634 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -46,4 +46,5 @@ belt: ClothingBeltUtilityEngineering storage: back: - - Flash + - BoxSurvivalEngineering + - Flash \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml similarity index 92% rename from Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/station_engineer.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 0bd81e65e0..1bff9257bb 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -23,6 +23,6 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvivalEngineering \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml similarity index 94% rename from Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/technical_assistant.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index d0d3cfe786..8bbaf2a390 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -27,6 +27,6 @@ belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering pocket2: BookEngineersHandbook - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvivalEngineering \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Guards/inspector.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml diff --git a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/psychologist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Infirmary/psychologist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Roles/Jobs/SP14/Inmate/gardener.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Inmate/gardener.yml diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml b/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prisoner.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Inmate/prisoner.yml diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/atmospheric_specialist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Maintenance/atmospheric_specialist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/head_of_maintenance.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Maintenance/head_of_maintenance.yml diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_engineer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_engineer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/sp-borg.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml rename to Resources/Prototypes/Roles/Jobs/SP14/Maintenance/sp-borg.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_cargo_technician.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_cargo_technician.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-chaplain.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-chaplain.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-clown.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-clown.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-reporter.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCivilian/sp-reporter.yml diff --git a/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml rename to Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml diff --git a/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml b/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml new file mode 100644 index 0000000000..070ad31236 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml @@ -0,0 +1,78 @@ +- type: department + id: SPCivilian + description: department-Civilian-description + color: "#9FED58" + weight: -10 + roles: + - SPChaplain + - SPClown + - WelfareOfficer + - SPReporter + - Visitor + +- type: department + id: SPCommand + description: department-Command-description + color: "#334E6D" + roles: + - SPWarden + - CentralCommandOfficial + - HeadOfMaintenance + - ChiefCustodialOfficer + - MedicalDirector + - WelfareOfficer + - Quartermaster + primary: false + weight: 100 + +- type: department + id: SPCargo + description: department-Cargo-description + color: "#A46106" + roles: + - SPCargoTechnician + - SPQuartermaster + +- type: department + id: Maintenance + weight: 10 + description: department-Maintenance-description + color: "#9FED58" + roles: + - AtmosphericSpecialist + - HeadOfMaintenance + - MaintenanceEngineer + - SPBorg + - MaintenanceWorker + +- type: department + id: Inmate + description: department-Inmate-description + color: "#EFB341" + weight: 20 + roles: + - Prisoner + - PrisonChef + - Gardener + +- type: department + id: SPMedical + weight: 5 + description: department-Medical-description + color: "#52B4E9" + roles: + - SPChemist + - MedicalDirector + - InfirmaryDoctor + - SPPsychologist + +- type: department + id: SPSecurity + description: department-Security-description + color: "#DE3A3A" + weight: 40 + roles: + - ChiefCustodialOfficer + - RookieOfficer + - PrisonOfficer + - Inspector diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/borg.yml rename to Resources/Prototypes/Roles/Jobs/Science/borg.yml diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml similarity index 94% rename from Resources/Prototypes/Roles/Jobs/Depriciated/research_assistant.yml rename to Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index c421c09b8a..aec2dd6fff 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -23,6 +23,6 @@ id: ResearchAssistantPDA ears: ClothingHeadsetScience pocket2: BookScientistsGuidebook - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml similarity index 96% rename from Resources/Prototypes/Roles/Jobs/Depriciated/research_director.yml rename to Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b54ba54b1a..fd6e00a8e3 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -36,4 +36,5 @@ ears: ClothingHeadsetRD storage: back: - - Flash + - BoxSurvival + - Flash \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml similarity index 92% rename from Resources/Prototypes/Roles/Jobs/Depriciated/scientist.yml rename to Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 8bb99eab3c..b2e63fead8 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -18,6 +18,6 @@ id: ScientistGear equipment: ears: ClothingHeadsetScience - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml new file mode 100644 index 0000000000..7f15752576 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -0,0 +1,38 @@ +- type: job + id: Warden + name: job-name-warden + description: job-description-warden + playTimeTracker: JobWarden + requirements: + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 36000 #10 hrs + startingGear: WardenGear + icon: "JobIconWarden" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Armory + - Maintenance + - Service + - External + - Detective + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: WardenGear + equipment: + eyes: ClothingEyesGlassesSecurity + id: WardenPDA + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - BoxSurvivalSecurity + - Flash + - MagazinePistol \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml similarity index 91% rename from Resources/Prototypes/Roles/Jobs/Depriciated/boxer.yml rename to Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index e2f8de9609..aceb7a10f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -17,6 +17,6 @@ ears: ClothingHeadsetService shoes: ClothingShoesColorRed belt: ClothingBeltChampion - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml new file mode 100644 index 0000000000..17bed0ee7f --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -0,0 +1,24 @@ +- type: job + id: Psychologist + name: job-name-psychologist + description: job-description-psychologist + playTimeTracker: JobPsychologist + startingGear: PsychologistGear + icon: "JobIconPsychologist" + supervisors: job-supervisors-cmo + access: + - Medical + - Maintenance + extendedAccess: + - Chemistry + +- type: startingGear + id: PsychologistGear + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + shoes: ClothingShoesLeather + id: PsychologistPDA + ears: ClothingHeadsetMedical + storage: + back: + - BoxSurvivalMedical \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml new file mode 100644 index 0000000000..b379a0ec23 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -0,0 +1,21 @@ +- type: job + id: Reporter + name: job-name-reporter + description: job-description-reporter + playTimeTracker: JobReporter + startingGear: ReporterGear + icon: "JobIconReporter" + supervisors: job-supervisors-hop + access: + - Service + - Maintenance + +- type: startingGear + id: ReporterGear + equipment: + shoes: ClothingShoesColorWhite + id: ReporterPDA + ears: ClothingHeadsetService + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Depriciated/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml similarity index 92% rename from Resources/Prototypes/Roles/Jobs/Depriciated/zookeeper.yml rename to Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 32c98ed487..815ead412c 100644 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -18,6 +18,6 @@ shoes: ClothingShoesColorWhite id: ZookeeperPDA ears: ClothingHeadsetService - #storage: - #back: - #- Stuff + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d6609e34ba..ee058b47b6 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,78 +1,112 @@ +- type: department + id: Cargo + description: department-Cargo-description + color: "#A46106" + roles: + - CargoTechnician + - Quartermaster + - SalvageSpecialist + editorHidden: true + - type: department id: Civilian description: department-Civilian-description color: "#9FED58" weight: -10 roles: - - SPChaplain - - SPClown - - WelfareOfficer - - SPReporter + - Bartender + - Borg + - Botanist + - Boxer + - Chaplain + - Chef + - Clown + - HeadOfPersonnel + - Janitor + - Lawyer + - Librarian + - Mime + - Musician + - Passenger + - Reporter - Visitor + - Zookeeper + - ServiceWorker + editorHidden: true - type: department id: Command description: department-Command-description color: "#334E6D" roles: - - SPWarden + - Captain - CentralCommandOfficial - - HeadOfMaintenance - - ChiefCustodialOfficer - - MedicalDirector - - WelfareOfficer + - ChiefEngineer + - ChiefMedicalOfficer + - HeadOfPersonnel + - HeadOfSecurity + - ResearchDirector - Quartermaster primary: false weight: 100 + editorHidden: true - type: department - id: Cargo - description: department-Cargo-description - color: "#A46106" - roles: - - SPCargoTechnician - - SPQuartermaster - -- type: department - id: Maintenance - weight: 10 - description: department-Maintenance-description - color: "#9FED58" - roles: - - AtmosphericSpecialist - - HeadOfMaintenance - - MaintenanceEngineer - - SPBorg - - MaintenanceWorker - -- type: department - id: Inmate - description: department-Inmate-description + id: Engineering + description: department-Engineering-description color: "#EFB341" - weight: 20 roles: - - Prisoner - - PrisonChef - - Gardener + - AtmosphericTechnician + - ChiefEngineer + - StationEngineer + - TechnicalAssistant + editorHidden: true - type: department id: Medical - weight: 5 description: department-Medical-description color: "#52B4E9" roles: - - SPChemist - - MedicalDirector - - InfirmaryDoctor - - SPPsychologist + - Chemist + - ChiefMedicalOfficer + - MedicalDoctor + - MedicalIntern + - Psychologist + - Paramedic + editorHidden: true - type: department id: Security description: department-Security-description color: "#DE3A3A" - weight: 40 + weight: 20 + roles: + - HeadOfSecurity + - SecurityCadet + - SecurityOfficer + - Detective + - Warden + editorHidden: true + +- type: department + id: Science + description: department-Science-description + color: "#D381C9" roles: - - ChiefCustodialOfficer - - RookieOfficer - - PrisonOfficer - - Inspector + - ResearchDirector + - Scientist + - ResearchAssistant + editorHidden: true + +- type: department + id: Specific + description: department-Specific-description + color: "#9FED58" + weight: 10 + roles: + - Boxer + - Reporter + - Zookeeper + - Psychologist + primary: false + editorHidden: true