diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 48054af8eb..24fccc8b7d 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -47,8 +47,24 @@ job-description-warden = Keep the prison running, delegate work to the other hea 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-atmospec = Operate the prison's atmospherics setup, fix the prisoners atmospheric 'mistakes'. +job-description-cco = Manage solitary and distribute equipment from the armory. Deal with unruly officers. +job-description-hom = Coordinate your department, allocate resources to projects, take the blame when the lights go off. +job-description-infirmary-doctor = Patch up the wounded & scold the undeserving. +job-description-inspector = Perform cell inspections, ensure that the guilty party is found, and get yelled at by the welfare officer. +job-description-sp-cargotech = Export the prisoners' produce and turn it into sweet, liquid cash. +job-description-sp-chaplain = Give the prisoners something to believe in, like a father figure... or a cult. +job-description-sp-chemist = Create medicine for the infirmary to function. +job-description-sp-clown = Who hires a prison clown! like seriously what kind of job is that? +job-description-sp-psychologist = Give counselling to those who need it, or prescribe drugs to those who don't. +job-description-sp-qm = Control imports and manage your department. Help prisoners - or guards - make a bar. +job-description-sp-reporter = Broadcast all the prison's most heinous acts for the world to see. 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-maintenance-worker = fix lights, mop floors, beg the engineers for proper training. +job-description-maintengineer = Keep the prison's main engine & solars active, make emergency repairs using your hardsuit in spaced areas, Train the wannabes. +job-description-md = Manage the infirmary and keep everyone alive. 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 +job-description-prison-officer = Follow orders, deal with troublemakers and keep prisoners working. +job-description-rookie-officer = Learn the art of keeping prisoners in line. Don’t abuse your power! +job-description-prisoner = Serve your sentence, work service jobs or plan an escape. +job-description-wo = Handle prisoner compaints, maintain law and order, hold security accountable. \ 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 17b9b76350..53e3199576 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -48,6 +48,12 @@ job-name-visitor = Visitor #PS14 job-name-sp-warden = Warden +job-name-wo = Welfare Officer +job-name-sp-cargotech = Cargo Technician +job-name-sp-chaplain = Chaplain +job-name-sp-clown = Clown +job-name-sp-qm = Quartermaster +job-name-sp-reporter = Reporter job-name-atmospec = Atmospheric Specialist job-name-sp-chemist = Chemist job-name-sp-psychologist = Psychologist @@ -61,7 +67,7 @@ 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-rookie-officer = Rookie Officer job-name-prisoner = Prisoner # Role timers - Make these alphabetical or I cut you @@ -116,6 +122,12 @@ JobZookeeper = Zookeeper #PS14 JobSPWarden = Warden +JobWelfareOfficer = Welfare Officer +JobSPCargoTechnician = Cargo Technician +JobSPChaplain = Chaplain +JobSPClown = Clown +JobSPQuartermaster = Quartermaster +JobSPReporter = Reporter JobAtmosphericSpecialist = Atmospheric Specialist JobChiefCustodialOfficer = Chief Custodial Officer JobGardener = Gardener @@ -123,7 +135,7 @@ JobHeadOfMaintenance = Head Of Maintenance JobInspector = Inspector JobPrisonChef = Prison Chef JobPrisonOfficer = Prison Officer -JobProbationaryOfficer = Probationary Officer +JobRookieOfficer = Rookie 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 e0376a1fcc..62149bf937 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -15,4 +15,9 @@ job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone #SP14 +job-supervisors-cco = the chief custodial officer +job-supervisors-guards = prison officers, the warden, and the chief custodial officer +job-supervisors-hom = the head of maintenance +job-supervisors-md = the medical director job-supervisors-warden = the warden +job-supervisors-wo = the welfare officer diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml new file mode 100644 index 0000000000..f5d92b86eb --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml @@ -0,0 +1,36 @@ +# Jumpsuit +- type: loadout + id: LibrarianJumpsuit + equipment: LibrarianJumpsuit + +- type: startingGear + id: LibrarianJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitLibrarian + +- type: loadout + id: LibrarianJumpskirt + equipment: LibrarianJumpskirt + +- type: startingGear + id: LibrarianJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtLibrarian + +- type: loadout + id: CuratorJumpsuit + equipment: CuratorJumpsuit + +- type: startingGear + id: CuratorJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitCurator + +- type: loadout + id: CuratorJumpskirt + equipment: CuratorJumpskirt + +- type: startingGear + id: CuratorJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtCurator \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index b03850a161..f6255de627 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -1,3 +1,32 @@ +# 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 @@ -25,6 +54,46 @@ - 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 @@ -181,6 +250,37 @@ - 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 @@ -461,7 +561,7 @@ - GroupSpeciesBreathToolSecurity - type: roleLoadout - id: JobProbationaryOfficer + id: JobRookieOfficer groups: - SecurityCadetJumpsuit - SecurityBackpack @@ -469,20 +569,6 @@ - Trinkets - GroupSpeciesBreathToolSecurity -- type: roleLoadout - id: JobSPWarden - groups: - - HeadofSecurityHead - - HeadofSecurityNeck - - HeadofSecurityJumpsuit - - SecurityBackpack - - SecurityBelt - - HeadofSecurityOuterClothing - - SecurityShoes - - SurvivalSecurity - - Trinkets - - GroupSpeciesBreathToolSecurity - # Security - type: roleLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml b/Resources/Prototypes/Roles/Jobs/Civilian/borg.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Maintenance/borg.yml rename to Resources/Prototypes/Roles/Jobs/Civilian/borg.yml diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml similarity index 73% rename from Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml rename to Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index d865d57cab..acfbfe6be7 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -1,8 +1,8 @@ - type: job - id: Librarian - name: job-name-librarian - description: job-description-librarian - playTimeTracker: JobLibrarian + id: PrisonLibrarian + name: job-name-prison-librarian + description: job-description-prison-librarian + playTimeTracker: JobPrisonLibrarian startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml index 5427627dc1..39e2266ce7 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml @@ -15,11 +15,11 @@ time: 108000 # 30 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - weight: 30 + weight: 35 startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-warden canBeAntag: false access: - HeadOfSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml index 0468a644eb..ce4b2d82ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml @@ -10,7 +10,7 @@ time: 54000 # 15 hours startingGear: DetectiveGear icon: "JobIconDetective" - supervisors: job-supervisors-hos + supervisors: job-supervisors-cco canBeAntag: false access: - Security diff --git a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml index 1e857ddfb1..fac1e83af0 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml @@ -10,7 +10,7 @@ time: 36000 #10 hrs startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-hos + supervisors: job-supervisors-cco canBeAntag: false access: - Security diff --git a/Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml similarity index 78% rename from Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml rename to Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml index 9eb5247096..ef136a1932 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml @@ -1,18 +1,18 @@ - type: job - id: ProbationaryOfficer - name: job-name-probationary-officer - description: job-description-probationary-officer - playTimeTracker: JobProbationaryOfficer + id: RookieOfficer + name: job-name-rookie-officer + description: job-description-rookie-officer + playTimeTracker: JobRookieOfficer requirements: - !type:OverallPlaytimeRequirement time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Security - time: 54000 #15 hrs + time: 36000 #10 hrs inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" - supervisors: job-supervisors-security + supervisors: job-supervisors-guards canBeAntag: false access: - Security diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml index 7e269375b8..44870d8a42 100644 --- a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml @@ -9,7 +9,7 @@ time: 14400 #4 hrs startingGear: DoctorGear icon: "JobIconMedicalDoctor" - supervisors: job-supervisors-cmo + supervisors: job-supervisors-md access: - Medical - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml index 26a665734e..21e3cc37dc 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml @@ -5,7 +5,7 @@ playTimeTracker: JobGardener startingGear: BotanistGear icon: "JobIconGardener" - supervisors: job-supervisors-hop + supervisors: job-supervisors-wo access: - Service - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml index c565ab6132..fc9fb3bbfd 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml @@ -9,7 +9,7 @@ time: 1800 startingGear: ChefGear icon: "JobIconPrisonChef" - supervisors: job-supervisors-hop + supervisors: job-supervisors-wo access: - Service - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml index 701958f800..eb494bb9bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml @@ -10,7 +10,7 @@ time: 54000 # 15 hrs startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericSpecialist" - supervisors: job-supervisors-ce + supervisors: job-supervisors-hom access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml index d16fe769da..4572be9e2e 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml @@ -1,7 +1,7 @@ - type: job id: HeadOfMaintenance name: job-name-hom - description: job-description-ce + description: job-description-hom playTimeTracker: JobHeadOfMaintenance requirements: - !type:RoleTimeRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml index d676c655dc..99b8371431 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml @@ -10,7 +10,7 @@ time: 14400 #4 hrs startingGear: StationEngineerGear icon: "JobIconMaintenanceEngineer" - supervisors: job-supervisors-ce + supervisors: job-supervisors-hom access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml index 5a712b40b1..c506e96ff1 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml @@ -6,7 +6,7 @@ playTimeTracker: JobMaintenanceWorker startingGear: JanitorGear icon: "JobIconJanitor" - supervisors: job-supervisors-hop + supervisors: job-supervisors-hom access: - Service - Janitor diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml new file mode 100644 index 0000000000..1679893390 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml @@ -0,0 +1,12 @@ +- type: job + id: SPBorg + name: job-name-borg + description: job-description-borg + playTimeTracker: JobSPBorg + requirements: + - !type:OverallPlaytimeRequirement + time: 216000 #60 hrs + canBeAntag: false + icon: JobIconBorg + supervisors: job-supervisors-hom + jobEntity: PlayerBorgGeneric diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml new file mode 100644 index 0000000000..0e4099e955 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml @@ -0,0 +1,23 @@ +- type: job + id: SPCargoTechnician + name: job-name-sp-cargotech + description: job-description-sp-cargotech + playTimeTracker: JobSPCargoTechnician + startingGear: CargoTechGear + icon: "JobIconCargoTechnician" + supervisors: job-supervisors-qm + access: + - Cargo + - Maintenance + extendedAccess: + - Salvage + +- type: startingGear + id: CargoTechGear + equipment: + id: CargoPDA + ears: ClothingHeadsetCargo + pocket1: AppraisalTool + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml new file mode 100644 index 0000000000..dd9b3c7957 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml @@ -0,0 +1,44 @@ +- type: job + id: SPQuartermaster + name: job-name-sp-qm + description: job-description-sp-qm + playTimeTracker: JobSPQuartermaster + requirements: + - !type:RoleTimeRequirement + role: JobSPCargoTechnician + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Cargo + time: 36000 #10 hours + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 10 + startingGear: QuartermasterGear + icon: "JobIconQuarterMaster" + supervisors: job-supervisors-warden + canBeAntag: false + access: + - Cargo + - Salvage + - Quartermaster + - Maintenance + - Command + - Brig + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: QuartermasterGear + equipment: + id: QuartermasterPDA + ears: ClothingHeadsetQM + belt: BoxFolderClipboard + pocket1: AppraisalTool + storage: + back: + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml new file mode 100644 index 0000000000..4be5162df0 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml @@ -0,0 +1,26 @@ +- type: job + id: SPChaplain + name: job-name-sp-chaplain + description: job-description-sp-chaplain + playTimeTracker: JobSPChaplain + startingGear: ChaplainGear + icon: "JobIconSPChaplain" + supervisors: job-supervisors-wo + access: + - Chapel + - Maintenance + special: + - !type:AddComponentSpecial + components: + - type: BibleUser #Lets them heal with bibles + +- type: startingGear + id: ChaplainGear + equipment: + shoes: ClothingShoesColorBlack + id: ChaplainPDA + ears: ClothingHeadsetService + storage: + back: + - Bible + - RubberStampChaplain diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml new file mode 100644 index 0000000000..4b93b3273b --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml @@ -0,0 +1,39 @@ +- type: job + id: SPClown + name: job-name-sp-clown + description: job-description-sp-clown + playTimeTracker: JobSPClown + startingGear: ClownGear + icon: "JobIconSPClown" + supervisors: job-supervisors-wo + access: + - Theatre + - Maintenance + special: + - !type:AddComponentSpecial + components: + - type: Clumsy + clumsyDamage: + types: #literally just picked semi random valus. i tested this once and tweaked it. + Blunt: 5 + Piercing: 4 + groups: + Burn: 3 + - type: SleepEmitSound + snore: /Audio/Voice/Misc/silly_snore.ogg + interval: 10 + - !type:AddImplantSpecial + implants: [ SadTromboneImplant ] + +- type: startingGear + id: ClownGear + equipment: + mask: ClothingMaskClown + pocket1: BikeHorn + pocket2: ClownRecorder + id: ClownPDA + ears: ClothingHeadsetService + storage: + back: + - RubberStampClown + - CrayonRainbow diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml new file mode 100644 index 0000000000..7a353052c2 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml @@ -0,0 +1,21 @@ +- type: job + id: SPReporter + name: job-name-sp-reporter + description: job-description-sp-reporter + playTimeTracker: JobSPReporter + startingGear: ReporterGear + icon: "JobIconReporter" + supervisors: job-supervisors-wo + access: + - Service + - Maintenance + +- type: startingGear + id: ReporterGear + equipment: + shoes: ClothingShoesColorWhite + id: ReporterPDA + ears: ClothingHeadsetService + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml b/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml new file mode 100644 index 0000000000..30f013ead6 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml @@ -0,0 +1,69 @@ +- type: job + id: WelfareOfficer + name: job-name-wo + description: job-description-wo + playTimeTracker: JobWelfareOfficer + requirements: + - !type:DepartmentTimeRequirement + department: Maintenance + time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 36000 # 10 hours + weight: 30 + startingGear: HoPGear + icon: "JobIconHeadOfPersonnel" + requireAdminNotify: true + supervisors: job-supervisors-warden + canBeAntag: false + access: + - Command + - HeadOfPersonnel + - Bar + - Service + - Maintenance + - Janitor + - Theatre + - Kitchen + - Chapel + - Hydroponics + - External + - Cryogenics + # I mean they'll give themselves the rest of the access levels *anyways*. + # As of 15/03/23 they can't do that so here's MOST of the rest of the access levels. + # Head level access that isn't their own was deliberately left out, get AA from the Warden instead. + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Lawyer + - Cargo + - Atmospherics + - Medical + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: HoPGear + equipment: + shoes: ClothingShoesColorBrown + id: HoPPDA + gloves: ClothingHandsGlovesHop + ears: ClothingHeadsetAltCommand + belt: BoxFolderClipboard + storage: + back: + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index f3fc08598d..d6609e34ba 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,22 +1,13 @@ -- type: department - id: Cargo - description: department-Cargo-description - color: "#A46106" - roles: - - CargoTechnician - - Quartermaster - - type: department id: Civilian description: department-Civilian-description color: "#9FED58" weight: -10 roles: - - Chaplain - - Clown - - HeadOfPersonnel - - Lawyer - - Reporter + - SPChaplain + - SPClown + - WelfareOfficer + - SPReporter - Visitor - type: department @@ -29,12 +20,19 @@ - HeadOfMaintenance - ChiefCustodialOfficer - MedicalDirector - - HeadOfPersonnel + - WelfareOfficer - Quartermaster primary: false weight: 100 -# PS14 +- type: department + id: Cargo + description: department-Cargo-description + color: "#A46106" + roles: + - SPCargoTechnician + - SPQuartermaster + - type: department id: Maintenance weight: 10 @@ -44,7 +42,7 @@ - AtmosphericSpecialist - HeadOfMaintenance - MaintenanceEngineer - - Borg + - SPBorg - MaintenanceWorker - type: department @@ -56,7 +54,6 @@ - Prisoner - PrisonChef - Gardener - - Librarian - type: department id: Medical @@ -76,6 +73,6 @@ weight: 40 roles: - ChiefCustodialOfficer - - ProbationaryOfficer + - RookieOfficer - PrisonOfficer - Inspector diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 9539ef4ac5..a782db7ac5 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -149,6 +149,12 @@ - type: playTimeTracker id: JobAtmosphericSpecialist +- type: playTimeTracker + id: JobSPCargoTechnician + +- type: playTimeTracker + id: JobSPBorg + - type: playTimeTracker id: JobChiefCustodialOfficer @@ -174,10 +180,25 @@ id: JobPrisonOfficer - type: playTimeTracker - id: JobProbationaryOfficer + id: JobSPQuartermaster + +- type: playTimeTracker + id: JobRookieOfficer - type: playTimeTracker id: JobPrisoner - type: playTimeTracker - id: JobSPWarden \ No newline at end of file + id: JobSPChaplain + +- type: playTimeTracker + id: JobSPClown + +- type: playTimeTracker + id: JobSPReporter + +- type: playTimeTracker + id: JobSPWarden + +- type: playTimeTracker + id: WelfareOfficer \ No newline at end of file diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index e100c80674..7030f67e75 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -424,4 +424,18 @@ id: JobIconSPWarden icon: sprite: /Textures/Interface/Misc/sp14/job_icons.rsi - state: SPWarden \ No newline at end of file + state: SPWarden + +- type: statusIcon + parent: JobIcon + id: JobIconSPChaplain + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: SPChaplain + +- type: statusIcon + parent: JobIcon + id: JobIconSPClown + icon: + sprite: /Textures/Interface/Misc/sp14/job_icons.rsi + state: SPClown \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-chaplain.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPChaplain.png similarity index 100% rename from Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-chaplain.png rename to Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPChaplain.png diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPClown.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPClown.png new file mode 100644 index 0000000000..423c965f97 Binary files /dev/null and b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPClown.png differ diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-lawyer.png b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/WelfareWorker.png similarity index 100% rename from Resources/Textures/Interface/Misc/sp14/job_icons.rsi/ps-lawyer.png rename to Resources/Textures/Interface/Misc/sp14/job_icons.rsi/WelfareWorker.png diff --git a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/meta.json index ba7f24c37a..85580e6967 100644 --- a/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/sp14/job_icons.rsi/meta.json @@ -20,6 +20,12 @@ { "name": "PrisonChef" }, + { + "name": "SPChaplain" + }, + { + "name": "SPClown" + }, { "name": "SPPrisoner" },