diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml index f370155e07..29fab7e290 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml @@ -5,7 +5,7 @@ state: artifact_container_icon product: CrateArtifactContainer cost: 500 - category: Epistemics # DeltaV - Epistemics Department replacing Science + category: Science # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: ano13 product: RandomArtifactSpawner cost: 2000 - category: Epistemics # DeltaV - Epistemics Department replacing Science + category: Science # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct @@ -25,5 +25,5 @@ state: icon product: CrateScienceBiosuit cost: 800 - category: Epistemics # DeltaV - Epistemics Department replacing Science + category: Science # DeltaV - Epistemics Department replacing Science group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 2165fb4e58..b8d361adcd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -195,7 +195,7 @@ state: base product: CrateVendingMachineRestockRoboticsFilled cost: 1600 - category: Epistemics # DeltaV - Epistemics Department replacing Science + category: Science # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 7840602362..da5395449c 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -320,7 +320,7 @@ amount: 4 - type: entity - name: epistemics encryption key box # DeltaV - Epistemics Department replacing Science + name: science encryption key box parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyScience components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml index ded48aa434..842ab54ed0 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml @@ -40,7 +40,7 @@ - type: entity id: ClosetL3ScienceFilled - suffix: Filled, Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Filled, Science parent: ClosetL3Virology components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 21627a4618..739d57d29b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1167,7 +1167,7 @@ conditions: - !type:BuyerDepartmentCondition whitelist: - - Epistemics # DeltaV - Epistemics Department replacing Science + - Science - type: listing id: uplinkProximityMine diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 54d0378ecd..7fe507ca6e 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -49,10 +49,10 @@ - "As a Salvage Specialist, 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 Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective." - "As a Salvage Specialist, 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 Specialist, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" + - "As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator." - "As a Salvage Specialist, 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 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, 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, 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, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with." - "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." @@ -84,7 +84,7 @@ - "As a Medical Doctor, try to be wary 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, exercise 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 the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask epistemics to print a better battery for you!" + - "As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science 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 or licoxide?" - "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/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index b6140daae5..b0917006be 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -36,10 +36,10 @@ - id: ParamedicPDA - type: entity - name: epistemics PDA box + name: science PDA box parent: BoxPDA id: BoxPDAScience - description: A box of spare PDA microcomputers for the epistemics department. + description: A box of spare PDA microcomputers for the science department. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index fa51b99325..0d7456e93e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -107,7 +107,7 @@ allowSpeech: true requirements: - !type:DepartmentTimeRequirement - department: Epistemics + department: Science time: 14400 # DeltaV - 4 hours - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index fbd5a02fa0..9bfed86146 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -139,7 +139,7 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackScience - name: epistemics backpack # DeltaV - Epistemics Department replacing Science + name: science backpack 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 ca16aa5d7e..ee7ddc4fd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -124,7 +124,7 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelScience - name: epistemics duffel bag # DeltaV - Epistemics Department replacing Science + name: science duffel bag 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 bf52477340..4572101778 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -99,7 +99,7 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelScience - name: epistemics satchel # DeltaV - Epistemics Department replacing Science + name: science satchel 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 df160f8e5a..809a51c125 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetScience - name: epistemics headset # DeltaV - Epistemics Department replacing Science + name: science headset # DeltaV - Epistemics Department replacing Science description: A sciency headset. Like usual. # DeltaV - Epistemics Department replacing Science components: - type: ContainerFill @@ -215,7 +215,7 @@ - type: entity parent: ClothingHeadsetScience id: ClothingHeadsetRD - name: mysta headset # DeltaV - Epistemics Department replacing Science + name: research director headset description: Lamarr used to love chewing on this... components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 19e3842e52..0a6d152ad4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -46,7 +46,7 @@ parent: ClothingHeadHatHoodBioGeneral id: ClothingHeadHatHoodBioScientist name: bio hood - suffix: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Science description: A hood that protects the head and face from biological contaminants. components: - type: IdentityBlocker diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index e76a4b3ee3..b93cca9222 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -69,8 +69,8 @@ - type: entity parent: ClothingNeckMedalBase id: ClothingNeckSciencemedal - name: epistemics medal # DeltaV - Epistemics Department replacing Science - description: Whether it's pushing the edges of modern science and technology, foraying into the vast expanses of the noosphere, or just fetching the coffee - this medal is to be assigned only for the best work in the epistemics department. # DeltaV - Epistemics Department replacing Science. Updated description for flavour + name: science medal + description: Whether it's pushing the edges of modern science and technology, foraying into the vast expanses of the noosphere, or just fetching the coffee - this medal is to be assigned only for the best work in the science department. components: - type: Sprite sprite: DeltaV/Clothing/Neck/Medals/sciencemedal.rsi # DeltaV - resprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index 292c5e8986..fec4d4df6c 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: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: 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 41d6990baa..7ffec2657a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -193,7 +193,7 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatRnd - name: epistemics lab coat # DeltaV - Epistemics Department replacing Science + name: scientist lab coat description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index ad5f255bd2..111092865c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -390,7 +390,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterSci - name: epistemics winter coat # DeltaV - Epistemics Department replacing Science + name: scientists winter coat 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 d14915afb5..fd3cb51066 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -766,7 +766,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSeniorResearcher name: senior researcher jumpskirt - description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science + description: A sign of skill and prestige within the science department. 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 f24cd8f780..8d9b791666 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -509,7 +509,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector - name: research director's turtleneck # DeltaV - Epistemics Department replacing Science + 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. components: - type: Sprite @@ -1279,7 +1279,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit - description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science + description: A sign of skill and prestige within the science department. 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 3d337b3976..d5e582884a 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 Epistemics Corpse Spawner # DeltaV - Epistemics Department replacing Science + name: Random Science Corpse Spawner id: RandomScienceCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 89ab3376c6..0801314223 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -55,13 +55,12 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomScienceCorpse - suffix: Dead, Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Dead, Science components: - type: Loadout prototypes: - ResearchAssistantGear - ScientistGear - - ChaplainGear # DeltaV - Move Chaplain into Epistemics - ForensicMantisGear # Nyanotrasen - Forensic Mantis - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 32a1815ac7..a391f4878f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -713,7 +713,7 @@ name: jelly toast parent: FoodBreadSliceBase id: FoodBreadJellySlice - description: As if epistemics are gonna give up their slimes for toast! # DeltaV - Epistemics Department replacing Science + description: As if science are gonna give up their slimes for toast! 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 d270c93e50..66374b6662 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -127,7 +127,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeyMedicalScience - name: med-epi encryption key # DeltaV - Epistemics Department replacing Science + name: med-sci encryption key description: An encryption key used by someone who hasn't decided which side to take. components: - type: EncryptionKey diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index d2e9a8db61..ea43d88039 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -307,30 +307,16 @@ - type: entity name: chaplain PDA - parent: SciencePDA # DeltaV - Chaplain is part of episetmics + parent: BasePDA 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/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 8e2dea6a5a..16449b4ac9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -294,10 +294,10 @@ - type: entity parent: DefaultStationBeacon id: DefaultStationBeaconScience - suffix: Epistemics #Delta V - Renamed + suffix: Science components: - type: NavMapBeacon - text: station-beacon-epistemics #Delta V - Renamed + text: station-beacon-science color: "#D381C9" - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 6a5d3c36f5..4b31971c97 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -204,8 +204,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineResearchDirector - name: mystagogue figure # DeltaV - Epistemics Department replacing Science - description: A figurine depicting the glorious head of the Epistemics department. # DeltaV - Epistemics Department replacing Science + name: research director figure + description: A figurine depicting the glorious head of the Science department. components: - type: Sprite state: rd diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 209d0b8cc2..a4f1e5e687 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -270,7 +270,7 @@ - type: entity id: BedsheetRD parent: BedsheetBase - name: Mystagogue's bedsheet # DeltaV - Epistemics Department - Replace Research Director with Mystagogue + name: Research Director's bedsheet description: It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0b86677a8e..8d0870ea82 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -274,8 +274,7 @@ - type: Sprite layers: - state: default - - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Chaplain ID Epistemics colors - state: idchaplain + - state: idchaplain - type: PresetIdCard job: Chaplain diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index e88ed48fe5..bc22efe07d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -172,7 +172,7 @@ state: stamp-qm - type: entity - name: mystagogue's rubber stamp # DeltaV - Epistemics Department replacing Science + name: research director's rubber stamp 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 be286c6309..118dd54f2d 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: 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 + name: science banner + description: A banner displaying the colors of the science department. Where stupidity is proven greater than the universe. 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 51f121c64f..5a863cd3d8 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -24,7 +24,7 @@ access: [["Theatre"]] - type: entity - parent: AirlockScience # DeltaV - Chapel is in Epistemics + parent: AirlockServiceLocked id: AirlockChapelLocked suffix: Chapel, Locked components: @@ -82,7 +82,7 @@ - type: entity parent: AirlockExternal id: AirlockExternalCargoLocked - suffix: External, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -162,7 +162,7 @@ - type: entity parent: AirlockCargo id: AirlockCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -218,7 +218,7 @@ - type: entity parent: AirlockScience id: AirlockScienceLocked - suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Science, Locked components: - type: AccessReader access: [["Research"]] @@ -226,7 +226,7 @@ - type: entity parent: AirlockScience id: AirlockMedicalScienceLocked - suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Medical/Science, Locked components: - type: AccessReader access: [["Research"], ["Medical"]] @@ -302,7 +302,7 @@ - type: entity parent: AirlockCommand id: AirlockQuartermasterLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics Officer, Locked components: - type: AccessReader access: [["Quartermaster"]] @@ -418,7 +418,7 @@ - type: entity parent: AirlockExternalGlass id: AirlockExternalGlassCargoLocked - suffix: External, Glass, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Glass, Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -480,7 +480,7 @@ access: [["Hydroponics"]] - type: entity - parent: AirlockScienceGlass # DeltaV - Chapel is in Epistemics + parent: AirlockScienceGlass id: AirlockChapelGlassLocked suffix: Chapel, Locked components: @@ -506,7 +506,7 @@ - type: entity parent: AirlockCargoGlass id: AirlockCargoGlassLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -562,7 +562,7 @@ - type: entity parent: AirlockScienceGlass id: AirlockScienceGlassLocked - suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Science, Locked components: - type: AccessReader access: [["Research"]] @@ -570,7 +570,7 @@ - type: entity parent: AirlockScienceGlass id: AirlockMedicalScienceGlassLocked - suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Medical/Science, Locked components: - type: AccessReader access: [["Research"], ["Medical"]] @@ -644,7 +644,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockQuartermasterGlassLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics Officer, Locked components: - type: AccessReader access: [["Quartermaster"]] @@ -742,7 +742,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -870,7 +870,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintRnDLocked - suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Science, Locked components: - type: AccessReader access: [["Research"]] @@ -878,7 +878,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintRnDMedLocked - suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Medical/Science, Locked 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 3a2659f829..fa24a56a71 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -27,7 +27,7 @@ - type: entity parent: Airlock id: AirlockCargo - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Logistics components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi @@ -60,12 +60,12 @@ - type: entity parent: Airlock id: AirlockScience - suffix: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Science components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/science.rsi - type: PaintableAirlock - department: Epistemics + department: Science - type: entity parent: Airlock @@ -209,7 +209,7 @@ - type: entity parent: AirlockGlass id: AirlockCargoGlass - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Logistics components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi @@ -242,12 +242,12 @@ - type: entity parent: AirlockGlass id: AirlockScienceGlass - suffix: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Science components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/science.rsi - type: PaintableAirlock - department: Epistemics + department: Science - type: entity parent: AirlockGlass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 2b4b2c5fe0..e67bc6f119 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -62,7 +62,7 @@ - type: entity parent: Windoor id: WindoorCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -169,7 +169,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Logistics, Locked components: - type: AccessReader access: [["Cargo"]] @@ -329,7 +329,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureScienceLocked - suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science + suffix: Science, Locked components: - type: AccessReader access: [["Research"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index dfb37f4986..44db74cf3e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -71,6 +71,6 @@ freezer: Civilian maintenance: Civilian medical: Medical - science: Epistemics + science: Science security: Security virology: Medical diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 59fcc7cca5..38d2e80c2d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -229,10 +229,8 @@ - type: entity id: PottedPlantRD #PottedPlant25 parent: PottedPlantBase - # DeltaV - Epistemics Department - Replace Research Director with Mystagogue - name: Mystagogue's potted plant - description: "A gift from the botanical staff, presented after the Mystagogue's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." - # End of modified code + name: Research Director's potted plant + description: "A gift from the botanical staff, presented after the Research Director's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." components: - type: Sprite state: plant-25 diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml index e359db813f..1eeaec9b7c 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: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: 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 ba67e16560..f5184893c3 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 # DeltaV - Epistemics Department replacing Science + name: research director's locker 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 71635d43ad..b179e62ff8 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: epistemics wardrobe # DeltaV - Epistemics Department replacing Science + name: scientist wardrobe - 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 4ebe8d04eb..24bcf7cf7a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -107,7 +107,7 @@ - type: entity parent: CrateGenericSteel id: CrateScience - name: epistemics crate # DeltaV - Epistemics Department replacing Science + name: science crate components: - type: Icon sprite: Structures/Storage/Crates/science.rsi @@ -228,7 +228,7 @@ - type: entity parent: CrateBaseSecure id: CrateScienceSecure - name: secure epistemics crate # DeltaV - Epistemics Department replacing Science + name: secure science crate 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 1953ecd146..353671a563 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." # DeltaV - Epistemics Department replacing Science + description: "This poster depicts Lamarr. Probably made by a traitorous Research Director." 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 ceb9f94b58..14b8bd70af 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -190,12 +190,11 @@ - type: entity parent: BaseSignDirectional id: SignDirectionalSci - 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 + name: science sign + description: A direction sign, pointing out which way the Science department is. components: - type: Sprite - sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi # DeltaV - Epistemics Department replacing Science - state: direction_epi # DeltaV - Epistemics Department replacing Science + state: direction_sci - type: entity parent: BaseSignDirectional diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 6bccf14e13..037a89a988 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -179,7 +179,7 @@ - type: entity id: IntercomScience parent: Intercom - suffix: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: 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 6e56bb855f..dfbe99b2d2 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -122,7 +122,7 @@ parent: SurveillanceCameraBase id: SurveillanceCameraScience name: camera - suffix: Epistemics # DeltaV - Epistemics Department replacing Science + suffix: Science components: - type: DeviceNetwork deviceNetId: Wired diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml index 4610c0f68c..4be21cec30 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml @@ -5,5 +5,5 @@ state: icon product: CrateHolyWaterKit cost: 1000 - category: Epistemics + category: Service group: market diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml index 6828780dd0..f97758f70a 100644 --- a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml +++ b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml @@ -70,7 +70,7 @@ MailSecurityFlashlight: 2 MailSecurityNonlethalsKit: 2 #MailSecuritySpaceLaw: 1 - Epistemics: + Science: MailBooks: 1 MailEpistemologyBluespace: 1 MailEpistemologyIngotGold: 2 diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml index b6c3d553df..4085a58aa0 100644 --- a/Resources/Prototypes/Objectives/ninja.yml +++ b/Resources/Prototypes/Objectives/ninja.yml @@ -32,7 +32,7 @@ noSpawn: true parent: BaseNinjaObjective id: StealResearchObjective - 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. # DeltaV - Epistemics Department replacing Science + 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. # DeltaV - Epistemics Department replacing Science components: - type: Objective icon: diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index fb1e5e76fc..93d7d271d9 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -337,7 +337,7 @@ - type: stealTargetGroup id: PlantRD - name: Mystagogue's potted plant # DeltaV - Epistemics Department - Replace Research Director with Mystagogue + name: Research Director's potted plant sprite: sprite: Structures/Furniture/potted_plants.rsi state: plant-25 diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index c5e893397a..bf08e46d1c 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -8,7 +8,7 @@ engineering: "#EFB34196" security: "#DE3A3A96" bar: "#79150096" - epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science + science: "#D381C996" logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo janitor: "#8c347f96" chemistry: "#fa750096" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index d49147f517..7e0a610162 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -5,14 +5,13 @@ playTimeTracker: JobChaplain # requirements: # - !type:DepartmentTimeRequirement - # department: Epistemics # DeltaV - Epistemics Department replacing Science - # time: 14400 #DeltaV 4 hours + # department: Science + # time: 14400 4 hours startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-rd access: - Chapel - - Research # DeltaV - Move Chaplain into Epistemics - Maintenance special: - !type:AddComponentSpecial @@ -30,7 +29,7 @@ back: ClothingBackpackChaplainFilled shoes: ClothingShoesColorBlack id: ChaplainPDA - ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics + ears: ClothingHeadsetService innerClothingSkirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 3bd4008719..b993242006 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -16,8 +16,8 @@ # - !type:DepartmentTimeRequirement # department: Security # time: 18000 # DeltaV - 5 hours - # - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - # department: Epistemics # DeltaV - Epistemics Department replacing Science + # - !type:DepartmentTimeRequirement + # department: Science # time: 18000 # 5 hours # - !type:DepartmentTimeRequirement # department: Command diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b6dadb631c..115143a72a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,10 +6,10 @@ antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff # requirements: # - !type:DepartmentTimeRequirement - # department: Epistemics # DeltaV - Epistemics Department replacing Science - # time: 54000 # DeltaV - 15 hours + # department: Science + # time: 54000 # 15 hours # - !type:OverallPlaytimeRequirement - # time: 72000 # DeltaV - 20 hours + # time: 72000 # 20 hours weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" @@ -22,9 +22,8 @@ - Maintenance - ResearchDirector - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml - # - Chapel # DeltaV - Chaplain is in Epistemics - Cryogenics - special: # Nyanotrasen - Mystagogue can use the Bible + special: - !type:AddComponentSpecial components: # - type: BibleUser # Nyano - Lets them heal with bibles diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 4a248e2695..a127e5dfdb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -5,7 +5,7 @@ playTimeTracker: JobScientist # requirements: # - !type:DepartmentTimeRequirement - # department: Epistemics # DeltaV - Epistemics Department replacing Science + # department: Science # time: 14400 #4 hrs startingGear: ScientistGear icon: "JobIconScientist" diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index a6551e1254..acfc069962 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -6,7 +6,7 @@ setPreference: false # DeltaV - Disable Senior Roles round start selection # requirements: # - !type:DepartmentTimeRequirement - # department: Epistemics # DeltaV - Epistemics Department replacing Science + # department: Science # time: 216000 #60 hrs startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8353442509..21c8a02b14 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -18,7 +18,7 @@ - Borg - Botanist - Boxer - # - Chaplain # DeltaV - Move Chaplain into Epistemics + - Chaplain - Chef - Clown - HeadOfPersonnel @@ -93,7 +93,7 @@ - Brigmedic # DeltaV - Brigmedic, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml - type: department - id: Epistemics # DeltaV - Epistemics Department replacing Science + id: Science description: department-Science-description color: "#D381C9" roles: @@ -101,7 +101,6 @@ - SeniorResearcher - Scientist - ResearchAssistant - - Chaplain # DeltaV - Move Chaplain into Epistemics - ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml - type: department diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 782cacfdd5..0811877ab5 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -113,8 +113,8 @@ parent: JobIcon id: JobIconChaplain icon: - sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics - state: Chaplain # DeltaV - Move Chaplain into Epistemics + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Chaplain - type: statusIcon parent: JobIcon