diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index f58e560010..5054bc5eae 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -7,7 +7,7 @@ job-name-brigmedic = Corpsman job-name-borg = Cyborg job-name-scientist = Scientist job-name-research-assistant = Research Assistant -job-name-rd = Mystagogue +job-name-rd = Research Director job-name-psychologist = Psychologist job-name-intern = Medical Intern job-name-doctor = Medical Doctor @@ -83,7 +83,7 @@ JobPsychologist = Psychologist JobQuartermaster = Logistics Officer JobReporter = Reporter JobResearchAssistant = Research Assistant -JobResearchDirector = Mystagogue +JobResearchDirector = Research Director JobSalvageSpecialist = Salvage Specialist JobScientist = Scientist JobSecurityCadet = Security Cadet diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index 25a49f643e..2d8dab104e 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -4,12 +4,12 @@ job-supervisors-hop = the head of personnel job-supervisors-hos = the head of security job-supervisors-ce = the chief engineer job-supervisors-cmo = the chief medical officer -job-supervisors-rd = the mystagogue +job-supervisors-rd = the research director job-supervisors-qm = the logistics officer job-supervisors-service = chefs, botanists, the bartender, and the head of personnel job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer job-supervisors-medicine = medical doctors, chemists, and the chief medical officer job-supervisors-security = security officers, the warden, and the head of security -job-supervisors-science = scientists, and the mystagogue +job-supervisors-science = scientists, and the research director job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index e4341e7be3..543643f826 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -11,7 +11,7 @@ stamp-component-stamped-name-approved = APPROVED stamp-component-stamped-name-hop = Head of Personnel stamp-component-stamped-name-hos = Head of Security stamp-component-stamped-name-qm = Logistics Officer -stamp-component-stamped-name-rd = Mystagogue +stamp-component-stamped-name-rd = Research Director stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index fcde748213..c8d94bf9a8 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -13,7 +13,7 @@ id-card-access-level-chief-engineer = Chief Engineer id-card-access-level-engineering = Engineering id-card-access-level-atmospherics = Atmospherics -id-card-access-level-research-director = Mystagogue +id-card-access-level-research-director = Research Director id-card-access-level-research = Research id-card-access-level-chief-medical-officer = Chief Medical Officer diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 0751582e3d..b1ca15a035 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -326,6 +326,7 @@ - CHEMISTS - CHIEF ENGINEERS - CHIEF MEDICAL OFFICERS + - RESEARCH DIRECTORS - CLOWNS - CREW-MEMBERS - CYBORGS @@ -346,7 +347,7 @@ - LOGISTICS OFFICERS # End of modified code # DeltaV - Epistemics Department - Replace Research Director with Mystagogue - - MYSTAGOGUES + # - MYSTAGOGUES # End of modified code - ROBOTICISTS - SALVAGE SPECIALISTS diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 20a42d721f..c49ebc8da2 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -440,15 +440,14 @@ - type: entity id: SpawnPointResearchDirector parent: SpawnPointJobBase - name: mystagogue # DeltaV - Epistemics Department replacing Science + name: research director components: - type: SpawnPoint job_id: ResearchDirector - type: Sprite layers: - state: green - - sprite: DeltaV/Markers/jobs.rsi # DeltaV - Epistemics new labcoats - state: mystagogue + state: rd - type: entity id: SpawnPointSeniorResearcher diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 706cbd5dbb..d2e9a8db61 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -589,7 +589,7 @@ - type: entity parent: BasePDA id: RnDPDA - name: mystagogue PDA # DeltaV - Epistemics Department replacing Science + name: research director PDA description: It appears surprisingly ordinary. components: - type: Pda @@ -611,7 +611,7 @@ - type: entity parent: BasePDA id: SciencePDA - name: epistemics PDA # DeltaV - Epistemics Department replacing Science + name: science PDA description: It's covered with an unknown gooey substance. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index b68257083c..456675bbe2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -319,10 +319,10 @@ - type: entity parent: DefaultStationBeaconScience id: DefaultStationBeaconRDRoom - suffix: MG's Room + suffix: RD's Room components: - type: NavMapBeacon - text: station-beacon-mystagogue #Delta V - Renamed + text: station-beacon-research-director - type: entity parent: DefaultStationBeaconScience diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 04bf66dad6..99146dff17 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -22,12 +22,12 @@ - Maintenance - ResearchDirector - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml - - Chapel # DeltaV - Chaplain is in Epistemics + # - Chapel # DeltaV - Chaplain is in Epistemics - Cryogenics special: # Nyanotrasen - Mystagogue can use the Bible - !type:AddComponentSpecial components: - - type: BibleUser # Nyano - Lets them heal with bibles + # - type: BibleUser # Nyano - Lets them heal with bibles - type: Psionic # Nyano - They start with telepathic chat - type: DispelPower # Nyano - They get the Dispel psionic power on spawn - !type:AddImplantSpecial