From ec83465bdd80a00486e87e0d78fa9696f5a4c3d5 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Mon, 8 Jul 2024 23:34:27 +0100 Subject: [PATCH] cleaned directories, finished adding custom roles, began implimenting sprites (thanks kite) --- .../Locale/en-US/job/department-desc.ftl | 10 +- Resources/Locale/en-US/job/department.ftl | 6 +- .../Locale/en-US/job/job-description.ftl | 8 +- Resources/Locale/en-US/job/job-names.ftl | 42 +++- .../Locale/en-US/job/job-supervisors.ftl | 3 + .../Entities/Markers/Spawners/jobs.yml | 14 ++ .../Jobs/{Inmate => Civilian}/botanist.yml | 0 .../Loadouts/Jobs/Civilian/passenger.yml | 138 ++++++++++++ .../Loadouts/Jobs/Inmate/gardener.yml | 0 .../Jobs/Inmate/{chef.yml => prison_chef.yml} | 0 .../Loadouts/Jobs/Inmate/prisoner.yml | 139 +----------- .../Maintenance/atmospheric_specialist.yml | 0 .../Jobs/Maintenance/maintenance_engineer.yml | 0 .../Security/SP14/chief-custodial-officer.yml | 0 .../Loadouts/Jobs/Security/SP14/inspector.yml | 0 .../Jobs/Security/SP14/prison_officer.yml | 0 .../SP14/probationary_prison_officer.yml | 0 .../Prototypes/Loadouts/role_loadouts.yml | 201 +++++++++++++++++- .../Jobs/{Inmate => Civilian}/botanist.yml | 0 .../Engineering/atmospheric_technician.yml | 0 .../{ => Depriciated}/Engineering/borg.yml | 0 .../Engineering/chief_engineer.yml | 0 .../{ => Depriciated}/Engineering/janitor.yml | 0 .../Engineering/station_engineer.yml | 0 .../Engineering/technical_assistant.yml | 0 .../Jobs/Guards/chief-custodial-officer.yml | 53 +++++ .../Roles/Jobs/Guards/inspector.yml | 36 ++++ .../Roles/Jobs/Guards/prison_officer.yml | 35 +++ .../Jobs/Guards/probationary_officer.yml | 41 ++++ .../warden.yml => Guards/sp-warden.yml} | 8 +- .../Roles/Jobs/Infirmary/chemist.yml | 28 +++ .../Roles/Jobs/Infirmary/infirmary_doctor.yml | 26 +++ .../Roles/Jobs/Infirmary/medical_director.yml | 47 ++++ .../Roles/Jobs/Infirmary/psychologist.yml | 24 +++ .../Prototypes/Roles/Jobs/Inmate/gardener.yml | 26 +++ .../Jobs/Inmate/{chef.yml => prison_chef.yml} | 10 +- .../Prototypes/Roles/Jobs/Inmate/prisoner.yml | 2 +- .../Maintenance/atmospheric_specialist.yml | 29 +++ .../Roles/Jobs/Maintenance/borg.yml | 12 ++ .../Jobs/Maintenance/head_of_maintenance.yml | 49 +++++ .../Jobs/Maintenance/maintenance_engineer.yml | 29 +++ .../Jobs/Maintenance/maintenance_worker.yml | 38 ++++ .../Prototypes/Roles/Jobs/departments.yml | 36 ++-- .../Prototypes/Roles/play_time_trackers.yml | 40 +++- Resources/Prototypes/StatusIcon/job.yml | 43 ++++ .../job_icons.rsi/MaintenanceEngineer.png | Bin 0 -> 152 bytes .../PS14/AtmosphericSpecialist.png | Bin 0 -> 169 bytes .../Misc/job_icons.rsi/PS14/Gardener.png | Bin 0 -> 160 bytes .../PS14/MaintenanceEngineer.png | Bin 0 -> 152 bytes .../Misc/job_icons.rsi/PS14/PrisonChef.png | Bin 0 -> 152 bytes .../Misc/job_icons.rsi/PS14/SPPrisoner.png | Bin 0 -> 150 bytes .../Misc/job_icons.rsi/PS14/SPWarden.png | Bin 0 -> 183 bytes .../Interface/Misc/job_icons.rsi/PS14/cco.png | Bin 0 -> 166 bytes .../Misc/job_icons.rsi/PS14/ps-chaplain.png | Bin 0 -> 157 bytes .../Misc/job_icons.rsi/PS14/ps-lawyer.png | Bin 0 -> 156 bytes .../job_icons.rsi/AtmosphericSpecialist.png | Bin 0 -> 169 bytes .../Misc/sp14/job_icons.rsi/Gardener.png | Bin 0 -> 160 bytes .../job_icons.rsi/MaintenanceEngineer.png | Bin 0 -> 152 bytes .../Misc/sp14/job_icons.rsi/PrisonChef.png | Bin 0 -> 152 bytes .../Misc/sp14/job_icons.rsi/SPPrisoner.png | Bin 0 -> 150 bytes .../Misc/sp14/job_icons.rsi/SPWarden.png | Bin 0 -> 183 bytes .../Interface/Misc/sp14/job_icons.rsi/cco.png | Bin 0 -> 166 bytes .../Misc/sp14/job_icons.rsi/meta.json | 30 +++ .../Misc/sp14/job_icons.rsi/ps-chaplain.png | Bin 0 -> 157 bytes .../Misc/sp14/job_icons.rsi/ps-lawyer.png | Bin 0 -> 156 bytes 65 files changed, 1018 insertions(+), 185 deletions(-) rename Resources/Prototypes/Loadouts/Jobs/{Inmate => Civilian}/botanist.yml (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Inmate/gardener.yml rename Resources/Prototypes/Loadouts/Jobs/Inmate/{chef.yml => prison_chef.yml} (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Maintenance/atmospheric_specialist.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Maintenance/maintenance_engineer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/SP14/chief-custodial-officer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/SP14/inspector.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/SP14/prison_officer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/SP14/probationary_prison_officer.yml rename Resources/Prototypes/Roles/Jobs/{Inmate => Civilian}/botanist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/atmospheric_technician.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/borg.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/chief_engineer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/janitor.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/station_engineer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{ => Depriciated}/Engineering/technical_assistant.yml (100%) create mode 100644 Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Guards/inspector.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml rename Resources/Prototypes/Roles/Jobs/{Command/warden.yml => Guards/sp-warden.yml} (92%) create mode 100644 Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml rename Resources/Prototypes/Roles/Jobs/Inmate/{chef.yml => prison_chef.yml} (75%) create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/AtmosphericSpecialist.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/Gardener.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/MaintenanceEngineer.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/PrisonChef.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPPrisoner.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-chaplain.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-lawyer.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/AtmosphericSpecialist.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/Gardener.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/MaintenanceEngineer.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/PrisonChef.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPPrisoner.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPWarden.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/cco.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/meta.json create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-chaplain.png create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-lawyer.png diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 5299eed015..3b085af53a 100644 --- a/Resources/Locale/en-US/job/department-desc.ftl +++ b/Resources/Locale/en-US/job/department-desc.ftl @@ -1,7 +1,11 @@ department-Cargo-description = Complete bounties, earn Spessos, and order useful supplies for the crew. department-Civilian-description = Perform small helpful tasks to keep the station sane and well catered. department-Command-description = Manage the crew and keep them working efficiently. -department-Maintenance-description = Maintain the stations functionality. -department-Inmate-description = Serve your sentence, work service jobs or plan an escape. +#oops no engineering! +#fuckscience. department-Medical-description = Keep the crew healthy. -department-Security-description = Keep the peace around the station. \ No newline at end of file +department-Security-description = Keep the peace around the station. + +#PS14 +department-Maintenance-description = Maintain the stations functionality. +department-Inmate-description = Serve your sentence, work service jobs or plan an escape. \ 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 7bdb0690b3..1d4c574cee 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -1,7 +1,9 @@ department-Cargo = Cargo department-Civilian = Civilian department-Command = Command -department-Maintenance = Maintenance -department-Inmate = Inmate department-Medical = Medical department-Security = Security + +#PS14 +department-Inmate = Inmate +department-Maintenance = Maintenance \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 757ccc2ec6..48054af8eb 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -33,7 +33,6 @@ job-description-librarian = Manage the library, give out knowledge to any who se job-description-mime = Entertain the crew through non-vocal means, and engage with light rivalry with the clown. job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with. job-description-passenger = Serve your sentence or attempt to stick it to the man! -job-description-prisoner = Serve your sentence, work service jobs or plan an escape. job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon and Origin Stations. job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing. job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments. @@ -46,3 +45,10 @@ job-description-serviceworker = Learn the basics of bartending, cooking, and gro job-description-visitor = Enjoy your visit to the station. job-description-warden = Keep the prison running, delegate work to the other heads of staff, and exert your will. job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Gemini Station. + +#PS14 +job-description-atmospec = Optimize the station's atmospherics setup, and synthesize rare gases to use or sell. +job-description-gardener = Grow food for the chef, drugs for 'medbay', and other plants to keep yourself entertained. +job-description-maintengineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas. +job-description-prisonchef = Keep other inmates fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. +job-description-prisoner = Serve your sentence, work service jobs or plan an escape. \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 7c76d59cf7..17b9b76350 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -16,7 +16,7 @@ job-name-cmo = Chief Medical Officer job-name-chemist = Chemist job-name-technical-assistant = Technical Assistant job-name-engineer = Station Engineer -job-name-atmostech = Atmospheric Specialist +job-name-atmostech = Atmospheric Technician job-name-hop = Head of Personnel job-name-serviceworker = Service Worker job-name-centcomoff = CentCom Official @@ -30,8 +30,7 @@ job-name-janitor = Janitor job-name-chaplain = Chaplain job-name-botanist = Botanist job-name-bartender = Bartender -job-name-passenger = Passenger -job-name-prisoner = Prisoner +job-name-passenger = Prisoner job-name-salvagespec = Salvage specialist job-name-qm = Quartermaster job-name-cargotech = Cargo Technician @@ -47,8 +46,26 @@ job-name-boxer = Boxer job-name-zookeeper = Zookeeper job-name-visitor = Visitor +#PS14 +job-name-sp-warden = Warden +job-name-atmospec = Atmospheric Specialist +job-name-sp-chemist = Chemist +job-name-sp-psychologist = Psychologist +job-name-cco = Chief Custodial Officer +job-name-gardener = Prison Gardener +job-name-hom = Head of Maintenance +job-name-infirmary-doctor = Infirmary Doctor +job-name-inspector = Inspector +job-name-maintenance-worker = Maintenance Worker +job-name-maintengineer = Maintenance Engineer +job-name-md = Medical Director +job-name-prisonchef = Prison Chef +job-name-prison-officer = Prison Officer +job-name-probationary-officer = Probationary Officer +job-name-prisoner = Prisoner + # Role timers - Make these alphabetical or I cut you -JobAtmosphericTechnician = Atmospheric Specialist +JobAtmosphericTechnician = Atmospheric Technician JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist @@ -80,8 +97,7 @@ JobMedicalIntern = Medical intern JobMime = Mime JobMusician = Musician JobParamedic = Paramedic -JobPassenger = Passenger -JobPrisoner = Prisoner +JobPassenger = Prisoner #PS14 JobPsychologist = Psychologist JobQuartermaster = Quartermaster JobReporter = Reporter @@ -97,3 +113,17 @@ JobTechnicalAssistant = Technical Assistant JobVisitor = Visitor JobWarden = Warden JobZookeeper = Zookeeper + +#PS14 +JobSPWarden = Warden +JobAtmosphericSpecialist = Atmospheric Specialist +JobChiefCustodialOfficer = Chief Custodial Officer +JobGardener = Gardener +JobHeadOfMaintenance = Head Of Maintenance +JobInspector = Inspector +JobPrisonChef = Prison Chef +JobPrisonOfficer = Prison Officer +JobProbationaryOfficer = Probationary Officer +JobPrisoner = Prisoner +JobMaintenanceEngineer = Maintenance Engineer +JobMaintenanceWorker = Maintenance Worker \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index d92065a40b..e0376a1fcc 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -13,3 +13,6 @@ job-supervisors-security = security officers, the warden, and the head of securi job-supervisors-science = scientists, and the research director job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone + +#SP14 +job-supervisors-warden = the warden diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 7ad8c61956..16732732ab 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -410,6 +410,20 @@ - state: green - state: chemist +# Inmates + +- type: entity + id: SpawnPointPrisoner + parent: SpawnPointJobBase + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + layers: + - state: green + - state: prisoner + # Science - type: entity diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/botanist.yml rename to Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml new file mode 100644 index 0000000000..84685e1702 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -0,0 +1,138 @@ +# Greytide Time +- type: loadoutEffectGroup + id: GreyTider + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobPassenger + time: 36000 #10 hrs, silly reward for people who play passenger a lot + +# Face +- type: loadout + id: PassengerFace + equipment: GasMask + effects: + - !type:GroupLoadoutEffect + proto: GreyTider + +- type: startingGear + id: GasMask + equipment: + mask: ClothingMaskGas + +# Jumpsuits +# Grey +- type: loadout + id: GreyJumpsuit + equipment: GreyJumpsuit + +- type: startingGear + id: GreyJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitColorGrey + +- type: loadout + id: GreyJumpskirt + equipment: GreyJumpskirt + +- type: startingGear + id: GreyJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtColorGrey + +# Rainbow +- type: loadout + id: RainbowJumpsuit + equipment: RainbowJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: GreyTider + +- type: startingGear + id: RainbowJumpsuit + equipment: + jumpsuit: ClothingUniformColorRainbow + +# Ancient +- type: loadout + id: AncientJumpsuit + equipment: AncientJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: GreyTider + +- type: startingGear + id: AncientJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitAncient + +# Back +- type: loadout + id: CommonBackpack + equipment: CommonBackpack + +- type: startingGear + id: CommonBackpack + equipment: + back: ClothingBackpack + +- type: loadout + id: CommonSatchel + equipment: CommonSatchel + +- type: startingGear + id: CommonSatchel + equipment: + back: ClothingBackpackSatchel + +- type: loadout + id: CommonDuffel + equipment: CommonDuffel + +- type: startingGear + id: CommonDuffel + equipment: + back: ClothingBackpackDuffel + +# Gloves +- type: loadout + id: PassengerGloves + equipment: FingerlessInsulatedGloves + effects: + - !type:GroupLoadoutEffect + proto: GreyTider + +- type: startingGear + id: FingerlessInsulatedGloves + equipment: + gloves: ClothingHandsGlovesFingerlessInsulated + +# Outerclothing +- type: loadout + id: PassengerWintercoat + equipment: PassengerWintercoat + +- type: startingGear + id: PassengerWintercoat + equipment: + outerClothing: ClothingOuterWinterCoat + +# Shoes +- type: loadout + id: BlackShoes + equipment: BlackShoes + +- type: startingGear + id: BlackShoes + equipment: + shoes: ClothingShoesColorBlack + +- type: loadout + id: WinterBoots + equipment: WinterBoots + +- type: startingGear + id: WinterBoots + equipment: + shoes: ClothingShoesBootsWinter diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/gardener.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/prison_chef.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/chef.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/prison_chef.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml index c79baba607..f0adcf8e13 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml @@ -1,45 +1,4 @@ -# Greytide Time -- type: loadoutEffectGroup - id: GreyTider - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobPassenger - time: 36000 #10 hrs, silly reward for people who play passenger a lot - -# Face -- type: loadout - id: PassengerFace - equipment: GasMask - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - -- type: startingGear - id: GasMask - equipment: - mask: ClothingMaskGas - # Jumpsuits -# Grey -- type: loadout - id: GreyJumpsuit - equipment: GreyJumpsuit - -- type: startingGear - id: GreyJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitColorGrey - -- type: loadout - id: GreyJumpskirt - equipment: GreyJumpskirt - -- type: startingGear - id: GreyJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtColorGrey # Prisoner - type: loadout id: PrisonJumpsuit @@ -57,100 +16,4 @@ - type: startingGear id: PrisonJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtPrisoner - -# Rainbow -- type: loadout - id: RainbowJumpsuit - equipment: RainbowJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - -- type: startingGear - id: RainbowJumpsuit - equipment: - jumpsuit: ClothingUniformColorRainbow - -# Ancient -- type: loadout - id: AncientJumpsuit - equipment: AncientJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - -- type: startingGear - id: AncientJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitAncient - -# Back -- type: loadout - id: CommonBackpack - equipment: CommonBackpack - -- type: startingGear - id: CommonBackpack - equipment: - back: ClothingBackpack - -- type: loadout - id: CommonSatchel - equipment: CommonSatchel - -- type: startingGear - id: CommonSatchel - equipment: - back: ClothingBackpackSatchel - -- type: loadout - id: CommonDuffel - equipment: CommonDuffel - -- type: startingGear - id: CommonDuffel - equipment: - back: ClothingBackpackDuffel - -# Gloves -- type: loadout - id: PassengerGloves - equipment: FingerlessInsulatedGloves - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - -- type: startingGear - id: FingerlessInsulatedGloves - equipment: - gloves: ClothingHandsGlovesFingerlessInsulated - -# Outerclothing -- type: loadout - id: PassengerWintercoat - equipment: PassengerWintercoat - -- type: startingGear - id: PassengerWintercoat - equipment: - outerClothing: ClothingOuterWinterCoat - -# Shoes -- type: loadout - id: BlackShoes - equipment: BlackShoes - -- type: startingGear - id: BlackShoes - equipment: - shoes: ClothingShoesColorBlack - -- type: loadout - id: WinterBoots - equipment: WinterBoots - -- type: startingGear - id: WinterBoots - equipment: - shoes: ClothingShoesBootsWinter + jumpsuit: ClothingUniformJumpskirtPrisoner \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Maintenance/atmospheric_specialist.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Maintenance/maintenance_engineer.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/chief-custodial-officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/SP14/chief-custodial-officer.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/inspector.yml b/Resources/Prototypes/Loadouts/Jobs/Security/SP14/inspector.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/prison_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/SP14/prison_officer.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/SP14/probationary_prison_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/SP14/probationary_prison_officer.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7b897dec64..b03850a161 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -54,6 +54,17 @@ - Trinkets - GroupSpeciesBreathTool +- type: roleLoadout + id: JobChef + groups: + - ChefHead + - ChefMask + - ChefJumpsuit + - CommonBackpack + - ChefOuterClothing + - Glasses + - Trinkets + - type: roleLoadout id: JobServiceWorker groups: @@ -263,7 +274,7 @@ - Trinkets - GroupSpeciesBreathTool -# Inmate +# SP14 Inmate - type: roleLoadout id: JobPrisoner groups: @@ -280,12 +291,12 @@ - GroupSpeciesBreathTool - type: roleLoadout - id: JobChef + id: JobPrisonChef groups: - GroupTankHarness - ChefHead - ChefMask - - ChefJumpsuit + - PrisonerJumpsuit - CommonBackpack - ChefOuterClothing - Glasses @@ -293,6 +304,75 @@ - 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 @@ -338,9 +418,59 @@ - Trinkets - GroupSpeciesBreathTool -# Security +# SP14 Security +- type: roleLoadout + id: JobInspector + groups: + - GroupTankHarness + - DetectiveHead + - DetectiveNeck + - DetectiveJumpsuit + - SecurityBackpack + - DetectiveOuterClothing + - SecurityShoes + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + - type: roleLoadout - id: JobWarden + 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: JobProbationaryOfficer + groups: + - SecurityCadetJumpsuit + - SecurityBackpack + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity + +- type: roleLoadout + id: JobSPWarden groups: - HeadofSecurityHead - HeadofSecurityNeck @@ -353,6 +483,8 @@ - Trinkets - GroupSpeciesBreathToolSecurity +# Security + - type: roleLoadout id: JobHeadofSecurity groups: @@ -403,6 +535,65 @@ - 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/Roles/Jobs/Inmate/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Inmate/botanist.yml rename to Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/atmospheric_technician.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/atmospheric_technician.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/borg.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/borg.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/borg.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/borg.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/chief_engineer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/chief_engineer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/janitor.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/janitor.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/janitor.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/janitor.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/station_engineer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/station_engineer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/technical_assistant.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/technical_assistant.yml diff --git a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml new file mode 100644 index 0000000000..5427627dc1 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml @@ -0,0 +1,53 @@ +- type: job + id: ChiefCustodialOfficer + name: job-name-cco + description: job-description-cco + playTimeTracker: JobChiefCustodialOfficer + requirements: + - !type:RoleTimeRequirement + role: JobWarden + time: 10800 #3 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 36000 #10 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 108000 # 30 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 30 + startingGear: HoSGear + icon: "JobIconHeadOfSecurity" + requireAdminNotify: true + supervisors: job-supervisors-captain + canBeAntag: false + access: + - HeadOfSecurity + - Command + - Brig + - Security + - Armory + - Maintenance + - Service + - External + - Detective + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: HoSGear + equipment: + eyes: ClothingEyesGlassesSecurity + id: HoSPDA + gloves: ClothingHandsGlovesCombat + ears: ClothingHeadsetAltSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml new file mode 100644 index 0000000000..0468a644eb --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml @@ -0,0 +1,36 @@ +- type: job + id: Inspector + name: job-name-inspector + description: job-description-inspector + playTimeTracker: JobInspector + weight: -10 + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 # 15 hours + startingGear: DetectiveGear + icon: "JobIconDetective" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - Detective + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: DetectiveGear + equipment: + eyes: ClothingEyesGlassesSecurity + id: DetectivePDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltHolsterFilled + storage: + back: + - Flash + - ForensicPad + - ForensicScanner diff --git a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml new file mode 100644 index 0000000000..1e857ddfb1 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml @@ -0,0 +1,35 @@ +- type: job + id: PrisonOfficer + name: job-name-prison-officer + description: job-description-prison-officer + playTimeTracker: JobPrisonOfficer + weight: 10 + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 #10 hrs + startingGear: SecurityOfficerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: SecurityOfficerGear + equipment: + eyes: ClothingEyesGlassesSecurity + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml new file mode 100644 index 0000000000..9eb5247096 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml @@ -0,0 +1,41 @@ +- type: job + id: ProbationaryOfficer + name: job-name-probationary-officer + description: job-description-probationary-officer + playTimeTracker: JobProbationaryOfficer + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 #5 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 54000 #15 hrs + inverted: true # stop playing intern if you're good at security! + startingGear: SecurityCadetGear + icon: "JobIconSecurityCadet" + supervisors: job-supervisors-security + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: SecurityCadetGear + equipment: + shoes: ClothingShoesBootsCombatFilled + outerClothing: ClothingOuterArmorBasic + id: SecurityCadetPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + pocket2: BookSecurity + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Command/warden.yml b/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml similarity index 92% rename from Resources/Prototypes/Roles/Jobs/Command/warden.yml rename to Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml index ccde444084..9dd367107e 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml @@ -1,8 +1,8 @@ - type: job - id: Warden + id: SPWarden name: job-name-warden description: job-description-warden - playTimeTracker: JobWarden + playTimeTracker: JobSPWarden requirements: - !type:DepartmentTimeRequirement department: Engineering @@ -16,9 +16,9 @@ - !type:DepartmentTimeRequirement department: Command time: 54000 # 15 hours - weight: 25 + weight: 40 startingGear: WardenGear - icon: "JobIconWarden" + icon: "JobIconSPWarden" requireAdminNotify: true joinNotifyCrew: true supervisors: job-supervisors-centcom diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml new file mode 100644 index 0000000000..73ba0a6d4e --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml @@ -0,0 +1,28 @@ +- type: job + id: SPChemist + name: job-name-sp-chemist + description: job-description-sp-chemist + playTimeTracker: JobSPChemist + requirements: + - !type:DepartmentTimeRequirement + department: Medical + time: 14400 #4 hrs + startingGear: ChemistGear + icon: "JobIconChemist" + supervisors: job-supervisors-md + access: + - Medical + - Chemistry + - Maintenance + +- type: startingGear + id: ChemistGear + equipment: + id: ChemistryPDA + ears: ClothingHeadsetMedical + belt: ChemBag + pocket1: HandLabeler + eyes: ClothingEyesGlassesChemical + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml new file mode 100644 index 0000000000..7e269375b8 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml @@ -0,0 +1,26 @@ +- type: job + id: InfirmaryDoctor + name: job-name-infirmary-doctor + description: job-description-infirmary-doctor + playTimeTracker: JobInfirmaryDoctor + requirements: + - !type:DepartmentTimeRequirement + department: Medical + time: 14400 #4 hrs + startingGear: DoctorGear + icon: "JobIconMedicalDoctor" + supervisors: job-supervisors-cmo + access: + - Medical + - Maintenance + extendedAccess: + - Chemistry + +- type: startingGear + id: DoctorGear + equipment: + ears: ClothingHeadsetMedical + belt: ClothingBeltMedicalFilled + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml new file mode 100644 index 0000000000..9ac40353b8 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml @@ -0,0 +1,47 @@ +- type: job + id: MedicalDirector + name: job-name-md + description: job-description-md + playTimeTracker: JobMedicalDirector + requirements: + - !type:RoleTimeRequirement + role: JobPSChemist + time: 10800 #3 hrs + - !type:RoleTimeRequirement + role: JobInfirmaryDoctor + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 10 + startingGear: CMOGear + icon: "JobIconChiefMedicalOfficer" + requireAdminNotify: true + supervisors: job-supervisors-warden + canBeAntag: false + access: + - Medical + - Command + - Maintenance + - Chemistry + - ChiefMedicalOfficer + - Brig + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: CMOGear + equipment: + id: CMOPDA + ears: ClothingHeadsetCMO + belt: ClothingBeltMedicalFilled + storage: + back: + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml new file mode 100644 index 0000000000..b774b2849d --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml @@ -0,0 +1,24 @@ +- type: job + id: SPPsychologist + name: job-name-sp-psychologist + description: job-description-sp-psychologist + playTimeTracker: JobSPPsychologist + startingGear: PsychologistGear + icon: "JobIconPsychologist" + supervisors: job-supervisors-md + access: + - Medical + - Maintenance + extendedAccess: + - Chemistry + +- type: startingGear + id: PsychologistGear + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + shoes: ClothingShoesLeather + id: PsychologistPDA + ears: ClothingHeadsetMedical + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml new file mode 100644 index 0000000000..26a665734e --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml @@ -0,0 +1,26 @@ +- type: job + id: Gardener + name: job-name-gardener + description: job-description-gardener + playTimeTracker: JobGardener + startingGear: BotanistGear + icon: "JobIconGardener" + supervisors: job-supervisors-hop + access: + - Service + - Maintenance + - Hydroponics + extendedAccess: + - Kitchen + - Bar + +- type: startingGear + id: BotanistGear + equipment: + shoes: ClothingShoesColorBrown + id: BotanistPDA + ears: ClothingHeadsetService + belt: ClothingBeltPlantFilled + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/chef.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml similarity index 75% rename from Resources/Prototypes/Roles/Jobs/Inmate/chef.yml rename to Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml index 5abb1d4c8e..c565ab6132 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml @@ -1,14 +1,14 @@ - type: job - id: Chef - name: job-name-chef - description: job-description-chef - playTimeTracker: JobChef + id: PrisonChef + name: job-name-prisonchef + description: job-description-prisonchef + playTimeTracker: JobPrisonChef requirements: - !type:DepartmentTimeRequirement department: Civilian time: 1800 startingGear: ChefGear - icon: "JobIconChef" + icon: "JobIconPrisonChef" supervisors: job-supervisors-hop access: - Service diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml index b7fb7d6ad9..75007a167a 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPrisoner weight: 25 startingGear: PrisonerGear - icon: "JobIconPassenger" + icon: "JobIconSPPrisoner" supervisors: job-supervisors-everyone access: - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml new file mode 100644 index 0000000000..701958f800 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml @@ -0,0 +1,29 @@ +- type: job + id: AtmosphericSpecialist + name: job-name-atmospec + description: job-description-atmostech + playTimeTracker: JobAtmosphericSpecialist + weight: 10 + requirements: + - !type:DepartmentTimeRequirement + department: Maintenance + time: 54000 # 15 hrs + startingGear: AtmosphericTechnicianGear + icon: "JobIconAtmosphericSpecialist" + supervisors: job-supervisors-ce + access: + - Maintenance + - Engineering + - External + - Atmospherics + +- type: startingGear + id: AtmosphericTechnicianGear + equipment: + eyes: ClothingEyesGlassesMeson + id: AtmosPDA + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetEngineering + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml new file mode 100644 index 0000000000..fe82911005 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml @@ -0,0 +1,12 @@ +- type: job + id: Borg + name: job-name-borg + description: job-description-borg + playTimeTracker: JobBorg + requirements: + - !type:OverallPlaytimeRequirement + time: 216000 #60 hrs + canBeAntag: false + icon: JobIconBorg + supervisors: job-supervisors-rd + jobEntity: PlayerBorgGeneric diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml new file mode 100644 index 0000000000..d16fe769da --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml @@ -0,0 +1,49 @@ +- type: job + id: HeadOfMaintenance + name: job-name-hom + description: job-description-ce + playTimeTracker: JobHeadOfMaintenance + requirements: + - !type:RoleTimeRequirement + role: JobAtmosphericSpecialist + time: 21600 #6 hrs + - !type:RoleTimeRequirement + role: JobMaintenanceEngineer + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Maintenance + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 20 + startingGear: ChiefEngineerGear + icon: "JobIconChiefEngineer" + requireAdminNotify: true + supervisors: job-supervisors-warden + canBeAntag: false + access: + - Maintenance + - Engineering + - Command + - External + - ChiefEngineer + - Atmospherics + - Brig + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: ChiefEngineerGear + equipment: + id: CEPDA + eyes: ClothingEyesGlassesMeson + ears: ClothingHeadsetCE + belt: ClothingBeltUtilityEngineering + storage: + back: + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml new file mode 100644 index 0000000000..d676c655dc --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml @@ -0,0 +1,29 @@ +- type: job + id: MaintenanceEngineer + name: job-name-maintengineer + description: job-description-maintengineer + playTimeTracker: JobMaintenanceEngineer + weight: 5 + requirements: + - !type:DepartmentTimeRequirement + department: Maintenance + time: 14400 #4 hrs + startingGear: StationEngineerGear + icon: "JobIconMaintenanceEngineer" + supervisors: job-supervisors-ce + access: + - Maintenance + - Engineering + - External + extendedAccess: + - Atmospherics + +- type: startingGear + id: StationEngineerGear + equipment: + eyes: ClothingEyesGlassesMeson + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetEngineering + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml new file mode 100644 index 0000000000..5a712b40b1 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml @@ -0,0 +1,38 @@ +- type: job + id: MaintenanceWorker + name: job-name-maintenance-worker + description: job-description-maintenance-worker + weight: 1 + playTimeTracker: JobMaintenanceWorker + startingGear: JanitorGear + icon: "JobIconJanitor" + supervisors: job-supervisors-hop + access: + - Service + - Janitor + - Maintenance + special: + - !type:GiveItemOnHolidaySpecial + holiday: GarbageDay + prototype: WeaponRevolverInspector + +- type: startingGear + id: JanitorGear + equipment: + shoes: ClothingShoesGaloshes + id: JanitorPDA + ears: ClothingHeadsetService + belt: ClothingBeltJanitorFilled + #storage: + #back: + #- Stuff + +- type: startingGear + id: JanitorMaidGear + equipment: + jumpsuit: ClothingUniformJumpskirtJanimaid + id: JanitorPDA + gloves: ClothingHandsGlovesJanitor + head: ClothingHeadHatCatEars + ears: ClothingHeadsetService + belt: ClothingBeltJanitorFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 59cdbbe59c..f3fc08598d 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -24,26 +24,28 @@ description: department-Command-description color: "#334E6D" roles: - - Warden + - SPWarden - CentralCommandOfficial - - ChiefEngineer - - ChiefMedicalOfficer + - HeadOfMaintenance + - ChiefCustodialOfficer + - MedicalDirector - HeadOfPersonnel - Quartermaster primary: false weight: 100 +# PS14 - type: department id: Maintenance weight: 10 description: department-Maintenance-description color: "#9FED58" roles: - - AtmosphericTechnician - - ChiefEngineer - - StationEngineer + - AtmosphericSpecialist + - HeadOfMaintenance + - MaintenanceEngineer - Borg - - Janitor + - MaintenanceWorker - type: department id: Inmate @@ -52,8 +54,8 @@ weight: 20 roles: - Prisoner - - Chef - - Botanist + - PrisonChef + - Gardener - Librarian - type: department @@ -62,10 +64,10 @@ description: department-Medical-description color: "#52B4E9" roles: - - Chemist - - ChiefMedicalOfficer - - MedicalDoctor - - Psychologist + - SPChemist + - MedicalDirector + - InfirmaryDoctor + - SPPsychologist - type: department id: Security @@ -73,7 +75,7 @@ color: "#DE3A3A" weight: 40 roles: - - HeadOfSecurity - - SecurityCadet - - SecurityOfficer - - Detective + - ChiefCustodialOfficer + - ProbationaryOfficer + - PrisonOfficer + - Inspector diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 5d31d6d93d..9539ef4ac5 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -97,9 +97,6 @@ - type: playTimeTracker id: JobParamedic -- type: playTimeTracker - id: JobPrisoner - - type: playTimeTracker id: JobPsychologist @@ -147,3 +144,40 @@ - type: playTimeTracker id: JobZookeeper + +#PS14 +- type: playTimeTracker + id: JobAtmosphericSpecialist + +- type: playTimeTracker + id: JobChiefCustodialOfficer + +- type: playTimeTracker + id: JobGardener + +- type: playTimeTracker + id: JobHeadOfMaintenance + +- type: playTimeTracker + id: JobInspector + +- type: playTimeTracker + id: JobMaintenanceEngineer + +- type: playTimeTracker + id: JobMaintenanceWorker + +- type: playTimeTracker + id: JobPrisonChef + +- type: playTimeTracker + id: JobPrisonOfficer + +- type: playTimeTracker + id: JobProbationaryOfficer + +- type: playTimeTracker + id: JobPrisoner + +- type: playTimeTracker + id: JobSPWarden \ No newline at end of file diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 6275f0bc07..e100c80674 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -382,3 +382,46 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Admin + +#SP14 +- type: statusIcon + parent: JobIcon + id: JobIconAtmosphericSpecialist + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: AtmosphericSpecialist + +- type: statusIcon + parent: JobIcon + id: JobIconGardener + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: Gardener + +- type: statusIcon + parent: JobIcon + id: JobIconMaintenanceEngineer + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: MaintenanceEngineer + +- type: statusIcon + parent: JobIcon + id: JobIconPrisonChef + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: PrisonChef + +- type: statusIcon + parent: JobIcon + id: JobIconSPPrisoner + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: SPPrisoner + +- type: statusIcon + parent: JobIcon + id: JobIconSPWarden + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: SPWarden \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png new file mode 100644 index 0000000000000000000000000000000000000000..0739b20ff3b9fdada077ababee2ccc79cbaa9337 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|f;?RuLnNlw z_8;UuV8FrLuN9r5!+%JJ=TO8<<=Ul6fg$x1YS_4$Cz$NiFg~kt_TKMwHnL-M4fF7f+xfzPtRno3W^k&P?P%7@7jKbEoTxYKXzJ@%J%V2;fD4H z+tr*W>-rVk=)TacbLme2dsMopIP>fbqhGT7S=$+y{u{?zER}8-y74pvXbXdJQo4n$Gj|{GWM&b-&Jqgddw6n9rpFVdQ&MBb@04$s_bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd80bd2ddaebe09a558224eac2138f29d17bcfb GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|3O!vMLnNjq zrz9jK2=M0o`v3No9GhOQI9tlE*K3`7eC}kG{l9r+isZgKHYXbVy4lSBra!t=mUw`5 zU+mq(2M(-F`z|luFk4~r#-7H;M#koUWu^Sgm$$F3E{Hm~^z9*s3%or%JObqlswaBi gZhiRmmz5jC-#xx9ve$Q?1zOJF>FVdQ&MBb@0E~}GKL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png new file mode 100644 index 0000000000000000000000000000000000000000..13abbf3b5e4768932c8d200f8a2406325e81d16a GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|5g9qQ$7-n)AIqm=RZv)T@22WQ%mvv4FO#mA*GhYAz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-lawyer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-lawyer.png new file mode 100644 index 0000000000000000000000000000000000000000..c180810cd9fe6302a7b75110aae2b33d35f9d077 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|!aQ9ZLnNjq zrz9jKtho8^*L+6qjE{HDo`~3d_v`*mGYw)495XBrHnL-M4fF7f+xfzPtRno3W^k&P?P%7@7jKbEoTxYKXzJ@%J%V2;fD4H z+tr*W>-rVk=)TacbLme2dsMopIP>fbqhGT7S=$+y{u{?zER}8-y74pvXbXdJQo4n$Gj|{GWM&b-&Jqgddw6n9rpFVdQ&MBb@04$s_bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPWarden.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPWarden.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd80bd2ddaebe09a558224eac2138f29d17bcfb GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|3O!vMLnNjq zrz9jK2=M0o`v3No9GhOQI9tlE*K3`7eC}kG{l9r+isZgKHYXbVy4lSBra!t=mUw`5 zU+mq(2M(-F`z|luFk4~r#-7H;M#koUWu^Sgm$$F3E{Hm~^z9*s3%or%JObqlswaBi gZhiRmmz5jC-#xx9ve$Q?1zOJF>FVdQ&MBb@0E~}GKL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/cco.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/cco.png new file mode 100644 index 0000000000000000000000000000000000000000..13abbf3b5e4768932c8d200f8a2406325e81d16a GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|5g9qQ$7-n)AIqm=RZv)T@22WQ%mvv4FO#mA*GhYAz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-lawyer.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-lawyer.png new file mode 100644 index 0000000000000000000000000000000000000000..c180810cd9fe6302a7b75110aae2b33d35f9d077 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|!aQ9ZLnNjq zrz9jKtho8^*L+6qjE{HDo`~3d_v`*mGYw)495XBrH