From ce556f4dfd2562ecc242e2eb32dfb34e5cf8b023 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 18:40:56 +0200 Subject: [PATCH 01/13] RD to Mystagogue --- Resources/Locale/en-US/job/job-names.ftl | 4 ++-- Resources/Locale/en-US/job/job-supervisors.ftl | 4 ++-- Resources/Locale/en-US/paper/stamp-component.ftl | 2 +- Resources/Locale/en-US/prototypes/access/accesses.ftl | 2 +- .../Prototypes/Catalog/Fills/Lockers/suit_storage.yml | 9 ++++----- .../Prototypes/Entities/Clothing/Ears/headsets_alt.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/hoods.yml | 2 +- Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- Resources/Prototypes/Entities/Clothing/Neck/mantles.yml | 2 +- .../Entities/Clothing/OuterClothing/wintercoats.yml | 2 +- .../Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 4 ++-- .../Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/figurines.yml | 2 +- .../Entities/Objects/Misc/identification_cards.yml | 2 +- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 +- .../Structures/Storage/Closets/Lockers/lockers.yml | 2 +- .../Entities/Structures/Wallmounts/Signs/posters.yml | 2 +- Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml | 4 ++-- Resources/ServerInfo/Guidebook/Jobs.xml | 4 ++-- Resources/ServerInfo/Guidebook/Science/Science.xml | 2 +- 21 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 32194efe7c2..03d4cebc2e0 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 = Brigmedic job-name-borg = Cyborg job-name-scientist = Scientist job-name-research-assistant = Research Assistant -job-name-rd = Research Director +job-name-rd = Mystagogue job-name-psychologist = Psychologist job-name-intern = Medical Intern job-name-doctor = Medical Doctor @@ -86,7 +86,7 @@ JobPsychologist = Psychologist JobQuartermaster = Head of Logistics JobReporter = Reporter JobResearchAssistant = Research Assistant -JobResearchDirector = Research Director +JobResearchDirector = Mystagogue 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 5591e8dfa0d..92f78144dec 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 research director +job-supervisors-rd = the mystagogue job-supervisors-qm = the head of logistics job-supervisors-service = chefs, botanists, the bartender, and the head of personnel job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer job-supervisors-security = security officers, the senior officer, the warden, and the head of security -job-supervisors-science = scientists, the senior researcher, and the research director +job-supervisors-science = scientists, and the mystagogue 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 25930b9dfd1..e4f7027b5a8 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -10,7 +10,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 = Head of Logistics -stamp-component-stamped-name-rd = Research Director +stamp-component-stamped-name-rd = Mystagogue 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 3af016aa818..1735afeea9b 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -12,7 +12,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 = Research Director +id-card-access-level-research-director = Mystagogue id-card-access-level-research = Research id-card-access-level-chief-medical-officer = Chief Medical Officer diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 09afc383495..ac296fafcbf 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -39,7 +39,7 @@ - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath - + #Prisoner EVA - type: entity id: SuitStorageEVAPrisoner @@ -80,7 +80,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas - + #NTSRA Voidsuit - type: entity id: SuitStorageNTSRA @@ -93,7 +93,7 @@ - id: ClothingOuterHardsuitAncientEVA - id: ClothingHeadHelmetAncient - id: ClothingMaskBreath - + #HARDSUITS #Basic hardsuit - type: entity @@ -180,7 +180,7 @@ - type: entity id: SuitStorageRD parent: SuitStorageBase - suffix: Research Director + suffix: Mystagogue # Nyanotrasen - Epistemics Department replacing Science components: - type: StorageFill contents: @@ -282,4 +282,3 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 2f7a33fbd2e..27597d53f9a 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -116,7 +116,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltScience - name: research director's over-ear headset + name: mystagogue's over-ear headset # Nyanotrasen - Epistemics Department replacing Science components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 290949a1bdf..32fb810229b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -393,7 +393,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD noSpawn: true - name: research director's coat hood + name: mystagogue's coat hood # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f1296f657e1..9b8f372c765 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -37,7 +37,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakRd - name: research director's cloak + name: mystagogue's cloak # Nyanotrasen - Epistemics Department replacing Science description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index cb8e283859c..70fc084b35e 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -56,7 +56,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckMantleRD - name: research director's mantle + name: mystagogue's mantle # Nyanotrasen - Epistemics Department replacing Science description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from logistics; this mantle will keep you comfy. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 45d2f17d7c5..9a4d8c5a1f2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -335,7 +335,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterRD - name: research director's winter coat + name: mystagogue's winter coat # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 9a52bb24eff..93c01b1a222 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -306,8 +306,8 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtResearchDirector - name: research director's turtleneck - description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. + name: mystagogue's turtleneck # Nyanotrasen - Epistemics Department replacing Science + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 35added3a62..84c7bf68dbf 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -467,8 +467,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector - name: research director's turtleneck - description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. + name: mystagogue's turtleneck # Nyanotrasen - Epistemics Department replacing Science + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index af92babab53..179c5096d1c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -558,7 +558,7 @@ - type: entity parent: BasePDA id: RnDPDA - name: research director PDA + name: mystagogue PDA # Nyanotrasen - Epistemics Department replacing Science description: It appears surprisingly ordinary. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index bcd70802769..9774f45643a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -202,7 +202,7 @@ - type: entity parent: BaseFigurine id: ToyFigurineResearchDirector - name: research director figure + name: mystagogue figure # Nyanotrasen - Epistemics Department replacing Science description: A figurine depicting the glorious head of the Science department. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index b0a69a944ae..cf1c2f03465 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -386,7 +386,7 @@ - type: entity parent: IDCardStandard id: RDIDCard - name: research director ID card + name: mystagogue ID card # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 14d0df85e13..e2edbd35529 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -619,7 +619,7 @@ state: stamp-qm - type: entity - name: research director's rubber stamp + name: mystagogue's rubber stamp # Nyanotrasen - Epistemics Department replacing Science parent: RubberStampBase id: RubberStampRd suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 798a5422158..69c7ad88f52 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -258,7 +258,7 @@ - type: entity id: LockerResearchDirector parent: LockerBase - name: research director's locker + name: mystagogue's locker # Nyanotrasen - Epistemics Department replacing Science components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 5306273a645..3f927568fcc 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -216,7 +216,7 @@ parent: PosterBase id: PosterContrabandLamarr name: "Lamarr" - description: "This poster depicts Lamarr. Probably made by a traitorous Research Director." + description: "This poster depicts Lamarr. Probably made by a traitorous Mystagogue." # Nyanotrasen - Epistemics Department replacing Science components: - type: Sprite state: poster19_contraband diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 002ee56d115..7ee25ba2058 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -58,11 +58,11 @@ - - Steal the Research Director's [color=#a4885c]Hardsuit[/color]. + - Steal the Mystagogue's [color=#a4885c]Hardsuit[/color]. - - Steal the Research Director's [color=#a4885c]Hand Teleporter[/color]. + - Steal the Mystagogue's [color=#a4885c]Hand Teleporter[/color]. diff --git a/Resources/ServerInfo/Guidebook/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml index 2729efedf7f..95534eddbe2 100644 --- a/Resources/ServerInfo/Guidebook/Jobs.xml +++ b/Resources/ServerInfo/Guidebook/Jobs.xml @@ -24,7 +24,7 @@ Medical consists of the medical interns, chemists, medical doctors, and the chie Medical is one of the more well-equipped departments, with the ability to locate injured crew using the crew monitor, a nigh infinite supply of chems should chemistry be on-par, and the ability to rapidly diagnose and vaccinate contagious diseases. ## Science -Science consists of research assistants, scientists, and the research director. As a department it is responsible for researching technologies and artifacts, upgrading machines, and printing new and useful devices. +Science consists of research assistants, scientists, and the mystagogue. As a department it is responsible for researching technologies and artifacts, upgrading machines, and printing new and useful devices. Scientists should seek out new artifacts to study, as well as solicit departments to help upgrade their machines. @@ -34,7 +34,7 @@ Engineering consists of technical assistants, station engineers, atmospheric tec Engineering is readily equipped to go safely into space, and as such they should always attempt to repair uninhabitable parts of the station. ## Command -Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the research director, and the head of logistics. As a department it is responsible for keeping the station and its departments running efficiently. +Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the mystagogue, and the head of logistics. As a department it is responsible for keeping the station and its departments running efficiently. Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work. diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml index 8a0c9f09f1e..71add332d11 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -29,7 +29,7 @@ Each Discipline tree has up to 3 tiers of technologies. At the start the only ti In order to progress further, you have to research up to [color=brown]75%[/color] of the current tier to move to the next one. So in order to unlock T2 researches you need to research 75% of T1. -Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless... you find some other way around it, probably should ask your [color=purple]Research Director[/color]. +Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless... you find some other way around it, probably should ask your [color=purple]Mystagogue[/color]. ## Lathes From 07e993028eb4500f0ca310beb9d29c58a60bb289 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 19:29:13 +0200 Subject: [PATCH 02/13] Science to Epistemics --- Resources/Locale/en-US/guidebook/guides.ftl | 2 +- Resources/Locale/en-US/headset/headset-component.ftl | 2 +- Resources/Locale/en-US/job/department.ftl | 2 +- Resources/Locale/en-US/job/job-description.ftl | 4 ++-- .../conditions/steal-research-condition.ftl | 2 +- .../catalog/fills/crates/emergency-crates.ftl | 2 +- .../catalog/fills/crates/science-crates.ftl | 2 +- Resources/Prototypes/Catalog/Fills/Boxes/general.yml | 2 +- .../Catalog/Fills/Lockers/suit_storage.yml | 2 +- Resources/Prototypes/Datasets/tips.yml | 6 +++--- .../Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- .../Prototypes/Entities/Clothing/Back/duffel.yml | 2 +- .../Prototypes/Entities/Clothing/Back/satchel.yml | 2 +- .../Prototypes/Entities/Clothing/Ears/headsets.yml | 4 ++-- .../Entities/Clothing/Ears/headsets_alt.yml | 2 +- .../Prototypes/Entities/Clothing/Head/hoods.yml | 4 ++-- .../Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- .../Prototypes/Entities/Clothing/Neck/mantles.yml | 2 +- .../Prototypes/Entities/Clothing/Neck/medals.yml | 4 ++-- .../Entities/Clothing/OuterClothing/bio.yml | 2 +- .../Entities/Clothing/OuterClothing/wintercoats.yml | 4 ++-- .../Entities/Clothing/Uniforms/jumpskirts.yml | 6 +++--- .../Entities/Clothing/Uniforms/jumpsuits.yml | 6 +++--- .../Prototypes/Entities/Markers/Spawners/corpses.yml | 2 +- .../Prototypes/Entities/Markers/Spawners/jobs.yml | 2 +- .../Prototypes/Entities/Mobs/Corpses/corpses.yml | 2 +- .../Entities/Objects/Consumable/Food/Baked/bread.yml | 2 +- .../Entities/Objects/Devices/encryption_keys.yml | 4 ++-- .../Prototypes/Entities/Objects/Devices/pda.yml | 4 ++-- .../Prototypes/Entities/Objects/Fun/figurines.yml | 4 ++-- .../Entities/Objects/Misc/identification_cards.yml | 2 +- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 +- .../Entities/Structures/Decoration/banners.yml | 4 ++-- .../Entities/Structures/Doors/Airlocks/access.yml | 12 ++++++------ .../Entities/Structures/Doors/Airlocks/airlocks.yml | 4 ++-- .../Entities/Structures/Doors/Windoors/windoor.yml | 2 +- .../Machines/surveillance_camera_routers.yml | 2 +- .../Structures/Storage/Closets/Lockers/lockers.yml | 2 +- .../Entities/Structures/Storage/Closets/wardrobe.yml | 2 +- .../Entities/Structures/Storage/Crates/crates.yml | 4 ++-- .../Entities/Structures/Wallmounts/Signs/posters.yml | 2 +- .../Entities/Structures/Wallmounts/intercom.yml | 2 +- .../Structures/Wallmounts/surveillance_camera.yml | 2 +- 43 files changed, 65 insertions(+), 65 deletions(-) diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index a061a4b84e1..aec8e89f945 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -33,7 +33,7 @@ guide-entry-medicine = Medicine guide-entry-botanicals = Botanicals guide-entry-cloning = Cloning guide-entry-cryogenics = Cryogenics -guide-entry-science = Science +guide-entry-science = Epistemics guide-entry-anomalous-research = Anomalous Research guide-entry-scanners-and-vessels = Scanners and Vessels guide-entry-ape = A.P.E. diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 5dad1389be3..04dffc932d2 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -9,7 +9,7 @@ chat-radio-centcom = CentCom chat-radio-command = Command chat-radio-engineering = Engineering chat-radio-medical = Medical -chat-radio-science = Science +chat-radio-science = Epistemics chat-radio-security = Security chat-radio-service = Service chat-radio-supply = Supply diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 43f4bb1f4e4..012b1f640da 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -4,5 +4,5 @@ department-Command = Command department-Engineering = Engineering department-Medical = Medical department-Security = Security -department-Science = Science +department-Science = Epistemics 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 bc27f7fbca2..0757f355809 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -2,7 +2,7 @@ job-description-technical-assistant = Learn the basics of managing the station's job-description-atmostech = Optimize the station's atmospherics setup, and synthesize rare gases to use or sell. job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories. job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained. -job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the science team for upgrades. +job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the epistemics team for upgrades. 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. @@ -35,7 +35,7 @@ job-description-musician = Entertain the crew with your unique musical talent, a job-description-passenger = Enjoy your stay aboard the station with no obligations! 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. +job-description-rd = Manage the epistemics department, unlocking technologies, acquiring & researching artifacts, and performing experiments. job-description-research-assistant = Learn the basics of how to research various artifacts and anomalies. job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras and the radio. Currently available on Bagel Station and Core. job-description-salvagespec = Use the salvage magnet to draw in derelicts & asteroids to loot and enrich the station, and fight off any space fauna along the way. diff --git a/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl b/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl index a9a820c3c5f..3527972b360 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl @@ -1,2 +1,2 @@ objective-condition-steal-research-title = Steal {$count} technologies. -objective-condition-steal-research-description = Your gloves can be used to hack a research server and steal its precious data. If science has been slacking you'll have to get to work. +objective-condition-steal-research-description = Your gloves can be used to hack a research server and steal its precious data. If epistemics has been slacking you'll have to get to work. diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/emergency-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/emergency-crates.ftl index 7d1a71016c2..83ab1c23609 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/emergency-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/emergency-crates.ftl @@ -1,5 +1,5 @@ ent-CrateEmergencyExplosive = Bomb suit crate - .desc = Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included) + .desc = Epistemics gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included) ent-CrateEmergencyFire = Firefighting crate .desc = Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats! diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/science-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/science-crates.ftl index 91fd4d6cab4..10c54fed976 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/science-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/science-crates.ftl @@ -1,2 +1,2 @@ ent-CrateScienceBiosuit = scientist bio suit crate - .desc = Contains 2 biohazard suits to ensure that no disease will distract you from doing science. Requires Science access to open. + .desc = Contains 2 biohazard suits to ensure that no disease will distract you from doing science. Requires Epistemics access to open. diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index c011493cfc1..d82ae5c20f2 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -350,7 +350,7 @@ amount: 6 - type: entity - name: science encryption key box + name: epistemics encryption key box # DeltaV - Epistemics Department replacing Science parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyScience components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index ac296fafcbf..5c464f9156e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -180,7 +180,7 @@ - type: entity id: SuitStorageRD parent: SuitStorageBase - suffix: Mystagogue # Nyanotrasen - Epistemics Department replacing Science + suffix: Mystagogue # DeltaV - Epistemics Department replacing Science components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 7217ee3eb11..4b8fae9a15e 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -44,9 +44,9 @@ - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be weary that it isn't very effective." - "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." - - "As a Salvage Technician, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" + - "As a Salvage Technician, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." - - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." + - "As a Cargo Technician, consider asking epistemics for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." @@ -73,7 +73,7 @@ - "As a Medical Doctor, try to be weary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!" - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch." - "As a Medical Doctor, excise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine." - - "As a Medical Doctor, remember that your health analyzer has a replacable battery. If it drains too quickly for your taste, you can ask science to print a better battery for you!" + - "As a Medical Doctor, remember that your health analyzer has a replacable battery. If it drains too quickly for your taste, you can ask epistemics to print a better battery for you!" - "As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine?" - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients." - "Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!" diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index e8c61238ba1..54f52c95738 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -135,7 +135,7 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackScience - name: science backpack + name: epistemics backpack # DeltaV - Epistemics Department replacing Science description: A backpack specially designed to repel stains and hazardous liquids. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 99a23978a6e..94eedead436 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -121,7 +121,7 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelScience - name: science duffel bag + name: epistemics duffel bag # DeltaV - Epistemics Department replacing Science description: A large duffel bag for holding extra science related goods. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 5b72fae5d8d..e851c4cc498 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -94,7 +94,7 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelScience - name: science satchel + name: epistemics satchel # DeltaV - Epistemics Department replacing Science description: Useful for holding research materials. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index a01d16a636c..f9d5fa3f05e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -165,8 +165,8 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetScience - name: science headset - description: A sciency headset. Like usual. + name: epistemics headset # Nyanotrasen - Epistemics Department replacing Science + description: A sciency headset. Like usual. # Nyanotrasen - Epistemics Department replacing Science components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 27597d53f9a..4949199bc18 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -116,7 +116,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltScience - name: mystagogue's over-ear headset # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's over-ear headset # DeltaV - Epistemics Department replacing Science components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 32fb810229b..0c85305d2ee 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -42,7 +42,7 @@ parent: ClothingHeadHatHoodBioGeneral id: ClothingHeadHatHoodBioScientist name: bio hood - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science description: A hood that protects the head and face from biological contaminants. components: - type: Sprite @@ -393,7 +393,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD noSpawn: true - name: mystagogue's coat hood # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's coat hood # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 9b8f372c765..58a94642a74 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -37,7 +37,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakRd - name: mystagogue's cloak # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's cloak # DeltaV - Epistemics Department replacing Science description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 70fc084b35e..83ba6603f8b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -56,7 +56,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckMantleRD - name: mystagogue's mantle # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's mantle # DeltaV - Epistemics Department replacing Science description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from logistics; this mantle will keep you comfy. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 36398ac3c21..3f712feb4b3 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -57,8 +57,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckSciencemedal - name: science medal - description: Given for the best work in the science department. + name: epistemics medal # DeltaV - Epistemics Department replacing Science + description: Given for the best work in the epistemics department. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Neck/Medals/sciencemedal.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index fec4d4df6c7..292c5e8986a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -42,7 +42,7 @@ parent: ClothingOuterBioGeneral id: ClothingOuterBioScientist name: bio suit - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science description: A suit that protects against biological contamination, in Scientist colors. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 9a4d8c5a1f2..6fd41ab6f6c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -335,7 +335,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterRD - name: mystagogue's winter coat # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's winter coat # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi @@ -366,7 +366,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterSci - name: science winter coat + name: epistemics winter coat # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 93c01b1a222..4678134a64b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -306,8 +306,8 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtResearchDirector - name: mystagogue's turtleneck # Nyanotrasen - Epistemics Department replacing Science - description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi @@ -742,7 +742,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSeniorResearcher name: senior researcher jumpskirt - description: A sign of skill and prestige within the science department. + description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 84c7bf68dbf..4e840680897 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -467,8 +467,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector - name: mystagogue's turtleneck # Nyanotrasen - Epistemics Department replacing Science - description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi @@ -1242,7 +1242,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit - description: A sign of skill and prestige within the science department. + description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml index a630cbed10b..4fb7ef0eafd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml @@ -64,7 +64,7 @@ - MobRandomMedicCorpse - type: entity - name: Random Science Corpse Spawner + name: Random Epistemics Corpse Spawner # DeltaV - Epistemics Department replacing Science id: RandomScienceCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 5d948443757..b1d93bdde99 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -423,7 +423,7 @@ - type: entity id: SpawnPointResearchDirector parent: SpawnPointJobBase - name: researchdirector + name: mystagogue # DeltaV - Epistemics Department replacing Science components: - type: SpawnPoint job_id: ResearchDirector diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 922bd4c4c86..abb5b3eaa7e 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -54,7 +54,7 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomScienceCorpse - suffix: Dead, Science + suffix: Dead, Epistemics # DeltaV - Epistemics Department replacing Science components: - type: Loadout prototypes: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 02c5b33d939..4b49bd1c403 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -681,7 +681,7 @@ name: jelly toast parent: FoodBreadSliceBase id: FoodBreadJellySlice - description: As if science are gonna give up their slimes for toast! + description: As if epistemics are gonna give up their slimes for toast! # DeltaV - Epistemics Department replacing Science components: - type: FlavorProfile flavors: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index b8f710e3156..a100f36a9b6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -126,7 +126,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeyMedicalScience - name: med-sci encryption key + name: med-epi encryption key # DeltaV - Epistemics Department replacing Science description: An encryption key used by someone who hasn't decided which side to take. components: - type: EncryptionKey @@ -142,7 +142,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeyScience - name: science encryption key + name: epistemics encryption key # DeltaV - Epistemics Department replacing Science description: An encryption key used by scientists. Maybe it is plasmaproof? components: - type: EncryptionKey diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 179c5096d1c..04dab068aea 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -558,7 +558,7 @@ - type: entity parent: BasePDA id: RnDPDA - name: mystagogue PDA # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue PDA # DeltaV - Epistemics Department replacing Science description: It appears surprisingly ordinary. components: - type: Pda @@ -574,7 +574,7 @@ - type: entity parent: BasePDA id: SciencePDA - name: science PDA + name: epistemics PDA # DeltaV - Epistemics Department replacing Science description: It's covered with an unknown gooey substance. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 9774f45643a..d3e89325162 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -202,8 +202,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineResearchDirector - name: mystagogue figure # Nyanotrasen - Epistemics Department replacing Science - description: A figurine depicting the glorious head of the Science department. + name: mystagogue figure # DeltaV - Epistemics Department replacing Science + description: A figurine depicting the glorious head of the Epistemics department. # DeltaV - Epistemics Department replacing Science components: - type: Sprite state: rd diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index cf1c2f03465..b54eac42542 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -386,7 +386,7 @@ - type: entity parent: IDCardStandard id: RDIDCard - name: mystagogue ID card # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue ID card # DeltaV - Epistemics Department replacing Science components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index e2edbd35529..69a66a55e19 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -619,7 +619,7 @@ state: stamp-qm - type: entity - name: mystagogue's rubber stamp # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's rubber stamp # DeltaV - Epistemics Department replacing Science parent: RubberStampBase id: RubberStampRd suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index 4198c08b63c..be286c6309c 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -90,8 +90,8 @@ - type: entity id: BannerScience parent: BannerBase - name: science banner - description: A banner displaying the colors of the science department. Where stupidity is proven greater than the universe. + name: epistemics banner # DeltaV - Epistemics Department replacing Science + description: A banner displaying the colors of the epistemics department. Where stupidity is proven greater than the universe. # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Structures/Decoration/banner.rsi diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 5031e216c44..a0e4c60248f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -186,7 +186,7 @@ - type: entity parent: AirlockScience id: AirlockScienceLocked - suffix: Science, Locked + suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"]] @@ -194,7 +194,7 @@ - type: entity parent: AirlockScience id: AirlockMedicalScienceLocked - suffix: Medical/Science, Locked + suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"], ["Medical"]] @@ -461,7 +461,7 @@ - type: entity parent: AirlockScienceGlass id: AirlockScienceGlassLocked - suffix: Science, Locked + suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"]] @@ -469,7 +469,7 @@ - type: entity parent: AirlockScienceGlass id: AirlockMedicalScienceGlassLocked - suffix: Medical/Science, Locked + suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"], ["Medical"]] @@ -734,7 +734,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintRnDLocked - suffix: Science, Locked + suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"]] @@ -742,7 +742,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintRnDMedLocked - suffix: Medical/Science, Locked + suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"], ["Medical"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 0adcc502937..ecfcf03fccc 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -59,7 +59,7 @@ - type: entity parent: Airlock id: AirlockScience - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/science.rsi @@ -206,7 +206,7 @@ - type: entity parent: AirlockGlass id: AirlockScienceGlass - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/science.rsi diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index dfa7dece81f..cee7e6d2a70 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -202,7 +202,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureScienceLocked - suffix: Science, Locked + suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science components: - type: AccessReader access: [["Research"]] diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml index 1eeaec9b7c6..e359db813f6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml @@ -58,7 +58,7 @@ - type: entity parent: SurveillanceCameraRouterBase id: SurveillanceCameraRouterScience - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science components: - type: SurveillanceCameraRouter subnetFrequency: SurveillanceCameraScience diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 69c7ad88f52..a2152cfacbb 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -258,7 +258,7 @@ - type: entity id: LockerResearchDirector parent: LockerBase - name: mystagogue's locker # Nyanotrasen - Epistemics Department replacing Science + name: mystagogue's locker # DeltaV - Epistemics Department replacing Science components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml index a7765c51ec9..f5931130558 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -221,7 +221,7 @@ - type: entity id: WardrobeScience parent: WardrobeWhite - name: science wardrobe + name: epistemics wardrobe # DeltaV - Epistemics Department replacing Science - type: entity id: WardrobeBotanist diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 0221b2b61ac..2c6c5db0104 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -105,7 +105,7 @@ - type: entity parent: CrateGenericSteel id: CrateScience - name: science crate + name: epistemics crate # DeltaV - Epistemics Department replacing Science components: - type: Icon sprite: Structures/Storage/Crates/science.rsi @@ -226,7 +226,7 @@ - type: entity parent: CrateBaseSecure id: CrateScienceSecure - name: secure science crate + name: secure epistemics crate # DeltaV - Epistemics Department replacing Science components: - type: Icon sprite: Structures/Storage/Crates/scicrate_secure.rsi diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 3f927568fcc..40d643f9124 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -216,7 +216,7 @@ parent: PosterBase id: PosterContrabandLamarr name: "Lamarr" - description: "This poster depicts Lamarr. Probably made by a traitorous Mystagogue." # Nyanotrasen - Epistemics Department replacing Science + description: "This poster depicts Lamarr. Probably made by a traitorous Mystagogue." # DeltaV - Epistemics Department replacing Science components: - type: Sprite state: poster19_contraband diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 59409f41325..3a4670a10d1 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -164,7 +164,7 @@ - type: entity id: IntercomScience parent: Intercom - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science components: - type: Intercom supportedChannels: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index fcdf92dab5c..4e6780f6bb9 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -119,7 +119,7 @@ parent: SurveillanceCameraBase id: SurveillanceCameraScience name: camera - suffix: Science + suffix: Epistemics # DeltaV - Epistemics Department replacing Science components: - type: DeviceNetwork deviceNetId: Wired From a39e69b289768d362e1bd98d17899e6575a71307 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 19:38:58 +0200 Subject: [PATCH 03/13] fix --- Resources/Prototypes/Entities/Clothing/Ears/headsets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index f9d5fa3f05e..61d277e613b 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -165,8 +165,8 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetScience - name: epistemics headset # Nyanotrasen - Epistemics Department replacing Science - description: A sciency headset. Like usual. # Nyanotrasen - Epistemics Department replacing Science + name: epistemics headset # DeltaV - Epistemics Department replacing Science + description: A sciency headset. Like usual. # DeltaV - Epistemics Department replacing Science components: - type: ContainerFill containers: From b0ac20520cdfe72218de18de0ee3af8826832e68 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 22:17:45 +0200 Subject: [PATCH 04/13] Delete steal-research-condition.ftl --- .../en-US/objectives/conditions/steal-research-condition.ftl | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl diff --git a/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl b/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl deleted file mode 100644 index 3527972b360..00000000000 --- a/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl +++ /dev/null @@ -1,2 +0,0 @@ -objective-condition-steal-research-title = Steal {$count} technologies. -objective-condition-steal-research-description = Your gloves can be used to hack a research server and steal its precious data. If epistemics has been slacking you'll have to get to work. From 01f62ea50f99554c135991565aac5dcd40d85232 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 00:45:39 +0200 Subject: [PATCH 05/13] Remove duplicate headset Those were simply renamed in the base files --- .../Entities/Clothing/Ears/headsets.yml | 49 ------------------- .../Entities/Clothing/OuterClothing/robes.yml | 2 +- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Ears/headsets.yml index af7ebec28a5..3c5565abb21 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Ears/headsets.yml @@ -1,52 +1,3 @@ -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetEpistemics - name: epistemics headset - description: Faithfully recreates the true essence of remote sound waves. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyScience - - EncryptionKeyCommon - - type: Sprite - sprite: Clothing/Ears/Headsets/science.rsi - - type: Clothing - sprite: Clothing/Ears/Headsets/science.rsi - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetMystagogue - name: mystagogue headset - description: Still useful to someone with psychic powers. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyScience - - EncryptionKeyCommand - - EncryptionKeyCommon - - type: Sprite - sprite: Clothing/Ears/Headsets/science.rsi - - type: Clothing - sprite: Clothing/Ears/Headsets/science.rsi - -- type: entity - parent: ClothingHeadsetAlt - id: ClothingHeadsetAltMystagogue - name: epistemics over-ear headset - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyScience - - EncryptionKeyCommand - - EncryptionKeyCommon - - type: Sprite - sprite: Clothing/Ears/Headsets/science.rsi - - type: Clothing - sprite: Clothing/Ears/Headsets/science.rsi - - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetMantis diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml index 291f2c5c4eb..34559ab7f55 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml @@ -14,7 +14,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterRobeBrown - name: Brown Robe + name: brown robe description: This doesn't look creepy at all. components: - type: Sprite From 3e7c0f5d16f12203407c8272e4f8d6ea5228e1e5 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 01:29:26 +0200 Subject: [PATCH 06/13] coats and mysta hat --- .../Entities/Clothing/OuterClothing/coats.yml | 6 ++-- .../Entities/Clothing/Head/hats.yml | 2 +- .../Entities/Clothing/OuterClothing/coats.yml | 15 ++++++++++ .../Entities/Clothing/OuterClothing/robes.yml | 26 ------------------ .../Roles/Jobs/Science/research_director.yml | 5 ++-- .../epi.rsi}/equipped-OUTERCLOTHING.png | Bin .../white.rsi => Coats/epi.rsi}/icon.png | Bin .../mystic.rsi => Coats/epi.rsi}/meta.json | 0 .../mysta.rsi}/equipped-OUTERCLOTHING.png | Bin .../mystic.rsi => Coats/mysta.rsi}/icon.png | Bin .../white.rsi => Coats/mysta.rsi}/meta.json | 0 11 files changed, 22 insertions(+), 32 deletions(-) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/white.rsi => Coats/epi.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/white.rsi => Coats/epi.rsi}/icon.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/mystic.rsi => Coats/epi.rsi}/meta.json (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/mystic.rsi => Coats/mysta.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/mystic.rsi => Coats/mysta.rsi}/icon.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/{Robes/white.rsi => Coats/mysta.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index a7c3a553384..251c024b304 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -166,13 +166,13 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatRnd - name: scientist lab coat + name: epistemics lab coat # DeltaV - Epistemics Department replacing Science description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. components: - type: Sprite - sprite: Clothing/OuterClothing/Coats/rndcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/epi.rsi # DeltaV - Epistemic lab coat - type: Clothing - sprite: Clothing/OuterClothing/Coats/rndcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/epi.rsi # DeltaV - Epistemic lab coat - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 9741a6a7fa2..b716c001681 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHoodMystic - name: mystic hood + name: mystagogue's hat description: To contain a very wise head. components: - type: Sprite diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml index 4a98122ad91..d798f75d414 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml @@ -17,3 +17,18 @@ Heat: 0.8 - type: TemperatureProtection coefficient: 0.3 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatRndMysta + name: mystagogue lab coat + description: Similar to the standard model but with more purple and gold. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/mysta.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/mysta.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml index 34559ab7f55..40116418b88 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml @@ -1,16 +1,3 @@ -- type: entity - parent: ClothingOuterBase - id: ClothingOuterRobeWhite - name: epistemics labcoat - description: A standard Epistemics labcoat. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Robes/white.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Robes/white.rsi - - type: TemperatureProtection - coefficient: 0.2 - - type: entity parent: ClothingOuterBase id: ClothingOuterRobeBrown @@ -24,19 +11,6 @@ - type: TemperatureProtection coefficient: 0.2 -- type: entity - parent: ClothingOuterBase - id: ClothingOuterRobeMystic - name: mystagogue labcoat - description: The mystagogue's flashy labcoat. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Robes/mystic.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Robes/mystic.rsi - - type: TemperatureProtection - coefficient: 0.2 - - type: entity parent: ClothingOuterBase id: ClothingOuterRobeTechPriest diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b5ad3292e90..1ef31a5b642 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -8,7 +8,7 @@ department: Science time: 36000 #10 hrs - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 144000 #40 hrs weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" @@ -27,7 +27,8 @@ jumpsuit: ClothingUniformJumpsuitResearchDirector back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown - outerClothing: ClothingOuterCoatRnd + head: ClothingHeadHoodMystic # DeltaV - Mystagogue new hat + outerClothing: ClothingOuterCoatRndMysta # DeltaV - Mystagogue new coat id: RnDPDA ears: ClothingHeadsetRD innerclothingskirt: ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/meta.json From c52b7b43e6760ace5187b0b66af90883b7f0ad64 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 01:39:01 +0200 Subject: [PATCH 07/13] additional comments --- .../Entities/Clothing/OuterClothing/coats.yml | 4 ++-- .../Nyanotrasen/Entities/Clothing/Head/hats.yml | 2 +- .../Entities/Clothing/OuterClothing/coats.yml | 8 ++++---- .../equipped-OUTERCLOTHING.png | Bin .../Coats/{epi.rsi => epicoat.rsi}/icon.png | Bin .../Coats/{epi.rsi => epicoat.rsi}/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../Coats/{mysta.rsi => mystacoat.rsi}/icon.png | Bin .../Coats/{mysta.rsi => mystacoat.rsi}/meta.json | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{epi.rsi => epicoat.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{epi.rsi => epicoat.rsi}/icon.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{epi.rsi => epicoat.rsi}/meta.json (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{mysta.rsi => mystacoat.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{mysta.rsi => mystacoat.rsi}/icon.png (100%) rename Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/{mysta.rsi => mystacoat.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 251c024b304..e14590b668c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -170,9 +170,9 @@ description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/epi.rsi # DeltaV - Epistemic lab coat + sprite: DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi # DeltaV - Epistemic lab coat - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/epi.rsi # DeltaV - Epistemic lab coat + sprite: DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi # DeltaV - Epistemic lab coat - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index b716c001681..c7563feb307 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHoodMystic - name: mystagogue's hat + name: mystagogue's hat # Delta V - Mystagogue new hat description: To contain a very wise head. components: - type: Sprite diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml index d798f75d414..477a7da36c1 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml @@ -21,13 +21,13 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatRndMysta - name: mystagogue lab coat - description: Similar to the standard model but with more purple and gold. + name: mystagogue lab coat # Delta V - Mystagogue new coat + description: Similar to the standard model but with more purple and gold. # Delta V - Mystagogue new coat components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/mysta.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/mysta.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi - type: Armor modifiers: coefficients: diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epi.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mysta.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json From 902ab2ee02a8e56a1c30f933d2192eb67c7c0aa7 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 01:46:39 +0200 Subject: [PATCH 08/13] epi sign replaces science sign --- .../Structures/Wallmounts/Signs/signs.yml | 7 ++++--- .../Wallmounts/signs.rsi/direction_epi.png | Bin 0 -> 7809 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/direction_epi.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index deea2559a16..852826c1856 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -172,11 +172,12 @@ - type: entity parent: BaseSignDirectional id: SignDirectionalSci - name: science sign - description: A direction sign, pointing out which way the Science department is. + name: epistemics sign # DeltaV - Epistemics Department replacing Science + description: A direction sign, pointing out which way the Epistemics department is. # DeltaV - Epistemics Department replacing Science components: - type: Sprite - state: direction_sci + sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi # DeltaV - Epistemics Department replacing Science + state: direction_epi # DeltaV - Epistemics Department replacing Science - type: entity parent: BaseSignDirectional diff --git a/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/direction_epi.png b/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/direction_epi.png new file mode 100644 index 0000000000000000000000000000000000000000..63b21c46e36e5527113eecb531f241d61dd3341c GIT binary patch literal 7809 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%0D;0Ga5#u20V4Uhk88%cN%;unS{ zj)e6f5Xl60H^3ey8sqLsRt5rT>wrJ}b0wlsf5N+wezQR1142O)Auuo$;_3?dy9SA@ z89xnUg*kd6$7o00ilti-% z`-e$wB+BqljXeq+2(H9^EgISXkR%iEf06YM-}YAa!}+@-H1$7m{~`TH?EAtrDHIB! z>5lc>a}TMh4BWGiuy@B2>=FAzxHKBBAcvO&NlW3-AZd9i7zl%bVL(_JDKr!#2gS?7 zWd8<*bR&_`ZdlwN6b&3qpy5cv&=?$ERtki(htY8Mz~o^#84y+u1DA)(;1#45;D3WK z@F38t67BMLulAtqX;2sp7H7+zjZ4u{)^vd1DW zxO=#wY3U@mq8)G$qMO71!XDuWHAAE_5Dtd^HDl<4CgW)e%0NAWnxg!9z|r>i?}GYcp76gUO9~HHkd}jDK`=B929k#2VIX-0s4NI8 zB`b%;C}3sKm|w~I6P@IaCwrqkaB2>;NNLf~3TQtXz?pq2CI0D)wZZ41_YHxK%qd$?|>nDyZVoal_38QCrbMQe>(Hxh_7K^b+wyG&o*Fgl_MDI^8BJ_eOM75LY zjL8;HDhY)%Um6r=;_Vu7{(>)-i28Z&AuRhIp?*sGsz>K9!sYi-xZ1>V3HKieuaA-Px^^#LlC89`0Ss4lp4*guLnX z`d$Z>C%o64ZN$=hnH^K!I;g0AtiiMU&%=u=+8%#)jr;LDH~Z(0#Q^$^*ELS9-(G$4 zq*vM9#-kfP&$XfP5&TYWc4gaipA>}*skxJ1Yqn0>sq7hOyzkC1{9P>ViCX2}D^g2e Kvrygc=KlZ`AsYq& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/meta.json index 1cc44bff69b..adcb17ed600 100644 --- a/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "court" + }, + { + "name": "direction_epi" } ] } \ No newline at end of file From 48713b287934d02f96509d6803344e3109aa8d39 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 10:08:52 +0200 Subject: [PATCH 09/13] Chaplain --- .../Prototypes/Entities/Objects/Devices/pda.yml | 14 ++++++++++++++ .../Objects/Misc/identification_cards.yml | 1 + .../Prototypes/Roles/Jobs/Civilian/chaplain.yml | 3 ++- .../Roles/Jobs/Science/research_director.yml | 4 ++++ Resources/Prototypes/Roles/Jobs/departments.yml | 3 ++- Resources/Prototypes/StatusEffects/job.yml | 4 ++-- .../Interface/Misc/job_icons.rsi/Chaplain.png | Bin 0 -> 1430 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 +++ .../DeltaV/Objects/Devices/pda.rsi/meta.json | 3 +++ .../Objects/Devices/pda.rsi/pda-chaplain.png | Bin 0 -> 545 bytes .../Objects/Misc/id_cards.rsi/idchaplain.png | Bin 0 -> 1730 bytes .../DeltaV/Objects/Misc/id_cards.rsi/meta.json | 3 +++ 12 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chaplain.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 32f4491b032..78c91901b26 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -296,12 +296,26 @@ id: ChaplainPDA description: God's chosen PDA. components: + - type: Sprite # DeltaV - Give Chaplain PDA Epistemics colors + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false - type: Pda id: ChaplainIDCard state: pda-chaplain - type: PdaBorderColor borderColor: "#333333" + accentVColor: "#8900c9" # DeltaV - Give Chaplain PDA Epistemics colors - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi # DeltaV - Give Chaplain PDA Epistemics colors state: pda-chaplain - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index b54eac42542..b55186ec014 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -263,6 +263,7 @@ name: chaplain ID card components: - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Chaplain ID Epistemics colors layers: - state: default - state: idchaplain diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 300af57cd42..ee49c227107 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -5,9 +5,10 @@ playTimeTracker: JobChaplain startingGear: ChaplainGear icon: "JobIconChaplain" - supervisors: job-supervisors-hop + supervisors: job-supervisors-rd access: - Chapel + - Research # DeltaV - Move Chaplain into Epistemics - Maintenance special: - !type:AddComponentSpecial diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 1ef31a5b642..acedec61c25 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -20,6 +20,10 @@ - Command - Maintenance - ResearchDirector + special: # Nyanotrasen - Mystagogue can use the Bible + - !type:AddComponentSpecial + components: + - type: BibleUser #Lets them heal with bibles - type: startingGear id: ResearchDirectorGear diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6ccdc1ee65e..db2fde72bf3 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -17,7 +17,7 @@ - Borg - Botanist - Boxer - - Chaplain + # - Chaplain # DeltaV - Move Chaplain into Epistemics - Chef - Clown - HeadOfPersonnel @@ -94,6 +94,7 @@ - SeniorResearcher - Scientist - ResearchAssistant + - Chaplain # DeltaV - Move Chaplain into Epistemics - type: department id: Specific diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 8be71cc6155..e467efc7835 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -113,8 +113,8 @@ parent: JobIcon id: JobIconChaplain icon: - sprite: Interface/Misc/job_icons.rsi - state: Chaplain + sprite: DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics + state: Chaplain # DeltaV - Move Chaplain into Epistemics - type: statusIcon parent: JobIcon diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2d7cfacaee9b023b706c56734b89ca88e6a51f GIT binary patch literal 1430 zcmbVMOK8+U7>*!Pl`0}itq)>ER5b5)w>vayZK_={wYCebH)oT{ZtNzLCe!Y2K}7K) zBKW|Ih$whfZ=xs_LBU(mo8CMNdQd!yfA$foR7FFQd42Q!@BiZH$dS%f-K#i`>&y?E zV=#6kU&jjgzg#zk@2~af;~57=N#d{e!jnkfWRjV z^EJN`#HeNn4PFHEWLp;a282x+!ayRBpR`8#K^hT0E2*NbC<>p=Nw_botHs1a#CGI`%%cIHFybPeVTJ&zHf`|3ls1T4egcolH5|&Sq$D;qfR3Hw!kMVj z5boGAsSuw8EC#HaV#6|JG%nNMP^ZT~2>{<(Rw`pjU3@)wpHdeT~hen6JFrZYP@IB1!7`G3<091ix4uc zub||RoZLkr77`53w5V;bKc0p5Hj+073SBquFQ{t{9_%td&{yXkyN;KK zapGAZ&A`CV&%h8HtITls?p;tkGm;$wFaWZ=w6%oc*27B}a%%E=4Bgc|z)<+haLeWu zgXDHGa0mdy1r&k=&1NAsGLM};0B4Jc34!T1uigPMLi{Mha)v}+(h>>L4&W2yB`9{m zco9Q>zA{z jVAKJl4jAzc00=Mu6sPa2DGqzN00000NkvXXu0mjf9Wmbu literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png new file mode 100644 index 0000000000000000000000000000000000000000..d27ec5bbfdb2fd73c64130dea741b85d307af12c GIT binary patch literal 1730 zcmbVNU5MON6wb7E)k^oJ1!u*FY^q?<{Lk!6!lv8p&gzbs?RGoTk%IQl&CN{MNp4Is zJF^3VD<~`YgZLs##TB6nrS(C4>O%{)4_lBH?3)NJ1rdEHs4oR^J( zyUsh6YE(5}(J^%eWYHQCI<60Bh8dse_y{kMh^>*j;~CuT^A|YQu?+5b-jqy#iZq;= zZa|K8XDhh7fHjMoILMB7bRcj^gxHST^g_L3a6Mif*70kRV|$Qj!QduihiuiHW2b09 z*n%MQSdt{Rpb4m0Q01ET0;@=hEJ_;ucuCULg02?XBYnuJQ-XgihNxZ z+wHc{Rs|Z=MOo8;KoJ#%2LvB3c@gUHUbuh2P$D4?96xfX$Ht7PMq81=L8$#4TtB7t z!lX`6F|mVuQ5K{)rykJ4Db8;N&7N}$i=;_h;zc1~viRgQEj!ny`Pthg~z%fLp_M$LNz3hb%@-Qiv3=VP@9LLf%sVLWS zd5KqvCG)D1%kxOZDqqAk+m9|;`TTB!NZJn@E$TSA|4LJ(^y*%8Oco5`x_u)QwO5stgt;BYJ}vAE>5 zvqc3SEQ3C6yFq|-8@c8v z>I7z`$i>Ns@lffDBK}{m-nUHyXaI+)7BACz3J>W-CLT}+FmKIszpTQnK3gtLR;usf ze>OHIE*;u&I`jQo*E3%YXImG)*_q8|t1CyZI^uN-+}{mzcxi*GM4-@Neo z+01)4zP$A0zk7p6Mh^x1J~M;09}Zr5n)&Y3>PPH)=IcL)*RDlvhG*7?*G}Ia$*x@8 z^})4$ACJz8kIr3InkO&*#2g*<|M=_2jRUXWd}d_4{`1R2L)_sHf6Ga*oImkxX?o;V h<4h-sXQjuD`1A|m*Z5ziJUv@FclhKx{{f#-D`fxx literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index f3d5e7e6765..20fc643a2e5 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "silver" }, + { + "name": "idchaplain" + }, { "name": "nyanogladiator" }, From 4f763e5ba18c13dd654259ac7a375a4910b629ec Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 13:01:55 +0200 Subject: [PATCH 10/13] Give chaplain science headset --- Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index ee49c227107..9111c1c105a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -22,7 +22,7 @@ back: ClothingBackpackChaplainFilled shoes: ClothingShoesColorBlack id: ChaplainPDA - ears: ClothingHeadsetService + ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics innerclothingskirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled From c7a18423dcf2bc1b5e96d16aa20453260be3f3d0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 13:27:54 +0200 Subject: [PATCH 11/13] mystagogue's turban --- .../Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index c7563feb307..b5cf743fe5f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHoodMystic - name: mystagogue's hat # Delta V - Mystagogue new hat + name: mystagogue's turban # Delta V - Mystagogue new hat description: To contain a very wise head. components: - type: Sprite From af5198cd8c2d821947113417a997f6a777442b10 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 20:11:26 +0200 Subject: [PATCH 12/13] Forgot about the dead chaplain spawner --- Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index abb5b3eaa7e..39815bcdbb9 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -13,7 +13,7 @@ - MusicianGear - BotanistGear - ChefGear - - ChaplainGear + # - ChaplainGear # DeltaV - Move Chaplain into Epistemics - PassengerGear - MartialArtistGear # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -60,6 +60,7 @@ prototypes: - ResearchAssistantGear - ScientistGear + - ChaplainGear # DeltaV - Move Chaplain into Epistemics - type: entity parent: SalvageHumanCorpse From ae2a7cbf14fe3400c901bf36c1ca224e86f7b16e Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:57:38 -0500 Subject: [PATCH 13/13] Update Traitors.xml Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 7ee25ba2058..366a7ce851e 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -60,7 +60,7 @@ - Steal the Mystagogue's [color=#a4885c]Hardsuit[/color]. - + - Steal the Mystagogue's [color=#a4885c]Hand Teleporter[/color].