From 0431cc291401fa33a1ede1cb6dbd5f609d9e9ee8 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Mon, 8 Jul 2024 00:38:00 +0100 Subject: [PATCH 01/17] culled useless roles, replaced captain with warden --- BuildChecker/BuildChecker.csproj | 4 +- .../Locale/en-US/job/department-desc.ftl | 7 +-- Resources/Locale/en-US/job/department.ftl | 5 +- .../Locale/en-US/job/job-description.ftl | 8 +-- Resources/Locale/en-US/job/job-names.ftl | 7 ++- .../Jobs/Command/{captain.yml => warden.yml} | 0 .../Jobs/{Civilian => Inmate}/botanist.yml | 0 .../Jobs/{Civilian => Inmate}/chef.yml | 0 .../Jobs/{Civilian => Inmate}/librarian.yml | 0 .../Jobs/{Civilian => Inmate}/passenger.yml | 0 .../Prototypes/Loadouts/role_loadouts.yml | 48 ++++++++++----- .../Jobs/{Wildcards => Civilian}/reporter.yml | 0 .../Prototypes/Roles/Jobs/Command/warden.yml | 47 +++++++++++++++ .../Jobs/{Wildcards => Depriciated}/boxer.yml | 0 .../Jobs/{Command => Depriciated}/captain.yml | 0 .../research_assistant.yml | 0 .../research_director.yml | 0 .../{Science => Depriciated}/scientist.yml | 0 .../{Wildcards => Depriciated}/zookeeper.yml | 0 .../Jobs/{Science => Engineering}/borg.yml | 0 .../{Civilian => Engineering}/janitor.yml | 0 .../Jobs/{Civilian => Inmate}/botanist.yml | 0 .../Roles/Jobs/{Civilian => Inmate}/chef.yml | 0 .../Jobs/{Civilian => Inmate}/librarian.yml | 0 .../Prototypes/Roles/Jobs/Inmate/prisoner.yml | 19 ++++++ .../{Wildcards => Medical}/psychologist.yml | 0 .../Prototypes/Roles/Jobs/Security/warden.yml | 37 ------------ .../Prototypes/Roles/Jobs/departments.yml | 60 +++++-------------- .../Prototypes/Roles/play_time_trackers.yml | 3 + 29 files changed, 133 insertions(+), 112 deletions(-) rename Resources/Prototypes/Loadouts/Jobs/Command/{captain.yml => warden.yml} (100%) rename Resources/Prototypes/Loadouts/Jobs/{Civilian => Inmate}/botanist.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Civilian => Inmate}/chef.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Civilian => Inmate}/librarian.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Civilian => Inmate}/passenger.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Wildcards => Civilian}/reporter.yml (100%) create mode 100644 Resources/Prototypes/Roles/Jobs/Command/warden.yml rename Resources/Prototypes/Roles/Jobs/{Wildcards => Depriciated}/boxer.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Command => Depriciated}/captain.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Science => Depriciated}/research_assistant.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Science => Depriciated}/research_director.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Science => Depriciated}/scientist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Wildcards => Depriciated}/zookeeper.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Science => Engineering}/borg.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Civilian => Engineering}/janitor.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Civilian => Inmate}/botanist.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Civilian => Inmate}/chef.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Civilian => Inmate}/librarian.yml (100%) create mode 100644 Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml rename Resources/Prototypes/Roles/Jobs/{Wildcards => Medical}/psychologist.yml (100%) delete mode 100644 Resources/Prototypes/Roles/Jobs/Security/warden.yml diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj index 63d16fa970..e2b4c27d9b 100644 --- a/BuildChecker/BuildChecker.csproj +++ b/BuildChecker/BuildChecker.csproj @@ -19,6 +19,8 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild {C899FCA4-7037-4E49-ABC2-44DE72487110} .NETFramework, Version=v4.7.2 false + v4.8 + Library @@ -49,4 +51,4 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild - + \ No newline at end of file diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 05c52dada9..5299eed015 100644 --- a/Resources/Locale/en-US/job/department-desc.ftl +++ b/Resources/Locale/en-US/job/department-desc.ftl @@ -1,8 +1,7 @@ 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-Engineering-description = Keep the power on and the station operational. +department-Maintenance-description = Maintain the stations functionality. +department-Inmate-description = Serve your sentence, work service jobs or plan an escape. department-Medical-description = Keep the crew healthy. -department-Security-description = Keep the peace around the station. -department-Science-description = Research artifacts and anomalies to invent new equipment for the station -department-Specific-description = Jobs that not all stations have. +department-Security-description = Keep the peace around the station. \ 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 508a0459cf..7bdb0690b3 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -1,8 +1,7 @@ department-Cargo = Cargo department-Civilian = Civilian department-Command = Command -department-Engineering = Engineering +department-Maintenance = Maintenance +department-Inmate = Inmate department-Medical = Medical department-Security = Security -department-Science = Science -department-Specific = Station specific diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index e8db804688..757ccc2ec6 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -6,12 +6,11 @@ job-description-borg = Half-human, Half-machine. Follow your laws, serve the cre job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Origin Station. job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you. job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. -job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling. job-description-ce = Manage the engineering department to ensure power, atmospherics, and the hull are in perfect shape. job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible. -job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. +job-description-chef = 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-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive. job-description-clown = Entertain the crew through elaborate slapstick routines or terrible jokes. job-description-cmo = Manage the resources and personnel of the medical department to keep the crew alive. @@ -33,7 +32,8 @@ job-description-lawyer = Ensure that every prisoner or criminal receives a fair job-description-librarian = Manage the library, give out knowledge to any who seek it, and report on activities aboard the station. 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 = Enjoy your stay aboard the station with no obligations! +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. @@ -44,5 +44,5 @@ job-description-scientist = Research alien artifacts, unlock new technologies, b job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray. job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants. job-description-visitor = Enjoy your visit to the station. -job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. +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. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 51a81fb06a..7c76d59cf7 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -16,9 +16,8 @@ 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 Technician +job-name-atmostech = Atmospheric Specialist job-name-hop = Head of Personnel -job-name-captain = Captain job-name-serviceworker = Service Worker job-name-centcomoff = CentCom Official job-name-reporter = Reporter @@ -32,6 +31,7 @@ job-name-chaplain = Chaplain job-name-botanist = Botanist job-name-bartender = Bartender job-name-passenger = Passenger +job-name-prisoner = Prisoner job-name-salvagespec = Salvage specialist job-name-qm = Quartermaster job-name-cargotech = Cargo Technician @@ -48,7 +48,7 @@ job-name-zookeeper = Zookeeper job-name-visitor = Visitor # Role timers - Make these alphabetical or I cut you -JobAtmosphericTechnician = Atmospheric Technician +JobAtmosphericTechnician = Atmospheric Specialist JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist @@ -81,6 +81,7 @@ JobMime = Mime JobMusician = Musician JobParamedic = Paramedic JobPassenger = Passenger +JobPrisoner = Prisoner JobPsychologist = Psychologist JobQuartermaster = Quartermaster JobReporter = Reporter diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/warden.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Command/captain.yml rename to Resources/Prototypes/Loadouts/Jobs/Command/warden.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/botanist.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/botanist.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/chef.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/chef.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/passenger.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/passenger.yml diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index bb30cc182a..49efe96a00 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -65,20 +65,6 @@ - Trinkets - GroupSpeciesBreathTool -- type: roleLoadout - id: JobChef - groups: - - GroupTankHarness - - ChefHead - - ChefMask - - ChefJumpsuit - - CommonBackpack - - ChefOuterClothing - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool - - type: roleLoadout id: JobLibrarian groups: @@ -277,6 +263,36 @@ - Trinkets - GroupSpeciesBreathTool +# Inmate +- type: roleLoadout + id: JobPrisoner + groups: + - GroupTankHarness + - PassengerJumpsuit + - CommonBackpack + - PassengerFace + - PassengerGloves + - PassengerOuterClothing + - PassengerShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobChef + groups: + - GroupTankHarness + - ChefHead + - ChefMask + - ChefJumpsuit + - CommonBackpack + - ChefOuterClothing + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + # Science - type: roleLoadout id: JobResearchDirector @@ -324,7 +340,7 @@ # Security - type: roleLoadout - id: JobHeadOfSecurity + id: JobWarden groups: - HeadofSecurityHead - HeadofSecurityNeck @@ -338,7 +354,7 @@ - GroupSpeciesBreathToolSecurity - type: roleLoadout - id: JobWarden + id: JobHeadofSecurity groups: - WardenHead - WardenJumpsuit diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml rename to Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml diff --git a/Resources/Prototypes/Roles/Jobs/Command/warden.yml b/Resources/Prototypes/Roles/Jobs/Command/warden.yml new file mode 100644 index 0000000000..8d20076d79 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Command/warden.yml @@ -0,0 +1,47 @@ +- type: job + id: Warden + name: job-name-warden + description: job-description-warden + playTimeTracker: JobWarden + requirements: + - !type:DepartmentTimeRequirement + department: Engineering + time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Security + time: 108000 # 30 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 54000 # 15 hours + weight: 20 + startingGear: WardenGear + icon: "JobIconWarden" + requireAdminNotify: true + joinNotifyCrew: true + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: WardenGear + equipment: + eyes: ClothingEyesGlassesSecurity + id: WardenPDA + gloves: ClothingHandsGlovesCombat + ears: ClothingHeadsetAltSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - MagazinePistol + diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/boxer.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/boxer.yml diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/captain.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Command/captain.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/captain.yml diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/research_assistant.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/research_assistant.yml diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/research_director.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Science/research_director.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/research_director.yml diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/scientist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Science/scientist.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/scientist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/zookeeper.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml rename to Resources/Prototypes/Roles/Jobs/Depriciated/zookeeper.yml diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Engineering/borg.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Science/borg.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/borg.yml diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Engineering/janitor.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml rename to Resources/Prototypes/Roles/Jobs/Engineering/janitor.yml diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Inmate/botanist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml rename to Resources/Prototypes/Roles/Jobs/Inmate/botanist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Inmate/chef.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/chef.yml rename to Resources/Prototypes/Roles/Jobs/Inmate/chef.yml diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml rename to Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml new file mode 100644 index 0000000000..d1463b17e6 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml @@ -0,0 +1,19 @@ +- type: job + id: Prisoner + name: job-name-prisoner + description: job-description-prisoner + playTimeTracker: JobPrisoner + startingGear: PrisonerGear + icon: "JobIconPassenger" + supervisors: job-supervisors-everyone + access: + - Maintenance + +- type: startingGear + id: PrisonerGear + equipment: + id: PassengerPDA + ears: ClothingHeadsetGrey + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml rename to Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml deleted file mode 100644 index 6d79d74804..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ /dev/null @@ -1,37 +0,0 @@ -- 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: - - Flash - - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9be98be950..b3cef89376 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -5,7 +5,6 @@ roles: - CargoTechnician - Quartermaster - - SalvageSpecialist - type: department id: Civilian @@ -13,50 +12,47 @@ color: "#9FED58" weight: -10 roles: - - Bartender - - Borg - - Botanist - - Boxer - Chaplain - - Chef - Clown - HeadOfPersonnel - - Janitor - Lawyer - - Librarian - - Mime - - Musician - - Passenger - Reporter - Visitor - - Zookeeper - - ServiceWorker - type: department id: Command description: department-Command-description color: "#334E6D" roles: - - Captain + - Warden - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer - HeadOfPersonnel - - HeadOfSecurity - - ResearchDirector - Quartermaster primary: false weight: 100 - type: department - id: Engineering - description: department-Engineering-description - color: "#EFB341" + id: Maintenance + description: department-Maintenance-description + color: "#9FED58" roles: - AtmosphericTechnician - ChiefEngineer - StationEngineer - - TechnicalAssistant + - Borg + - Janitor + +- type: department + id: Inmate + description: department-Inmate-description + color: "#EFB341" + roles: + - Prisoner + - Chef + - Botanist + - Librarian - type: department id: Medical @@ -66,9 +62,7 @@ - Chemist - ChiefMedicalOfficer - MedicalDoctor - - MedicalIntern - Psychologist - - Paramedic - type: department id: Security @@ -80,25 +74,3 @@ - SecurityCadet - SecurityOfficer - Detective - - Warden - -- type: department - id: Science - description: department-Science-description - color: "#D381C9" - roles: - - ResearchDirector - - Scientist - - ResearchAssistant - -- type: department - id: Specific - description: department-Specific-description - color: "#9FED58" - weight: 10 - roles: - - Boxer - - Reporter - - Zookeeper - - Psychologist - primary: false diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 402d49e90d..5d31d6d93d 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -97,6 +97,9 @@ - type: playTimeTracker id: JobParamedic +- type: playTimeTracker + id: JobPrisoner + - type: playTimeTracker id: JobPsychologist From fb221b82ceba8a3672157ef4e31cababebf8c3cc Mon Sep 17 00:00:00 2001 From: Truoizys Date: Mon, 8 Jul 2024 02:39:59 +0100 Subject: [PATCH 02/17] polished department weightings --- .../Loadouts/Jobs/Inmate/{passenger.yml => prisoner.yml} | 0 Resources/Prototypes/Roles/Jobs/Command/warden.yml | 2 +- Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml | 1 + Resources/Prototypes/Roles/Jobs/departments.yml | 5 ++++- 4 files changed, 6 insertions(+), 2 deletions(-) rename Resources/Prototypes/Loadouts/Jobs/Inmate/{passenger.yml => prisoner.yml} (100%) diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Inmate/passenger.yml rename to Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml diff --git a/Resources/Prototypes/Roles/Jobs/Command/warden.yml b/Resources/Prototypes/Roles/Jobs/Command/warden.yml index 8d20076d79..ccde444084 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/warden.yml @@ -16,7 +16,7 @@ - !type:DepartmentTimeRequirement department: Command time: 54000 # 15 hours - weight: 20 + weight: 25 startingGear: WardenGear icon: "JobIconWarden" requireAdminNotify: true diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml index d1463b17e6..b7fb7d6ad9 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prisoner.yml @@ -3,6 +3,7 @@ name: job-name-prisoner description: job-description-prisoner playTimeTracker: JobPrisoner + weight: 25 startingGear: PrisonerGear icon: "JobIconPassenger" supervisors: job-supervisors-everyone diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index b3cef89376..59cdbbe59c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -35,6 +35,7 @@ - type: department id: Maintenance + weight: 10 description: department-Maintenance-description color: "#9FED58" roles: @@ -48,6 +49,7 @@ id: Inmate description: department-Inmate-description color: "#EFB341" + weight: 20 roles: - Prisoner - Chef @@ -56,6 +58,7 @@ - type: department id: Medical + weight: 5 description: department-Medical-description color: "#52B4E9" roles: @@ -68,7 +71,7 @@ id: Security description: department-Security-description color: "#DE3A3A" - weight: 20 + weight: 40 roles: - HeadOfSecurity - SecurityCadet From 4a31980fae103e54fa19e7c1f00c85ef69df1a08 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Mon, 8 Jul 2024 04:44:50 +0100 Subject: [PATCH 03/17] Added prisoner jumpsuits to prisoner loadout --- .../en-US/preferences/loadout-groups.ftl | 3 +++ .../Loadouts/Jobs/Inmate/prisoner.yml | 18 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 8 ++++++++ .../Prototypes/Loadouts/role_loadouts.yml | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 28785e305c..f5b76b63c0 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -119,6 +119,9 @@ loadout-group-atmospheric-technician-backpack = Atmospheric Technician backpack loadout-group-atmospheric-technician-outerclothing = Atmospheric Technician outer clothing loadout-group-atmospheric-technician-shoes = Atmospheric Technician shoes +# Inmate +loadout-group-prison-jumpsuit = Prison jumpsuit + # Science loadout-group-research-director-head = Research Director head loadout-group-research-director-neck = Research Director neck diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml index 84685e1702..c79baba607 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Inmate/prisoner.yml @@ -40,6 +40,24 @@ id: GreyJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorGrey +# Prisoner +- type: loadout + id: PrisonJumpsuit + equipment: PrisonJumpsuit + +- type: startingGear + id: PrisonJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitPrisoner + +- type: loadout + id: PrisonJumpskirt + equipment: PrisonJumpskirt + +- type: startingGear + id: PrisonJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtPrisoner # Rainbow - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b1d267cc00..4629703e6e 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -133,6 +133,14 @@ loadouts: - HoPWintercoat +# Inmate +- type: loadoutGroup + id: PrisonerJumpsuit + name: loadout-group-prison-jumpsuit + loadouts: + - PrisonJumpsuit + - PrisonJumpskirt + # Civilian - type: loadoutGroup id: PassengerJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 49efe96a00..7b897dec64 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -268,7 +268,7 @@ id: JobPrisoner groups: - GroupTankHarness - - PassengerJumpsuit + - PrisonerJumpsuit - CommonBackpack - PassengerFace - PassengerGloves From ec83465bdd80a00486e87e0d78fa9696f5a4c3d5 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Mon, 8 Jul 2024 23:34:27 +0100 Subject: [PATCH 04/17] 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 Date: Tue, 9 Jul 2024 10:51:42 +0100 Subject: [PATCH 05/17] finally done with this fucking pr --- .../Locale/en-US/job/job-description.ftl | 22 +++- Resources/Locale/en-US/job/job-names.ftl | 16 ++- .../Locale/en-US/job/job-supervisors.ftl | 5 + .../Loadouts/Jobs/Civilian/librarian.yml | 36 ++++++ .../Prototypes/Loadouts/role_loadouts.yml | 116 +++++++++++++++--- .../Jobs/{Maintenance => Civilian}/borg.yml | 0 .../Jobs/{Inmate => Civilian}/librarian.yml | 8 +- .../Jobs/Guards/chief-custodial-officer.yml | 4 +- .../Roles/Jobs/Guards/inspector.yml | 2 +- .../Roles/Jobs/Guards/prison_officer.yml | 2 +- ...tionary_officer.yml => rookie_officer.yml} | 12 +- .../Roles/Jobs/Infirmary/infirmary_doctor.yml | 2 +- .../Prototypes/Roles/Jobs/Inmate/gardener.yml | 2 +- .../Roles/Jobs/Inmate/prison_chef.yml | 2 +- .../Maintenance/atmospheric_specialist.yml | 2 +- .../Jobs/Maintenance/head_of_maintenance.yml | 2 +- .../Jobs/Maintenance/maintenance_engineer.yml | 2 +- .../Jobs/Maintenance/maintenance_worker.yml | 2 +- .../Roles/Jobs/Maintenance/sp-borg.yml | 12 ++ .../Jobs/SPCargo/sp_cargo_technician.yml | 23 ++++ .../Roles/Jobs/SPCargo/sp_quartermaster.yml | 44 +++++++ .../Roles/Jobs/SPCivilian/sp-chaplain.yml | 26 ++++ .../Roles/Jobs/SPCivilian/sp-clown.yml | 39 ++++++ .../Roles/Jobs/SPCivilian/sp-reporter.yml | 21 ++++ .../Roles/Jobs/SPCommand/welfare_officer.yml | 69 +++++++++++ .../Prototypes/Roles/Jobs/departments.yml | 33 +++-- .../Prototypes/Roles/play_time_trackers.yml | 25 +++- Resources/Prototypes/StatusIcon/job.yml | 16 ++- .../{ps-chaplain.png => SPChaplain.png} | Bin .../Misc/sp14/job_icons.rsi/SPClown.png | Bin 0 -> 163 bytes .../{ps-lawyer.png => WelfareWorker.png} | Bin .../Misc/sp14/job_icons.rsi/meta.json | 6 + 32 files changed, 489 insertions(+), 62 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml rename Resources/Prototypes/Roles/Jobs/{Maintenance => Civilian}/borg.yml (100%) rename Resources/Prototypes/Roles/Jobs/{Inmate => Civilian}/librarian.yml (73%) rename Resources/Prototypes/Roles/Jobs/Guards/{probationary_officer.yml => rookie_officer.yml} (78%) create mode 100644 Resources/Prototypes/Roles/Jobs/Maintenance/sp-borg.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml create mode 100644 Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml rename Resources/Textures/Interface/Misc/sp14/job_icons.rsi/{ps-chaplain.png => SPChaplain.png} (100%) create mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/SPClown.png rename Resources/Textures/Interface/Misc/sp14/job_icons.rsi/{ps-lawyer.png => WelfareWorker.png} (100%) 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 0000000000000000000000000000000000000000..423c965f972c942091b26a79c49d9b551bdfab7e GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|Vm)0PLnNjq zrz9jKtho8^*L+6qjE{HDo`~3d_v`*mGYy=ZE)=z~zE_fzkdS!rX7}=YMh1zOJ9#1! zdO(6gEz=I)G;p}UqBdi$!Q2z?8loF>Y&K2h0fL^EJ)8`E-;~2w$+h(YEn@I=^>bP0 Hl+XkK!xcKC 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/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" }, From e1aac2b206cfec626ffe24fe0948493e27a32518 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 10:58:10 +0100 Subject: [PATCH 06/17] cleaned remaining test files --- .../job_icons.rsi/PS14/AtmosphericSpecialist.png | Bin 169 -> 0 bytes .../Misc/job_icons.rsi/PS14/Gardener.png | Bin 160 -> 0 bytes .../job_icons.rsi/PS14/MaintenanceEngineer.png | Bin 152 -> 0 bytes .../Misc/job_icons.rsi/PS14/PrisonChef.png | Bin 152 -> 0 bytes .../Misc/job_icons.rsi/PS14/SPPrisoner.png | Bin 150 -> 0 bytes .../Misc/job_icons.rsi/PS14/SPWarden.png | Bin 183 -> 0 bytes .../Interface/Misc/job_icons.rsi/PS14/cco.png | Bin 166 -> 0 bytes .../Misc/job_icons.rsi/PS14/ps-chaplain.png | Bin 157 -> 0 bytes .../Misc/job_icons.rsi/PS14/ps-lawyer.png | Bin 156 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/AtmosphericSpecialist.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/Gardener.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/MaintenanceEngineer.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/PrisonChef.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPPrisoner.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-chaplain.png delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/PS14/ps-lawyer.png diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/AtmosphericSpecialist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/AtmosphericSpecialist.png deleted file mode 100644 index 203cc12f4a4ff1fff071d2b4956ad51ddbe1bec8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|l097nL-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 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/SPWarden.png deleted file mode 100644 index fbd80bd2ddaebe09a558224eac2138f29d17bcfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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# diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PS14/cco.png deleted file mode 100644 index 13abbf3b5e4768932c8d200f8a2406325e81d16a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|5g9qQ$7-n)AIqm=RZv)T@22WQ%mvv4FO#mA*GhYAz 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 deleted file mode 100644 index c180810cd9fe6302a7b75110aae2b33d35f9d077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|!aQ9ZLnNjq zrz9jKtho8^*L+6qjE{HDo`~3d_v`*mGYw)495XBrH Date: Tue, 9 Jul 2024 11:02:30 +0100 Subject: [PATCH 07/17] cleaned remaining test files pt.2 --- .../Misc/job_icons.rsi/MaintenanceEngineer.png | Bin 152 -> 0 bytes .../Interface/Misc/sp14/job_icons.rsi/cco.png | Bin 166 -> 0 bytes .../Interface/Misc/sp14/job_icons.rsi/meta.json | 3 +++ 3 files changed, 3 insertions(+) delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png delete mode 100644 Resources/Textures/Interface/Misc/sp14/job_icons.rsi/cco.png diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MaintenanceEngineer.png deleted file mode 100644 index 0739b20ff3b9fdada077ababee2ccc79cbaa9337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|f;?RuLnNlw z_8;UuV8FrLuN9r5!+%JJ=TO8<<=Ul6fg$x1YS_4$Cz$NiFg~kt_TKMwH Date: Tue, 9 Jul 2024 18:03:11 +0100 Subject: [PATCH 08/17] fix linter, added spawners --- .../Entities/Markers/Spawners/jobs.yml | 14 - .../Entities/Markers/Spawners/sp14 jobs.yml | 287 ++++++++++++++++++ .../Jobs/Guards/chief-custodial-officer.yml | 4 +- .../Roles/Jobs/Guards/inspector.yml | 4 +- .../Roles/Jobs/Guards/prison_officer.yml | 4 +- .../Roles/Jobs/Guards/rookie_officer.yml | 4 +- .../Roles/Jobs/Guards/sp-warden.yml | 4 +- .../Roles/Jobs/Infirmary/chemist.yml | 4 +- .../Roles/Jobs/Infirmary/infirmary_doctor.yml | 4 +- .../Roles/Jobs/Infirmary/medical_director.yml | 4 +- .../Roles/Jobs/Infirmary/psychologist.yml | 4 +- .../Prototypes/Roles/Jobs/Inmate/gardener.yml | 6 +- .../Roles/Jobs/Inmate/prison_chef.yml | 4 +- .../Maintenance/atmospheric_specialist.yml | 4 +- .../Jobs/Maintenance/head_of_maintenance.yml | 4 +- .../Jobs/Maintenance/maintenance_engineer.yml | 4 +- .../Jobs/Maintenance/maintenance_worker.yml | 16 +- .../Jobs/SPCargo/sp_cargo_technician.yml | 4 +- .../Roles/Jobs/SPCargo/sp_quartermaster.yml | 4 +- .../Roles/Jobs/SPCivilian/sp-chaplain.yml | 4 +- .../Roles/Jobs/SPCivilian/sp-clown.yml | 4 +- .../Roles/Jobs/SPCivilian/sp-reporter.yml | 4 +- .../Roles/Jobs/SPCommand/welfare_officer.yml | 4 +- 23 files changed, 331 insertions(+), 68 deletions(-) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/sp14 jobs.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 16732732ab..7ad8c61956 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -410,20 +410,6 @@ - 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/Entities/Markers/Spawners/sp14 jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/sp14 jobs.yml new file mode 100644 index 0000000000..a615f85eb2 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/sp14 jobs.yml @@ -0,0 +1,287 @@ +# SP14 Cargo +- type: entity + id: SpawnPointSPQuartermaster + parent: SpawnPointJobBase + name: sp quartermaster + components: + - type: SpawnPoint + job_id: SPQuartermaster + - type: Sprite + layers: + - state: green + - state: qm + +- type: entity + id: SpawnPointSPCargoTechnician + parent: SpawnPointJobBase + name: sp cargotechnician + components: + - type: SpawnPoint + job_id: SPCargoTechnician + - type: Sprite + layers: + - state: green + - state: cargo_tech + +# SP14 Civilian +- type: entity + id: SpawnPointSPChaplain + parent: SpawnPointJobBase + name: sp chaplain + components: + - type: SpawnPoint + job_id: SPChaplain + - type: Sprite + layers: + - state: green + - state: chaplain + +- type: entity + id: SpawnPointSPClown + parent: SpawnPointJobBase + name: sp clown + components: + - type: SpawnPoint + job_id: SPClown + - type: Sprite + layers: + - state: green + - state: clown + +- type: entity + id: SpawnPointSPReporter + parent: SpawnPointJobBase + name: sp reporter + components: + - type: SpawnPoint + job_id: SPReporter + - type: Sprite + layers: + - state: green + - state: reporter + +# SP14 Command +- type: entity + id: SpawnPointSPWarden + parent: SpawnPointJobBase + name: sp warden + components: + - type: SpawnPoint + job_id: SPWarden + - type: Sprite + layers: + - state: green + - state: warden + +- type: entity + id: SpawnPointWelfareOfficer + parent: SpawnPointJobBase + name: welfare officer + components: + - type: SpawnPoint + job_id: WelfareOfficer + - type: Sprite + layers: + - state: green + - state: hop + +# SP14 Inmate +- type: entity + id: SpawnPointGardener + parent: SpawnPointJobBase + name: gardener + components: + - type: SpawnPoint + job_id: Gardener + - type: Sprite + layers: + - state: green + - state: botanist + +- type: entity + id: SpawnPointPrisonChef + parent: SpawnPointJobBase + name: prison chef + components: + - type: SpawnPoint + job_id: PrisonChef + - type: Sprite + layers: + - state: green + - state: chef + +- type: entity + id: SpawnPointPrisoner + parent: SpawnPointJobBase + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + layers: + - state: green + - state: prisoner + +# SP14 Maintenance +- type: entity + id: SpawnPointHeadOfMaintenance + parent: SpawnPointJobBase + name: headofmaintenance + components: + - type: SpawnPoint + job_id: HeadOfMaintenance + - type: Sprite + layers: + - state: green + - state: ce + +- type: entity + id: SpawnPointMaintenanceEngineer + parent: SpawnPointJobBase + name: maintenance engineer + components: + - type: SpawnPoint + job_id: MaintenanceEngineer + - type: Sprite + layers: + - state: green + - state: engineer + +- type: entity + id: SpawnPointAtmospec + parent: SpawnPointJobBase + name: atmospheric specialist + components: + - type: SpawnPoint + job_id: AtmosphericSpecialist + - type: Sprite + layers: + - state: green + - state: atmospherics + +- type: entity + id: SpawnPointMaintenanceWorker + parent: SpawnPointJobBase + name: maintenance worker + components: + - type: SpawnPoint + job_id: MaintenanceWorker + - type: Sprite + layers: + - state: green + - state: janitor + +- type: entity + id: SpawnPointSPBorg + parent: SpawnPointJobBase + name: sp cyborg + components: + - type: SpawnPoint + job_id: SPBorg + - type: Sprite + layers: + - state: green + - sprite: Mobs/Silicon/chassis.rsi + state: robot + - sprite: Mobs/Silicon/chassis.rsi + state: robot_e + +# SP14 Medical + +- type: entity + id: SpawnPointMedicalDirector + parent: SpawnPointJobBase + name: medical director + components: + - type: SpawnPoint + job_id: MedicalDirector + - type: Sprite + layers: + - state: green + - state: cmo + +- type: entity + id: SpawnPointInfirmaryDoctor + parent: SpawnPointJobBase + name: infirmary doctor + components: + - type: SpawnPoint + job_id: InfirmaryDoctor + - type: Sprite + layers: + - state: green + - state: doctor + +- type: entity + id: SpawnPointSPChemist + parent: SpawnPointJobBase + name: sp chemist + components: + - type: SpawnPoint + job_id: SPChemist + - type: Sprite + layers: + - state: green + - state: chemist + +- type: entity + id: SpawnPointSPPsychologist + parent: SpawnPointJobBase + name: sp psychologist + components: + - type: SpawnPoint + job_id: SPPsychologist + - type: Sprite + layers: + - state: green + - state: psychologist + +# SP14 Security + +- type: entity + id: SpawnPointChiefCustodialOfficer + parent: SpawnPointJobBase + name: chiefcustodialofficer + components: + - type: SpawnPoint + job_id: ChiefCustodialOfficer + - type: Sprite + layers: + - state: green + - state: hos + +- type: entity + id: SpawnPointPrisonOfficer + parent: SpawnPointJobBase + name: prison officer + components: + - type: SpawnPoint + job_id: PrisonOfficer + - type: Sprite + layers: + - state: green + - state: security_officer + +- type: entity + id: SpawnPointRookieOfficer + parent: SpawnPointJobBase + name: rookie officer + components: + - type: SpawnPoint + job_id: RookieOfficer + - type: Sprite + layers: + - state: green + - state: security_cadet + +- type: entity + id: SpawnPointInspector + parent: SpawnPointJobBase + name: inspector + components: + - type: SpawnPoint + job_id: Inspector + - type: Sprite + layers: + - state: green + - state: detective \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml index 39e2266ce7..3a1f053317 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 35 - startingGear: HoSGear + startingGear: ChiefCustodialOfficerGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true supervisors: job-supervisors-warden @@ -40,7 +40,7 @@ - type: CommandStaff - type: startingGear - id: HoSGear + id: ChiefCustodialOfficerGear equipment: eyes: ClothingEyesGlassesSecurity id: HoSPDA diff --git a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml index ce4b2d82ca..74e76345e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/inspector.yml @@ -8,7 +8,7 @@ - !type:DepartmentTimeRequirement department: Security time: 54000 # 15 hours - startingGear: DetectiveGear + startingGear: InspectorGear icon: "JobIconDetective" supervisors: job-supervisors-cco canBeAntag: false @@ -23,7 +23,7 @@ implants: [ MindShieldImplant ] - type: startingGear - id: DetectiveGear + id: InspectorGear equipment: eyes: ClothingEyesGlassesSecurity id: DetectivePDA diff --git a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml index fac1e83af0..aae389c4fd 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml @@ -8,7 +8,7 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 #10 hrs - startingGear: SecurityOfficerGear + startingGear: PrisonOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-cco canBeAntag: false @@ -24,7 +24,7 @@ implants: [ MindShieldImplant ] - type: startingGear - id: SecurityOfficerGear + id: PrisonOfficerGear equipment: eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml b/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml index ef136a1932..d110c5162e 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml @@ -10,7 +10,7 @@ department: Security time: 36000 #10 hrs inverted: true # stop playing intern if you're good at security! - startingGear: SecurityCadetGear + startingGear: RookieGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-guards canBeAntag: false @@ -26,7 +26,7 @@ implants: [ MindShieldImplant ] - type: startingGear - id: SecurityCadetGear + id: RookieGear equipment: shoes: ClothingShoesBootsCombatFilled outerClothing: ClothingOuterArmorBasic diff --git a/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml b/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml index 9dd367107e..2c74a21fa3 100644 --- a/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Guards/sp-warden.yml @@ -17,7 +17,7 @@ department: Command time: 54000 # 15 hours weight: 40 - startingGear: WardenGear + startingGear: SPWardenGear icon: "JobIconSPWarden" requireAdminNotify: true joinNotifyCrew: true @@ -33,7 +33,7 @@ - type: CommandStaff - type: startingGear - id: WardenGear + id: SPWardenGear equipment: eyes: ClothingEyesGlassesSecurity id: WardenPDA diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml index 73ba0a6d4e..b7a606a88d 100644 --- a/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/chemist.yml @@ -7,7 +7,7 @@ - !type:DepartmentTimeRequirement department: Medical time: 14400 #4 hrs - startingGear: ChemistGear + startingGear: SPChemistGear icon: "JobIconChemist" supervisors: job-supervisors-md access: @@ -16,7 +16,7 @@ - Maintenance - type: startingGear - id: ChemistGear + id: SPChemistGear equipment: id: ChemistryPDA ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml index 44870d8a42..a8392818b4 100644 --- a/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml @@ -7,7 +7,7 @@ - !type:DepartmentTimeRequirement department: Medical time: 14400 #4 hrs - startingGear: DoctorGear + startingGear: InfirmaryDoctor icon: "JobIconMedicalDoctor" supervisors: job-supervisors-md access: @@ -17,7 +17,7 @@ - Chemistry - type: startingGear - id: DoctorGear + id: InfirmaryDoctor equipment: ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml index 9ac40353b8..815aac7cc7 100644 --- a/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/medical_director.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 10 - startingGear: CMOGear + startingGear: MDGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true supervisors: job-supervisors-warden @@ -37,7 +37,7 @@ - type: CommandStaff - type: startingGear - id: CMOGear + id: MDGear equipment: id: CMOPDA ears: ClothingHeadsetCMO diff --git a/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml index b774b2849d..04229a198a 100644 --- a/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Infirmary/psychologist.yml @@ -3,7 +3,7 @@ name: job-name-sp-psychologist description: job-description-sp-psychologist playTimeTracker: JobSPPsychologist - startingGear: PsychologistGear + startingGear: SPPsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-md access: @@ -13,7 +13,7 @@ - Chemistry - type: startingGear - id: PsychologistGear + id: SPPsychologistGear equipment: jumpsuit: ClothingUniformJumpsuitPsychologist shoes: ClothingShoesLeather diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml index 21e3cc37dc..cabff5dfaf 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml @@ -3,7 +3,7 @@ name: job-name-gardener description: job-description-gardener playTimeTracker: JobGardener - startingGear: BotanistGear + startingGear: GardenerGear icon: "JobIconGardener" supervisors: job-supervisors-wo access: @@ -15,12 +15,12 @@ - Bar - type: startingGear - id: BotanistGear + id: GardenerGear equipment: shoes: ClothingShoesColorBrown id: BotanistPDA ears: ClothingHeadsetService belt: ClothingBeltPlantFilled - #storage: + #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml index fc9fb3bbfd..95b3c99eba 100644 --- a/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml @@ -7,7 +7,7 @@ - !type:DepartmentTimeRequirement department: Civilian time: 1800 - startingGear: ChefGear + startingGear: SPChefGear icon: "JobIconPrisonChef" supervisors: job-supervisors-wo access: @@ -19,7 +19,7 @@ - Bar - type: startingGear - id: ChefGear + id: SPChefGear equipment: shoes: ClothingShoesColorBlack id: ChefPDA diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml index eb494bb9bf..b149dd6b64 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml @@ -8,7 +8,7 @@ - !type:DepartmentTimeRequirement department: Maintenance time: 54000 # 15 hrs - startingGear: AtmosphericTechnicianGear + startingGear: AtmosphericSpecialistGear icon: "JobIconAtmosphericSpecialist" supervisors: job-supervisors-hom access: @@ -18,7 +18,7 @@ - Atmospherics - type: startingGear - id: AtmosphericTechnicianGear + id: AtmosphericSpecialistGear equipment: eyes: ClothingEyesGlassesMeson id: AtmosPDA diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml index 4572be9e2e..1c6d3f6633 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 20 - startingGear: ChiefEngineerGear + startingGear: HOMGear icon: "JobIconChiefEngineer" requireAdminNotify: true supervisors: job-supervisors-warden @@ -38,7 +38,7 @@ - type: CommandStaff - type: startingGear - id: ChiefEngineerGear + id: HOMGear equipment: id: CEPDA eyes: ClothingEyesGlassesMeson diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml index 99b8371431..c0ddd26bbb 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml @@ -8,7 +8,7 @@ - !type:DepartmentTimeRequirement department: Maintenance time: 14400 #4 hrs - startingGear: StationEngineerGear + startingGear: MaintenanceEngineerGear icon: "JobIconMaintenanceEngineer" supervisors: job-supervisors-hom access: @@ -19,7 +19,7 @@ - Atmospherics - type: startingGear - id: StationEngineerGear + id: MaintenanceEngineerGear equipment: eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml index c506e96ff1..40d9b9185b 100644 --- a/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_worker.yml @@ -4,7 +4,7 @@ description: job-description-maintenance-worker weight: 1 playTimeTracker: JobMaintenanceWorker - startingGear: JanitorGear + startingGear: MaintenanceWorkerGear icon: "JobIconJanitor" supervisors: job-supervisors-hom access: @@ -17,7 +17,7 @@ prototype: WeaponRevolverInspector - type: startingGear - id: JanitorGear + id: MaintenanceWorkerGear equipment: shoes: ClothingShoesGaloshes id: JanitorPDA @@ -25,14 +25,4 @@ belt: ClothingBeltJanitorFilled #storage: #back: - #- Stuff - -- type: startingGear - id: JanitorMaidGear - equipment: - jumpsuit: ClothingUniformJumpskirtJanimaid - id: JanitorPDA - gloves: ClothingHandsGlovesJanitor - head: ClothingHeadHatCatEars - ears: ClothingHeadsetService - belt: ClothingBeltJanitorFilled + #- Stuff \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml index 0e4099e955..a362469419 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_cargo_technician.yml @@ -3,7 +3,7 @@ name: job-name-sp-cargotech description: job-description-sp-cargotech playTimeTracker: JobSPCargoTechnician - startingGear: CargoTechGear + startingGear: SPCargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm access: @@ -13,7 +13,7 @@ - Salvage - type: startingGear - id: CargoTechGear + id: SPCargoTechGear equipment: id: CargoPDA ears: ClothingHeadsetCargo diff --git a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml index dd9b3c7957..7939978eaf 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCargo/sp_quartermaster.yml @@ -13,7 +13,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 10 - startingGear: QuartermasterGear + startingGear: SPQuartermasterGear icon: "JobIconQuarterMaster" supervisors: job-supervisors-warden canBeAntag: false @@ -33,7 +33,7 @@ - type: CommandStaff - type: startingGear - id: QuartermasterGear + id: SPQuartermasterGear equipment: id: QuartermasterPDA ears: ClothingHeadsetQM diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml index 4be5162df0..13a57cf7b2 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-chaplain.yml @@ -3,7 +3,7 @@ name: job-name-sp-chaplain description: job-description-sp-chaplain playTimeTracker: JobSPChaplain - startingGear: ChaplainGear + startingGear: SPChaplainGear icon: "JobIconSPChaplain" supervisors: job-supervisors-wo access: @@ -15,7 +15,7 @@ - type: BibleUser #Lets them heal with bibles - type: startingGear - id: ChaplainGear + id: SPChaplainGear equipment: shoes: ClothingShoesColorBlack id: ChaplainPDA diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml index 4b93b3273b..54613a360d 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-clown.yml @@ -3,7 +3,7 @@ name: job-name-sp-clown description: job-description-sp-clown playTimeTracker: JobSPClown - startingGear: ClownGear + startingGear: SPClownGear icon: "JobIconSPClown" supervisors: job-supervisors-wo access: @@ -26,7 +26,7 @@ implants: [ SadTromboneImplant ] - type: startingGear - id: ClownGear + id: SPClownGear equipment: mask: ClothingMaskClown pocket1: BikeHorn diff --git a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml index 7a353052c2..f4ccd01025 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCivilian/sp-reporter.yml @@ -3,7 +3,7 @@ name: job-name-sp-reporter description: job-description-sp-reporter playTimeTracker: JobSPReporter - startingGear: ReporterGear + startingGear: SPReporterGear icon: "JobIconReporter" supervisors: job-supervisors-wo access: @@ -11,7 +11,7 @@ - Maintenance - type: startingGear - id: ReporterGear + id: SPReporterGear equipment: shoes: ClothingShoesColorWhite id: ReporterPDA diff --git a/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml b/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml index 30f013ead6..4c6127fc54 100644 --- a/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/SPCommand/welfare_officer.yml @@ -17,7 +17,7 @@ department: Command time: 36000 # 10 hours weight: 30 - startingGear: HoPGear + startingGear: WOGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true supervisors: job-supervisors-warden @@ -57,7 +57,7 @@ - type: CommandStaff - type: startingGear - id: HoPGear + id: WOGear equipment: shoes: ClothingShoesColorBrown id: HoPPDA From 8ca50c10824e911c0dd4f914c56088438f68f743 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 18:10:06 +0100 Subject: [PATCH 09/17] forgot duplicate loadouts :mistake: --- .../Loadouts/Jobs/Inmate/librarian.yml | 36 ------------------- .../Jobs/Depriciated/Engineering/borg.yml | 12 ------- 2 files changed, 48 deletions(-) delete mode 100644 Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml delete mode 100644 Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/borg.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml deleted file mode 100644 index f5d92b86eb..0000000000 --- a/Resources/Prototypes/Loadouts/Jobs/Inmate/librarian.yml +++ /dev/null @@ -1,36 +0,0 @@ -# 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/Roles/Jobs/Depriciated/Engineering/borg.yml b/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/borg.yml deleted file mode 100644 index fe82911005..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Depriciated/Engineering/borg.yml +++ /dev/null @@ -1,12 +0,0 @@ -- 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 From bcd8b4d6dbce8fb6555d2ff53f5259033e790f34 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:04:54 +0100 Subject: [PATCH 10/17] 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 From a62a11c9a5d10c744527542a63dc68f6a121de67 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:10:02 +0100 Subject: [PATCH 11/17] four fucking pixels --- .../Loadouts/Jobs/Command/warden.yml | 130 ------------------ 1 file changed, 130 deletions(-) delete mode 100644 Resources/Prototypes/Loadouts/Jobs/Command/warden.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Command/warden.yml deleted file mode 100644 index 50786d6154..0000000000 --- a/Resources/Prototypes/Loadouts/Jobs/Command/warden.yml +++ /dev/null @@ -1,130 +0,0 @@ -# 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 From d7d64f3ef62b2dc42a0c379b9c3342b09d37ae0a Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:14:49 +0100 Subject: [PATCH 12/17] FOUR FUCKING PIXELS!!! --- .../Roles/Jobs/Civilian/reporter.yml | 21 ---------------- .../Roles/Jobs/Medical/psychologist.yml | 24 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml delete mode 100644 Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml b/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml deleted file mode 100644 index d0a35990d7..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml +++ /dev/null @@ -1,21 +0,0 @@ -- 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: - #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml deleted file mode 100644 index 5414430bf5..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml +++ /dev/null @@ -1,24 +0,0 @@ -- 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: - #- Stuff From f97a78e08130ff5055e8607e58c240ea28082819 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:19:37 +0100 Subject: [PATCH 13/17] i will maintain code integrity!! one file at a time! --- .../Loadouts/Jobs/SP14/Inmate/prison_chef.yml | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml index 5e647acb75..e69de29bb2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/SP14/Inmate/prison_chef.yml @@ -1,66 +0,0 @@ -# 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 From a120b59495147248df37e131d7db75a10404828c Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:29:20 +0100 Subject: [PATCH 14/17] this is a lesson in keeping better track of what files you change --- Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index acfbfe6be7..f5826b76bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -1,8 +1,8 @@ - type: job - id: PrisonLibrarian - name: job-name-prison-librarian - description: job-description-prison-librarian - playTimeTracker: JobPrisonLibrarian + id: Librarian + name: job-name-librarian + description: job-description-librarian + playTimeTracker: JobLibrarian startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop @@ -20,4 +20,5 @@ pocket2: HandLabeler # for making named bestsellers storage: back: + - BoxSurvival - BookRandom From 949cc9499ef5f601c70e72b10328cdaa8e23677c Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:52:28 +0100 Subject: [PATCH 15/17] lotta linter fixes --- .../Roles/Jobs/SP14/Infirmary/medical_director.yml | 2 +- Resources/Prototypes/Roles/play_time_trackers.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml index 815aac7cc7..2d8ef94621 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMedicalDirector requirements: - !type:RoleTimeRequirement - role: JobPSChemist + role: JobSPChemist time: 10800 #3 hrs - !type:RoleTimeRequirement role: JobInfirmaryDoctor diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index a782db7ac5..d3672fb75c 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -164,6 +164,9 @@ - type: playTimeTracker id: JobHeadOfMaintenance +- type: playTimeTracker + id: JobInfirmaryDoctor + - type: playTimeTracker id: JobInspector @@ -173,6 +176,9 @@ - type: playTimeTracker id: JobMaintenanceWorker +- type: playTimeTracker + id: JobMedicalDirector + - type: playTimeTracker id: JobPrisonChef @@ -191,9 +197,15 @@ - type: playTimeTracker id: JobSPChaplain +- type: playTimeTracker + id: JobSPChemist + - type: playTimeTracker id: JobSPClown +- type: playTimeTracker + id: JobSPPsychologist + - type: playTimeTracker id: JobSPReporter From d936b088408769422b8eeee1e7a89ef0d0fa8854 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 19:57:19 +0100 Subject: [PATCH 16/17] forgot Job before welfareofficer --- Resources/Prototypes/Roles/play_time_trackers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index d3672fb75c..a2c7a99da3 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -213,4 +213,4 @@ id: JobSPWarden - type: playTimeTracker - id: WelfareOfficer \ No newline at end of file + id: JobWelfareOfficer \ No newline at end of file From 2d38b505e0c432d619feea8e33fd2ae2d4ea8fe5 Mon Sep 17 00:00:00 2001 From: Truoizys Date: Tue, 9 Jul 2024 20:10:21 +0100 Subject: [PATCH 17/17] removed visitor from ss14_departments --- Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml b/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml index 070ad31236..e4c5135bf6 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/sp14_departments.yml @@ -8,7 +8,6 @@ - SPClown - WelfareOfficer - SPReporter - - Visitor - type: department id: SPCommand