diff --git a/Resources/Locale/en-US/_DV/job/department-desc.ftl b/Resources/Locale/en-US/_DV/job/department-desc.ftl index 4e19e50c340..8324ba63149 100644 --- a/Resources/Locale/en-US/_DV/job/department-desc.ftl +++ b/Resources/Locale/en-US/_DV/job/department-desc.ftl @@ -1,3 +1,4 @@ department-Epistemics-description = Research artifacts and anomalies to invent new equipment for the station, while trying to keep glimmer tame. department-Logistics-description = Complete bounties, earn Spesos and deliver useful supplies to the crew. department-Justice-description = Uphold justice on the station. +department-Incarcerated-description = Serving your sentence for past mistakes. diff --git a/Resources/Locale/en-US/_DV/job/department.ftl b/Resources/Locale/en-US/_DV/job/department.ftl index 43d9ad464bc..9f1860c4453 100644 --- a/Resources/Locale/en-US/_DV/job/department.ftl +++ b/Resources/Locale/en-US/_DV/job/department.ftl @@ -1,3 +1,4 @@ department-Epistemics = Epistemics department-Logistics = Logistics department-Justice = Justice +department-Incarcerated = Incarcerated diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 7357a9fd59c..e96b5eecf2a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -527,6 +527,11 @@ - sprite: *icon-rsi-dv # DeltaV - Sec Icon Resprite offset: *icon-offset state: Brigmedic + - type: IdCard # DeltaV + jobTitle: job-name-brigmedic + jobIcon: JobIconBrigmedic + - type: PresetIdCard # DeltaV - Puts them in the security department + job: Brigmedic - type: entity parent: SecurityIDCard @@ -896,6 +901,8 @@ - Recyclable - type: StaticPrice # these are infinitely producible. price: 0 + - type: PresetIdCard # DeltaV - Puts them in the correct department category + job: Prisoner - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index de161e8ddd8..4a7c831bb59 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -8,8 +8,10 @@ - CargoTechnician - Quartermaster - SalvageSpecialist - - Courier # DeltaV - Courier, see Resources/Prototypes/_DV/Roles/Jobs/Cargo/courier.yml - - CargoAssistant # DeltaV + # BEGIN DeltaV Logistics Jobs + - Courier + - CargoAssistant + # END DeltaV - type: department id: Civilian @@ -21,7 +23,6 @@ roles: - Bartender - Botanist - - Boxer # DeltaV - Keep Zookeeper/Boxer # - Chaplain # DeltaV - Move Chaplain into Epistemics - Chef - Clown @@ -34,11 +35,12 @@ - Passenger - Reporter - Visitor - - Zookeeper # DeltaV - Keep Zookeeper/Boxer - ServiceWorker - - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml - - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml + # BEGIN DeltaV Jobs + - Boxer + - MartialArtist + - Zookeeper + # END DeltaV - type: department id: CentralCommand @@ -112,8 +114,10 @@ - MedicalIntern - Psychologist - Paramedic - - MedicalBorg # Delta V - Medical Borg, see Resources/Prototypes/_DV/Roles/Jobs/Medical/medicalborg.yml - - Surgeon # Delta V - Surgeon, see Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml + # BEGIN DeltaV Med Jobs + - MedicalBorg + - Surgeon + # END DeltaV - type: department id: Security @@ -128,11 +132,13 @@ - SecurityOfficer - Detective - Warden - - PrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml - - Brigmedic # DeltaV - Brigmedic, see Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml - - SecurityBorg # Delta-V : Security Borg - - RoleLaika # Delta-V : Secdogs, see Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml - - RoleK9Officer # Delta-V : Secdogs, see Resources/Prototypes/_DV/Roles/Jobs/Security/k9.yml + # BEGIN DeltaV Sec Jobs + - Brigmedic + - PrisonGuard + - SecurityBorg + - RoleLaika + - RoleK9Officer + # END DeltaV - type: department id: Epistemics # DeltaV - Epistemics Department replacing Science @@ -144,10 +150,12 @@ - ResearchDirector - Scientist - ResearchAssistant - - Chaplain # DeltaV - Move Chaplain into Epistemics - - ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml - - Roboticist # DeltaV: Roboticist job - - Librarian # DeltaV - Move Librarian into epistemics as curator + # BEGIN DeltaV Epi Jobs + - Chaplain # Moved from Service into Epi + - ForensicMantis + - Librarian # Curator, moved from Service into Epi + - Roboticist + # END DeltaV - type: department id: Silicon @@ -156,24 +164,24 @@ color: "#D381C9" roles: - Borg - - MedicalBorg # DeltaV - roundstart mediborg job - - SecurityBorg # Delta-V : Security Borg - StationAi + # BEGIN DeltaV Silicon Jobs + - MedicalBorg + - SecurityBorg + # END DeltaV primary: false # DeltaV - removed from primary dept -- type: department - id: Specific - name: department-Specific - description: department-Specific-description - color: "#9FED58" - weight: 10 - roles: - - Boxer # DeltaV - Keep Zookeeper/Boxer - - Reporter - - Zookeeper # DeltaV - Keep Zookeeper/Boxer - - Psychologist - - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml - - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml - primary: false +# DeltaV - get rid of 'station-specific' as a department. All of these +# jobs are under another category, so all this does is list +# them twice in the job select and on the crew monitor. +# - type: department +# id: Specific +# name: department-Specific +# description: department-Specific-description +# color: "#9FED58" +# weight: 10 +# roles: +# - Reporter +# - Psychologist +# primary: false +# END DeltaV \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Roles/Jobs/departments.yml b/Resources/Prototypes/_DV/Roles/Jobs/departments.yml index 7e19210919b..55cba0ec8d0 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/departments.yml @@ -9,3 +9,13 @@ - Clerk - Prosecutor - Lawyer + +- type: department + id: Incarcerated + name: department-Incarcerated + description: department-Incarcerated-description + radioChannel: Security # Notifies security on late-join + color: "#3b3b3b" + roles: + - Prisoner + - Gladiator