diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index f0a9ef0022b..90c0f83a2dd 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/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 32d9389d223..d98fd82c4b5 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, 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 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/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 a93847fe6f2..a331c336e56 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 09afc383495..5c464f9156e 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 # DeltaV - 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/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 2826a2377ff..3ccb3849a78 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..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: science headset - description: A sciency headset. Like usual. + name: epistemics headset # DeltaV - Epistemics Department replacing Science + description: A sciency headset. Like usual. # DeltaV - 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 2f7a33fbd2e..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: research director's over-ear headset + 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 cedf8eea29f..54e1b47d7b5 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 @@ -394,7 +394,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD noSpawn: true - name: research director's coat hood + 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 f1296f657e1..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: research director's cloak + 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 cb8e283859c..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: research director's mantle + 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/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index a7c3a553384..e14590b668c 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/epicoat.rsi # DeltaV - Epistemic lab coat - type: Clothing - sprite: Clothing/OuterClothing/Coats/rndcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi # DeltaV - Epistemic lab coat - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 45d2f17d7c5..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: research director's winter coat + 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 596e3135afb..935779c2c73 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -307,8 +307,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 # 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 @@ -743,7 +743,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 867346b7fcf..0a603bc509b 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 # 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..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 @@ -54,12 +54,13 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomScienceCorpse - suffix: Dead, Science + suffix: Dead, Epistemics # DeltaV - Epistemics Department replacing Science components: - type: Loadout prototypes: - ResearchAssistantGear - ScientistGear + - ChaplainGear # DeltaV - Move Chaplain into Epistemics - type: entity parent: SalvageHumanCorpse 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 65dcbaf0073..984753edcb3 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 c9b8644620e..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 @@ -558,7 +572,7 @@ - type: entity parent: BasePDA id: RnDPDA - name: research director PDA + name: mystagogue PDA # DeltaV - Epistemics Department replacing Science description: It appears surprisingly ordinary. components: - type: Pda @@ -574,7 +588,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 bcd70802769..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: research director figure - 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 b0a69a944ae..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 @@ -386,7 +387,7 @@ - type: entity parent: IDCardStandard id: RDIDCard - name: research director ID card + 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 fdb25867698..23c1a3038d2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -618,7 +618,7 @@ state: stamp-qm - type: entity - name: research director's rubber stamp + 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 c6b6c17cb3f..c76aa328564 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -57,7 +57,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 @@ -202,7 +202,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 798a5422158..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: research director's locker + 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 5306273a645..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 Research Director." + 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/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/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 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/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 9741a6a7fa2..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: mystic hood + name: mystagogue's turban # 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 4a98122ad91..477a7da36c1 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 # 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/mystacoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/mystacoat.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 291f2c5c4eb..40116418b88 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml @@ -1,20 +1,7 @@ -- 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 - name: Brown Robe + name: brown robe description: This doesn't look creepy at all. components: - type: Sprite @@ -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/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 300af57cd42..9111c1c105a 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 @@ -21,7 +22,7 @@ back: ClothingBackpackChaplainFilled shoes: ClothingShoesColorBlack id: ChaplainPDA - ears: ClothingHeadsetService + ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics innerclothingskirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 150a7848506..1fad4afc26e 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -21,6 +21,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 @@ -28,7 +32,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/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/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 002ee56d115..366a7ce851e 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 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.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/Robes/white.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/Robes/white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.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/epicoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.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/epicoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.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/Robes/mystic.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/Robes/mystic.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.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/mystacoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.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/mystacoat.rsi/meta.json 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 00000000000..5d2d7cfacae Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index f3f18816315..8dd9e5b3d0d 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -7,6 +7,9 @@ "y": 8 }, "states": [ + { + "name": "Chaplain" + }, { "name": "nyanoGladiator" }, diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index f34ba246561..142839f0c5b 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -22,6 +22,9 @@ }, { "name": "pda-mailcarrier" + }, + { + "name": "pda-chaplain" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chaplain.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chaplain.png new file mode 100644 index 00000000000..bb9bb30d3bc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chaplain.png differ 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 00000000000..d27ec5bbfdb Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png differ 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" }, 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 00000000000..63b21c46e36 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi/direction_epi.png differ 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