From 0456d23f18d7b55115454d1269ec4adabbad7a44 Mon Sep 17 00:00:00 2001 From: banumbas Date: Tue, 28 Jan 2025 19:16:57 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=91=D1=8B=D0=BB=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B4=D0=B0=D1=80=D0=B2=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_sunrise/body/organs/animal.ftl | 23 +++++- .../_sunrise/reagents/medicine.ftl | 2 + .../_sunrise/metabolism/metabolizer-types.ftl | 7 ++ .../Body/Prototypes/Animal/slimes.yml | 2 +- .../Body/Prototypes/Specific/mothroach.yml | 2 +- .../Prototypes/Body/Prototypes/primate.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 5 ++ .../_Sunrise/Body/Organs/animal.yml | 65 ++++++++++++++++- .../_Sunrise/Body/Prototypes/animal.yml | 49 ++++++++++++- .../_Sunrise/Body/Prototypes/felinid.yml | 2 +- .../_Sunrise/Chemistry/metabolizer_types.yml | 27 +++++++ .../_Sunrise/Polymorphs/polymorph.yml | 71 +++++++++++++++++++ .../Prototypes/_Sunrise/Reagents/medicine.yml | 60 ++++++++++++++++ .../_Sunrise/Recipes/Reactions/medicine.yml | 10 +++ 14 files changed, 320 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl create mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl create mode 100644 Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml create mode 100644 Resources/Prototypes/_Sunrise/Reagents/medicine.yml 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..38b15ee1c44 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 +ent-OrganManeaterAnimalStomach = { ent-OrganAnimalHeart } .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/reagents/medicine.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl new file mode 100644 index 00000000000..c47f4a1222e --- /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..48aa4f1f2a8 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl @@ -0,0 +1,7 @@ +metabolizer-type-primate = Примат +metabolizer-type-chiken = Курица +metabolizer-type-pig = Свинья +metabolizer-type-mothroach = Таракамоль +metabolizer-type-wild-slime = Дикий слайм +metabolizer-type-felinid = Фелинид +metabolizer-type-kobold = Кобольд \ 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..daf17cded4b 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 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/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 74eb66c49e8..75867e53047 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,9 @@ name: ghost-role-information-kobold-name description: ghost-role-information-kobold-description rules: ghost-role-information-nonantagonist-rules + # Sunrise Start + - type: Body + prototype: Kobold - type: entity name: kobold diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml index 68e43c63b15..7cdefcecc46 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml @@ -8,4 +8,67 @@ specialDigestible: components: - Identity - isDigestibleAddition: true \ No newline at end of file + isDigestibleAddition: true + +- type: entity + id: OrganPrimateHeart + parent: OrganAnimalHeart + name: stomach + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Primate ] + +- type: entity + id: OrganKoboldHeart + parent: OrganAnimalHeart + name: stomach + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Kobold ] + +- type: entity + id: OrganFelinidHeart + parent: OrganAnimalHeart + name: stomach + 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: stomach + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Mothroach ] + +- type: entity + id: OrganPigHeart + parent: OrganAnimalHeart + name: stomach + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Pig ] + +- type: entity + id: OrganChikenHeart + parent: OrganAnimalHeart + name: stomach + categories: [ HideSpawnMenu ] + components: + - type: Metabolizer + metabolizerTypes: [ Animal, Chiken ] \ 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..0f5b01ed422 100644 --- a/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml @@ -11,7 +11,54 @@ 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 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/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml new file mode 100644 index 00000000000..09e15417621 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml @@ -0,0 +1,27 @@ +- 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-swine + +- type: metabolizerType + id: Chiken + name: metabolizer-type-chiken \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index 905002a7bdf..dbf911f9457 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -2,11 +2,82 @@ 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 + +- type: polymorph + id: PermanentlySlime + configuration: + entity: MobSlimePerson + forced: true + transferName: true + inventory: Transfer + 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 + 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..ee84b455a05 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml @@ -0,0 +1,60 @@ +- type: reagent + id: Darvinium + name: reagent-name-darvinium + group: Medicine + desc: reagent-desc-darvinium + physicalDesc: reagent-physical-desc-glowing + flavor: human + 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 \ 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 From 995663dde038f03419cfede53e67cb7df146e3c5 Mon Sep 17 00:00:00 2001 From: banumbas Date: Tue, 28 Jan 2025 19:24:46 +0300 Subject: [PATCH 2/9] =?UTF-8?q?=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl | 2 +- .../Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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 38b15ee1c44..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,4 +1,4 @@ -ent-OrganManeaterAnimalStomach = { ent-OrganAnimalHeart } +ent-OrganManeaterAnimalStomach = maneater stomach .desc = { ent-OrganAnimalStomach.desc } ent-OrganPrimateHeart = { ent-OrganAnimalHeart } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl index c47f4a1222e..7caeef0e3c8 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl @@ -1,2 +1,2 @@ reagent-name-darvinium = дарвиниум -reagent-desc-darvinium = Лекарство способное изменить геном обезьяны и превратить её в человека. \ No newline at end of file +reagent-desc-darvinium = Лекарство способное ускорить развитие генома почти любого низшего существа, и превратить его в гуманоида. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 75867e53047..6b257ff1d06 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1574,6 +1574,7 @@ # Sunrise Start - type: Body prototype: Kobold + # Sunrise End - type: entity name: kobold From 5dded932449fc913af556875b0d00ed75fb2083e Mon Sep 17 00:00:00 2001 From: banumbas Date: Tue, 28 Jan 2025 21:16:27 +0300 Subject: [PATCH 3/9] =?UTF-8?q?=D0=B0=D0=B0=D0=B0=20=D0=BD=D0=B0=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=B5=D1=86=20=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_sunrise/catalog/fills/crates/medical.ftl | 2 + .../_sunrise/entities/objects/misc/cube.ftl | 14 +++ .../objects/specific/rehydrateable.ftl | 6 ++ .../Catalog/Fills/Lockers/heads.yml | 1 + .../_Sunrise/Catalog/Cargo/cargo_medical.yml | 9 ++ .../_Sunrise/Catalog/Fills/Crates/medical.yml | 9 ++ .../_Sunrise/Entities/Objects/Misc/cube.yml | 91 ++++++++++++++++++ .../Objects/Specific/rehydrateable.yml | 26 +++++ .../_Sunrise/Objects/Misc/cube.rsi/meta.json | 23 +++++ .../Objects/Misc/cube.rsi/wrapper_chiken.png | Bin 0 -> 232 bytes .../Misc/cube.rsi/wrapper_mothroach.png | Bin 0 -> 227 bytes .../Objects/Misc/cube.rsi/wrapper_pig.png | Bin 0 -> 252 bytes .../Objects/Misc/cube.rsi/wrapper_slime.png | Bin 0 -> 243 bytes 13 files changed, 181 insertions(+) create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/medical.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/cube.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/rehydrateable.ftl create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/medical.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_chiken.png create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_mothroach.png create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_pig.png create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/cube.rsi/wrapper_slime.png 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/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/_Sunrise/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml new file mode 100644 index 00000000000..0e6d7c2bdf0 --- /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: 3000 + category: cargoproduct-category-name-medical + group: market \ No newline at end of file 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/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..f697cd3512b --- /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: + - MobChiken \ 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 0000000000000000000000000000000000000000..7b2a7c42b6e601a26f6045f83304339af7c0dd01 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#%N%Ln2z= zUNPiiG8AZiSby|X19vqe{{vo~pei=~3Bi?&=Myp$v!8OlVLm-6gnMJhp>=mv%(y?B zCU%{%VG|1Q(%hPIZqgjpt6ws_*qKXa$NZjg{ fW%klsdPVxo7VVWuvv;urUCZF<>gTe~DWM4f83I|{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b5395a553413d7c0b74cc11927907504ce72abd0 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn2z= zUfIZb$U)@T$ND3(EaC#{1uU%X1r0q45gdIJPQ5y|LolyNz+uCJ5yP|U2v>Q>}Uzi;h z$v>!?DZbx1X@7I!re&5~I;FY4#6I1g(mOpmzVVmi*Y~%MbH??)58Y|%|7ow@Z*~_K a7dy_UTGPF~K2-o6%HZkh=d#Wzp$P!xms?N( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2c581a8e1f222f96c560081a2955a94f327ca38b GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dN$yLn2y} z6C_v{Cy4Yk1sY5__^4p!|L()7|ALd)ly{058yFa@=-vdP4DQtYo!kfnie*oQC!JM} zJPcB5(7iqO|A_-Y@L=gl{&J3$eF=(J8N=;17#bM-N!juH8T*|_s?Y5WI0_An_WX9N z%9-$nA*JB6=@G>#3~F5^!Hhh%>?QB^9ItrFEPc3K%ueKEx&1$5AFE%}*2K7)X_SZm onxC%g6KH9`<#td5>`Vp*uTRFe3Il(H0e!&W>FVdQ&MBb@055D|q5uE@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..33039b8472ae8e67d90c2c9cf91c4918e4fd860c GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2y} z6C_v{Cy4Yk1sY6gbbIsYztqO=|G`OY$~(o34GatlJYE1v1A{*mg{_T1@bK89h)HLa zBbz}=Ux+Dx_AF)LUdi|4^Cz3b{2FH$%bz{~1RqN3^_iD>|f!@ Date: Wed, 29 Jan 2025 17:30:51 +0300 Subject: [PATCH 4/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8,=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=83=D0=BB=D1=8C=D0=BF?= =?UTF-8?q?=20=D0=B8=20=D1=84=D0=B5=D0=BB=D0=B8=D0=BD=D0=B8=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Body/Prototypes/Specific/mothroach.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 4 ++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 4 ++ .../_Sunrise/Body/Organs/animal.yml | 32 +++++++++++--- .../_Sunrise/Body/Prototypes/animal.yml | 44 +++++++++++++++++++ .../_Sunrise/Chemistry/metabolizer_types.yml | 12 ++++- .../Objects/Specific/rehydrateable.yml | 2 +- .../_Sunrise/Polymorphs/polymorph.yml | 22 ++++++++++ .../Prototypes/_Sunrise/Reagents/medicine.yml | 14 ++++++ 9 files changed, 125 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml index daf17cded4b..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: OrganMothroachHeart + heart: OrganMothroachHeart # Sunrise Edit kidneys: OrganAnimalKidneys diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6b257ff1d06..f3f94c5726a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2858,6 +2858,8 @@ # Sunrise-start - type: Carriable - type: CanEscapeInventory + - type: Body + prototype: Dog # Sunrise-end - type: entity @@ -3022,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/_Sunrise/Body/Organs/animal.yml b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml index 7cdefcecc46..723dcecab53 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/animal.yml @@ -13,7 +13,7 @@ - type: entity id: OrganPrimateHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer @@ -22,7 +22,7 @@ - type: entity id: OrganKoboldHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer @@ -31,7 +31,7 @@ - type: entity id: OrganFelinidHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer @@ -49,7 +49,7 @@ - type: entity id: OrganMothroachHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer @@ -58,7 +58,7 @@ - type: entity id: OrganPigHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer @@ -67,8 +67,26 @@ - type: entity id: OrganChikenHeart parent: OrganAnimalHeart - name: stomach + name: heart categories: [ HideSpawnMenu ] components: - type: Metabolizer - metabolizerTypes: [ Animal, Chiken ] \ No newline at end of file + 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 0f5b01ed422..c9ed43f05b7 100644 --- a/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml +++ b/Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml @@ -64,5 +64,49 @@ 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 + connections: + - feet feet: part: FeetAnimal \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml index 09e15417621..e27ed3e242e 100644 --- a/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml @@ -20,8 +20,16 @@ - type: metabolizerType id: Pig - name: metabolizer-type-swine + name: metabolizer-type-pig - type: metabolizerType id: Chiken - name: metabolizer-type-chiken \ No newline at end of file + name: metabolizer-type-chiken + +- type: metabolizerType + id: Cat + name: metabolizer-type-cat + +- type: metabolizerType + id: Dog + name: metabolizer-type-cat \ 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 index f697cd3512b..05a16aafe4e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/rehydrateable.yml @@ -23,4 +23,4 @@ components: - type: Rehydratable possibleSpawns: - - MobChiken \ No newline at end of file + - MobChicken \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index dbf911f9457..ae397005b09 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -37,6 +37,7 @@ inventory: Transfer revertOnCrit: false revertOnDeath: false + allowRepeatedMorphs: true - type: polymorph id: PermanentlySlime @@ -78,6 +79,27 @@ revertOnCrit: false revertOnDeath: false +- type: polymorph + id: PermanentlyFelinid + configuration: + entity: MobFelinid + forced: true + transferName: true + inventory: Transfer + revertOnCrit: false + revertOnDeath: false + allowRepeatedMorphs: true + +- 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 index ee84b455a05..3870279b5cb 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml @@ -56,5 +56,19 @@ conditions: - !type:OrganType type: Chiken + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyFelinid + conditions: + - !type:OrganType + type: Cat + - !type:ReagentThreshold + min: 5 + - !type:Polymorph + prototype: PermanentlyVulpkanin + conditions: + - !type:OrganType + type: Dog - !type:ReagentThreshold min: 5 \ No newline at end of file From 900c1614f71e9d3364728051e5c537efa43eeacd Mon Sep 17 00:00:00 2001 From: banumbas Date: Wed, 29 Jan 2025 17:48:43 +0300 Subject: [PATCH 5/9] =?UTF-8?q?=D0=B1=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=B2=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D0=BE=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index ae397005b09..7cbde9df931 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -45,7 +45,6 @@ entity: MobSlimePerson forced: true transferName: true - inventory: Transfer revertOnCrit: false revertOnDeath: false @@ -75,7 +74,6 @@ entity: MobVox forced: true transferName: true - inventory: Transfer revertOnCrit: false revertOnDeath: false From 5004a3b7b8a4c68e5fe9b2b0afce83ef14b6ee85 Mon Sep 17 00:00:00 2001 From: banumbas Date: Wed, 29 Jan 2025 18:19:44 +0300 Subject: [PATCH 6/9] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B8=20=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl | 4 +++- Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml | 2 +- Resources/Prototypes/_Sunrise/Reagents/medicine.yml | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl index 48aa4f1f2a8..a9d19e86e76 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl @@ -4,4 +4,6 @@ metabolizer-type-pig = Свинья metabolizer-type-mothroach = Таракамоль metabolizer-type-wild-slime = Дикий слайм metabolizer-type-felinid = Фелинид -metabolizer-type-kobold = Кобольд \ No newline at end of file +metabolizer-type-kobold = Кобольд +metabolizer-type-cat = Кот +metabolizer-type-dog = Собака \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml index e27ed3e242e..82a751abc52 100644 --- a/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/_Sunrise/Chemistry/metabolizer_types.yml @@ -32,4 +32,4 @@ - type: metabolizerType id: Dog - name: metabolizer-type-cat \ No newline at end of file + name: metabolizer-type-dog \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml index 3870279b5cb..dd67f0413f8 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml @@ -4,7 +4,6 @@ group: Medicine desc: reagent-desc-darvinium physicalDesc: reagent-physical-desc-glowing - flavor: human color: "#59b23a" metabolisms: Medicine: From f26b014bb0e4f94858a348402c709573d4b135fa Mon Sep 17 00:00:00 2001 From: banumbas Date: Thu, 30 Jan 2025 17:05:39 +0300 Subject: [PATCH 7/9] =?UTF-8?q?=D0=B7=D0=B0=D0=B5=D0=B1=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=20=D1=87=D1=91=20=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/EntityEffects/Effects/MakeSentient.cs | 8 ++++++++ Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs | 6 ++++++ Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 + 3 files changed, 15 insertions(+) create mode 100644 Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs 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/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 From e06bf22c138468c2c9928a9979fcc6e7883c7303 Mon Sep 17 00:00:00 2001 From: banumbas Date: Thu, 30 Jan 2025 17:23:25 +0300 Subject: [PATCH 8/9] =?UTF-8?q?=D1=84=D0=B5=D0=BB=D0=B8=D0=BD=D0=B8=D0=B4?= =?UTF-8?q?=D1=8B=20=D0=BB=D0=B8=D0=BA=D0=B2=D0=B8=D0=B4=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_Sunrise/Polymorphs/polymorph.yml | 11 ----------- Resources/Prototypes/_Sunrise/Reagents/medicine.yml | 7 ------- 2 files changed, 18 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index 7cbde9df931..4aa9a5a2876 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -77,17 +77,6 @@ revertOnCrit: false revertOnDeath: false -- type: polymorph - id: PermanentlyFelinid - configuration: - entity: MobFelinid - forced: true - transferName: true - inventory: Transfer - revertOnCrit: false - revertOnDeath: false - allowRepeatedMorphs: true - - type: polymorph id: PermanentlyVulpkanin configuration: diff --git a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml index dd67f0413f8..b57914909c0 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/medicine.yml @@ -57,13 +57,6 @@ type: Chiken - !type:ReagentThreshold min: 5 - - !type:Polymorph - prototype: PermanentlyFelinid - conditions: - - !type:OrganType - type: Cat - - !type:ReagentThreshold - min: 5 - !type:Polymorph prototype: PermanentlyVulpkanin conditions: From 9eedb1927344bd93589d0a028c5b2d3de30da50c Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Tue, 4 Feb 2025 04:02:36 +0300 Subject: [PATCH 9/9] Update cargo_medical.yml --- Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml index 0e6d7c2bdf0..189a8660f3f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml @@ -4,6 +4,6 @@ sprite: Objects/Misc/monkeycube.rsi state: box_variant product: CrateNPCVariantCubeBoxSunrise - cost: 3000 + cost: 12000 category: cargoproduct-category-name-medical - group: market \ No newline at end of file + group: market