diff --git a/Content.Server/EntityEffects/Effects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs index c4870438486..ce803ee600c 100644 --- a/Content.Server/EntityEffects/Effects/MakeSentient.cs +++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs @@ -3,6 +3,7 @@ using Content.Shared.EntityEffects; using Content.Shared.Mind.Components; using Robust.Shared.Prototypes; +using Content.Shared._Sunrise.Reagents; // Sunrise Edit namespace Content.Server.EntityEffects.Effects; @@ -28,6 +29,13 @@ public override void Effect(EntityEffectBaseArgs args) return; } + // Sunrise Start + if (entityManager.TryGetComponent(uid, out var CognizinFix)) + { + return; + } + // Sunrise End + // Don't add a ghost role to things that already have ghost roles if (entityManager.TryGetComponent(uid, out GhostRoleComponent? ghostRole)) { diff --git a/Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs b/Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs new file mode 100644 index 00000000000..3bfaf97bc8b --- /dev/null +++ b/Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs @@ -0,0 +1,6 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._Sunrise.Reagents; + +[RegisterComponent, NetworkedComponent] +public sealed partial class CognizinFixComponent : Component { } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl index adf78b8d934..e772cdb02b8 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl @@ -1,2 +1,23 @@ ent-OrganManeaterAnimalStomach = maneater stomach .desc = { ent-OrganAnimalStomach.desc } + +ent-OrganPrimateHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } + +ent-OrganKoboldHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } + +ent-OrganFelinidHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } + +ent-SentientWildSlimeCore = { ent-SentientSlimeCore } + .desc = { ent-SentientSlimeCore.desc } + +ent-OrganMothroachHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } + +ent-OrganPigHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } + +ent-OrganChikenHeart = { ent-OrganAnimalHeart } + .desc = { ent-OrganAnimalHeart.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/medical.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/medical.ftl new file mode 100644 index 00000000000..8f08ec9c1d5 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/medical.ftl @@ -0,0 +1,2 @@ +ent-CrateNPCVariantCubeBoxSunrise = ящик с кубиками генетических предков + .desc = Ящик, содержит кубики генетических предков. 2 кубика обезьян, слаймов, куриц, свиней и таракамолей. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/cube.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/cube.ftl new file mode 100644 index 00000000000..3a0f3f3f4b8 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/cube.ftl @@ -0,0 +1,14 @@ +ent-VariantCubeBoxSunrise = коробка кубиков генетических предков + .desc = Кубики генетических предков. +ent-SlimeCubeWrapped = кубик слайма + .desc = Разверните его, чтобы получить кубик слайма. + .suffix = Завёрнутый +ent-ChikenCubeWrapped = кубик курицы + .desc = Разверните его, чтобы получить кубик курицы. + .suffix = Завёрнутый +ent-PigCubeWrapped = кубик свиньи + .desc = Разверните его, чтобы получить кубик свиньи. + .suffix = Завёрнутый +ent-MothroachCubeWrapped = кубик таракамоли + .desc = Разверните его, чтобы получить кубик таракамоли. + .suffix = Завёрнутый \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/rehydrateable.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/rehydrateable.ftl new file mode 100644 index 00000000000..0747d09b70c --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/rehydrateable.ftl @@ -0,0 +1,6 @@ +ent-PigCube = свиной кубик + .desc = Просто добавь воды! +ent-WildSlimeCube = слаймовый кубик + .desc = Просто добавь воды! +ent-ChikenCube = куриный кубик + .desc = Просто добавь воды! diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl new file mode 100644 index 00000000000..7caeef0e3c8 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl @@ -0,0 +1,2 @@ +reagent-name-darvinium = дарвиниум +reagent-desc-darvinium = Лекарство способное ускорить развитие генома почти любого низшего существа, и превратить его в гуманоида. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl new file mode 100644 index 00000000000..a9d19e86e76 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl @@ -0,0 +1,9 @@ +metabolizer-type-primate = Примат +metabolizer-type-chiken = Курица +metabolizer-type-pig = Свинья +metabolizer-type-mothroach = Таракамоль +metabolizer-type-wild-slime = Дикий слайм +metabolizer-type-felinid = Фелинид +metabolizer-type-kobold = Кобольд +metabolizer-type-cat = Кот +metabolizer-type-dog = Собака \ No newline at end of file diff --git a/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml index 8d9827e99a0..83446dd755b 100644 --- a/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml +++ b/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml @@ -8,7 +8,7 @@ connections: - legs organs: - core: SentientSlimesCore + core: SentientWildSlimeCore # Sunrise Edit lungs: OrganSlimesLungs legs: part: LegsAnimal diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml index ef5df769def..5cea968bf5d 100644 --- a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml +++ b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml @@ -9,5 +9,5 @@ lungs: OrganAnimalLungs stomach: OrganMothStomach liver: OrganAnimalLiver - heart: OrganAnimalHeart + heart: OrganMothroachHeart # Sunrise Edit kidneys: OrganAnimalKidneys diff --git a/Resources/Prototypes/Body/Prototypes/primate.yml b/Resources/Prototypes/Body/Prototypes/primate.yml index 2af9273be4c..d8e09d9a81a 100644 --- a/Resources/Prototypes/Body/Prototypes/primate.yml +++ b/Resources/Prototypes/Body/Prototypes/primate.yml @@ -12,7 +12,7 @@ lungs: OrganAnimalLungs stomach: OrganAnimalStomach liver: OrganAnimalLiver - heart: OrganAnimalHeart + heart: OrganPrimateHeart # Sunrise Edit kidneys: OrganAnimalKidneys hands: part: HandsAnimal diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index dbc10f4a640..68f6f341021 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -172,6 +172,7 @@ - id: RCDAmmo - id: RubberStampCE - id: FlippoLighterSunriseCe # Sunrise-Flippo + - id: VariantCubeBoxSunrise # Sunrise Edit # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 74eb66c49e8..f3f94c5726a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -240,6 +240,8 @@ factions: - Passive # Sunrise-start + - type: Body + prototype: Chiken - type: Carriable - type: CanEscapeInventory # Sunrise-end @@ -1569,6 +1571,10 @@ name: ghost-role-information-kobold-name description: ghost-role-information-kobold-description rules: ghost-role-information-nonantagonist-rules + # Sunrise Start + - type: Body + prototype: Kobold + # Sunrise End - type: entity name: kobold @@ -2852,6 +2858,8 @@ # Sunrise-start - type: Carriable - type: CanEscapeInventory + - type: Body + prototype: Dog # Sunrise-end - type: entity @@ -3016,6 +3024,8 @@ color: "#808080" - type: Carriable - type: CanEscapeInventory + - type: Body + prototype: Cat # Sunrise-end - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index b5465824868..33d431326df 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -36,6 +36,10 @@ - VimPilot - type: StealTarget stealGroup: AnimalIan + # Sunrise Start + - type: Body + prototype: Animal + # Sunrise End - type: entity name: Old Ian diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 5507c40e636..a4ace793149 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -243,6 +243,7 @@ Quantity: 25 - type: Food requiresSpecialDigestion: true + - type: CognizinFix # Sunrise-End - type: entity diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml index 68e43c63b15..723dcecab53 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml @@ -8,4 +8,85 @@ specialDigestible: components: - Identity - isDigestibleAddition: true \ No newline at end of file + isDigestibleAddition: true + +- type: entity + id: OrganPrimateHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Primate ] + +- type: entity + id: OrganKoboldHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Kobold ] + +- type: entity + id: OrganFelinidHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Felinid ] + +- type: entity + id: SentientWildSlimeCore + parent: SentientSlimeCore + name: slime core + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Slime, WildSlime ] + +- type: entity + id: OrganMothroachHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Mothroach ] + +- type: entity + id: OrganPigHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Pig ] + +- type: entity + id: OrganChikenHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Chiken ] + +- type: entity + id: OrganCatHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Cat ] + +- type: entity + id: OrganDogHeart + parent: OrganAnimalHeart + name: heart + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Dog ] \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml b/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml index d60ee2f7edb..c9ed43f05b7 100644 --- a/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml @@ -11,7 +11,98 @@ lungs: OrganAnimalLungs stomach: OrganManeaterAnimalStomach liver: OrganAnimalLiver - heart: OrganAnimalHeart + heart: OrganPigHeart + kidneys: OrganAnimalKidneys + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal + +- type: body + id: Kobold + name: "kobold" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - hands + - legs + organs: + lungs: OrganAnimalLungs + stomach: OrganAnimalStomach + liver: OrganAnimalLiver + heart: OrganKoboldHeart + kidneys: OrganAnimalKidneys + hands: + part: HandsAnimal + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal + +- type: body + id: Chiken + name: "chiken" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - legs + organs: + lungs: OrganAnimalLungs + stomach: OrganManeaterAnimalStomach + liver: OrganAnimalLiver + heart: OrganChikenHeart + kidneys: OrganAnimalKidneys + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal + +- type: body + id: Cat + name: "cat" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - legs + organs: + lungs: OrganAnimalLungs + stomach: OrganManeaterAnimalStomach + liver: OrganAnimalLiver + heart: OrganCatHeart + kidneys: OrganAnimalKidneys + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal + +- type: body + id: Dog + name: "dog" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - legs + organs: + lungs: OrganAnimalLungs + stomach: OrganManeaterAnimalStomach + liver: OrganAnimalLiver + heart: OrganDogHeart kidneys: OrganAnimalKidneys legs: part: LegsAnimal diff --git a/Resources/Prototypes/_Sunrise/Body/Prototypes/felinid.yml b/Resources/Prototypes/_Sunrise/Body/Prototypes/felinid.yml index 2c09219a356..53876e49885 100644 --- a/Resources/Prototypes/_Sunrise/Body/Prototypes/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Body/Prototypes/felinid.yml @@ -18,7 +18,7 @@ - left leg - right leg organs: - heart: OrganAnimalHeart + heart: OrganFelinidHeart lungs: OrganHumanLungs stomach: OrganReptilianStomach liver: OrganAnimalLiver diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml new file mode 100644 index 00000000000..189a8660f3f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CrateNPCVariantCubeBoxSunrise + icon: + sprite: Objects/Misc/monkeycube.rsi + state: box_variant + product: CrateNPCVariantCubeBoxSunrise + cost: 12000 + category: cargoproduct-category-name-medical + group: market diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/medical.yml new file mode 100644 index 00000000000..c5b12707453 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/medical.yml @@ -0,0 +1,9 @@ +- type: entity + id: CrateNPCVariantCubeBoxSunrise + parent: CrateGenericSteel + name: monkey cube crate + description: A crate containing single box of monkey cubes. + components: + - type: StorageFill + contents: + - id: VariantCubeBoxSunrise \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml new file mode 100644 index 00000000000..82a751abc52 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml @@ -0,0 +1,35 @@ +- type: metabolizerType + id: Primate + name: metabolizer-type-primate + +- type: metabolizerType + id: Kobold + name: metabolizer-type-kobold + +- type: metabolizerType + id: Felinid + name: metabolizer-type-felinid + +- type: metabolizerType + id: WildSlime + name: metabolizer-type-wild-slime + +- type: metabolizerType + id: Mothroach + name: metabolizer-type-mothroach + +- type: metabolizerType + id: Pig + name: metabolizer-type-pig + +- type: metabolizerType + id: Chiken + name: metabolizer-type-chiken + +- type: metabolizerType + id: Cat + name: metabolizer-type-cat + +- type: metabolizerType + id: Dog + name: metabolizer-type-dog \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml new file mode 100644 index 00000000000..b007842622d --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml @@ -0,0 +1,91 @@ +- type: entity + parent: MonkeyCubeBox + name: variant cube box + id: VariantCubeBoxSunrise + description: Both kobold, mothroach, pig, slime, chiken cubes and monkey cubes. Just add water! + components: + - type: StorageFill + contents: + - id: KoboldCubeWrapped + amount: 2 + - id: MonkeyCubeWrapped + amount: 2 + - id: MothroachCubeWrapped + amount: 2 + - id: PigCubeWrapped + amount: 2 + - id: SlimeCubeWrapped + amount: 2 + - id: ChikenCubeWrapped + amount: 2 + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: box_variant + - type: Storage + maxItemSize: Small + grid: + - 0,0,3,2 + +- type: entity + parent: MonkeyCubeWrapped + name: mothroach cube + suffix: Wrapped + id: MothroachCubeWrapped + description: Unwrap this to get a mothroach cube. + components: + - type: SpawnItemsOnUse + items: + - id: MothroachCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _Sunrise/Objects/Misc/cube.rsi + state: wrapper_mothroach + +- type: entity + parent: MonkeyCubeWrapped + name: pig cube + suffix: Wrapped + id: PigCubeWrapped + description: Unwrap this to get a pig cube. + components: + - type: SpawnItemsOnUse + items: + - id: PigCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _Sunrise/Objects/Misc/cube.rsi + state: wrapper_pig + +- type: entity + parent: MonkeyCubeWrapped + name: slime cube + suffix: Wrapped + id: SlimeCubeWrapped + description: Unwrap this to get a slime cube. + components: + - type: SpawnItemsOnUse + items: + - id: WildSlimeCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _Sunrise/Objects/Misc/cube.rsi + state: wrapper_slime + +- type: entity + parent: MonkeyCubeWrapped + name: chiken cube + suffix: Wrapped + id: ChikenCubeWrapped + description: Unwrap this to get a chiken cube. + components: + - type: SpawnItemsOnUse + items: + - id: ChikenCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _Sunrise/Objects/Misc/cube.rsi + state: wrapper_chiken \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml new file mode 100644 index 00000000000..05a16aafe4e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml @@ -0,0 +1,26 @@ +- type: entity + parent: MonkeyCube + id: WildSlimeCube + name: wild slime cube + components: + - type: Rehydratable + possibleSpawns: + - MobAdultSlimesBlue + +- type: entity + parent: MonkeyCube + id: PigCube + name: pig cube + components: + - type: Rehydratable + possibleSpawns: + - MobPig + +- type: entity + parent: MonkeyCube + id: ChikenCube + name: chiken cube + components: + - type: Rehydratable + possibleSpawns: + - MobChicken \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index 905002a7bdf..4aa9a5a2876 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -2,11 +2,91 @@ id: PermanentlyMonkey configuration: entity: MobMonkey + transferName: true forced: true inventory: Transfer revertOnCrit: false revertOnDeath: false +- type: polymorph + id: PermanentlyHuman + configuration: + entity: MobHuman + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlyReptilian + configuration: + entity: MobReptilian + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlyTajaran + configuration: + entity: MobTajaran + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + allowRepeatedMorphs: true + +- type: polymorph + id: PermanentlySlime + configuration: + entity: MobSlimePerson + forced: true + transferName: true + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlyMoth + configuration: + entity: MobMoth + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlySwine + configuration: + entity: MobSwine + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlyVox + configuration: + entity: MobVox + forced: true + transferName: true + revertOnCrit: false + revertOnDeath: false + +- type: polymorph + id: PermanentlyVulpkanin + configuration: + entity: MobVulpkanin + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + # TODO: Генетика #- type: polymorph # id: ClowanHulk diff --git a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml new file mode 100644 index 00000000000..b57914909c0 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml @@ -0,0 +1,66 @@ +- type: reagent + id: Darvinium + name: reagent-name-darvinium + group: Medicine + desc: reagent-desc-darvinium + physicalDesc: reagent-physical-desc-glowing + color: "#59b23a" + metabolisms: + Medicine: + effects: + - !type:Polymorph + prototype: PermanentlyHuman + conditions: + - !type:OrganType + type: Primate + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyReptilian + conditions: + - !type:OrganType + type: Kobold + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyTajaran + conditions: + - !type:OrganType + type: Felinid + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlySlime + conditions: + - !type:OrganType + type: WildSlime + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyMoth + conditions: + - !type:OrganType + type: Mothroach + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlySwine + conditions: + - !type:OrganType + type: Pig + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyVox + conditions: + - !type:OrganType + type: Chiken + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyVulpkanin + conditions: + - !type:OrganType + type: Dog + - !type:ReagentThreshold + min: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml index 4bc6055756c..730fc66d73d 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml @@ -52,3 +52,13 @@ amount: 1 products: Dylomet: 1 + +- type: reaction + id: Darvinium + reactants: + Blood: + amount: 1 + UnstableMutagen: + amount: 1 + products: + Darvinium: 2 \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/meta.json new file mode 100644 index 00000000000..7c2a9fd2ce6 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. and redacted @banumbas (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wrapper_mothroach" + }, + { + "name": "wrapper_pig" + }, + { + "name": "wrapper_slime" + }, + { + "name": "wrapper_chiken" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_chiken.png b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_chiken.png new file mode 100644 index 00000000000..7b2a7c42b6e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_chiken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_mothroach.png b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_mothroach.png new file mode 100644 index 00000000000..b5395a55341 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_mothroach.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_pig.png b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_pig.png new file mode 100644 index 00000000000..2c581a8e1f2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_pig.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_slime.png b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_slime.png new file mode 100644 index 00000000000..33039b8472a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_slime.png differ