Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Дарвиний #1210

Merged
merged 9 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Content.Server/EntityEffects/Effects/MakeSentient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -28,6 +29,13 @@ public override void Effect(EntityEffectBaseArgs args)
return;
}

// Sunrise Start
if (entityManager.TryGetComponent<CognizinFixComponent>(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))
{
Expand Down
6 changes: 6 additions & 0 deletions Content.Shared/_Sunrise/Reagents/CognizinFixComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Robust.Shared.GameStates;

namespace Content.Shared._Sunrise.Reagents;

[RegisterComponent, NetworkedComponent]
public sealed partial class CognizinFixComponent : Component { }
21 changes: 21 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl
Original file line number Diff line number Diff line change
@@ -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 }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-CrateNPCVariantCubeBoxSunrise = ящик с кубиками генетических предков
.desc = Ящик, содержит кубики генетических предков. 2 кубика обезьян, слаймов, куриц, свиней и таракамолей.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ent-VariantCubeBoxSunrise = коробка кубиков генетических предков
.desc = Кубики генетических предков.
ent-SlimeCubeWrapped = кубик слайма
.desc = Разверните его, чтобы получить кубик слайма.
.suffix = Завёрнутый
ent-ChikenCubeWrapped = кубик курицы
.desc = Разверните его, чтобы получить кубик курицы.
.suffix = Завёрнутый
ent-PigCubeWrapped = кубик свиньи
.desc = Разверните его, чтобы получить кубик свиньи.
.suffix = Завёрнутый
ent-MothroachCubeWrapped = кубик таракамоли
.desc = Разверните его, чтобы получить кубик таракамоли.
.suffix = Завёрнутый
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-PigCube = свиной кубик
.desc = Просто добавь воды!
ent-WildSlimeCube = слаймовый кубик
.desc = Просто добавь воды!
ent-ChikenCube = куриный кубик
.desc = Просто добавь воды!
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-darvinium = дарвиниум
reagent-desc-darvinium = Лекарство способное ускорить развитие генома почти любого низшего существа, и превратить его в гуманоида.
Original file line number Diff line number Diff line change
@@ -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 = Собака
2 changes: 1 addition & 1 deletion Resources/Prototypes/Body/Prototypes/Animal/slimes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
connections:
- legs
organs:
core: SentientSlimesCore
core: SentientWildSlimeCore # Sunrise Edit
lungs: OrganSlimesLungs
legs:
part: LegsAnimal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
lungs: OrganAnimalLungs
stomach: OrganMothStomach
liver: OrganAnimalLiver
heart: OrganAnimalHeart
heart: OrganMothroachHeart # Sunrise Edit
kidneys: OrganAnimalKidneys
2 changes: 1 addition & 1 deletion Resources/Prototypes/Body/Prototypes/primate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
lungs: OrganAnimalLungs
stomach: OrganAnimalStomach
liver: OrganAnimalLiver
heart: OrganAnimalHeart
heart: OrganPrimateHeart # Sunrise Edit
kidneys: OrganAnimalKidneys
hands:
part: HandsAnimal
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@
factions:
- Passive
# Sunrise-start
- type: Body
prototype: Chiken
- type: Carriable
- type: CanEscapeInventory
# Sunrise-end
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2852,6 +2858,8 @@
# Sunrise-start
- type: Carriable
- type: CanEscapeInventory
- type: Body
prototype: Dog
# Sunrise-end

- type: entity
Expand Down Expand Up @@ -3016,6 +3024,8 @@
color: "#808080"
- type: Carriable
- type: CanEscapeInventory
- type: Body
prototype: Cat
# Sunrise-end

- type: entity
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
- VimPilot
- type: StealTarget
stealGroup: AnimalIan
# Sunrise Start
- type: Body
prototype: Animal
# Sunrise End

- type: entity
name: Old Ian
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@
Quantity: 25
- type: Food
requiresSpecialDigestion: true
- type: CognizinFix
# Sunrise-End

- type: entity
Expand Down
83 changes: 82 additions & 1 deletion Resources/Prototypes/_Sunrise/Body/Organs/animal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,85 @@
specialDigestible:
components:
- Identity
isDigestibleAddition: true
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 ]
93 changes: 92 additions & 1 deletion Resources/Prototypes/_Sunrise/Body/Prototypes/animal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- left leg
- right leg
organs:
heart: OrganAnimalHeart
heart: OrganFelinidHeart
lungs: OrganHumanLungs
stomach: OrganReptilianStomach
liver: OrganAnimalLiver
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: cargoProduct
id: CrateNPCVariantCubeBoxSunrise
icon:
sprite: Objects/Misc/monkeycube.rsi
state: box_variant
product: CrateNPCVariantCubeBoxSunrise
cost: 3000
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

с ценой проблемы, внутри лежат 2 свиньи и 2 курицы. Покупка данных животных отдельно будет стоить дороже.

category: cargoproduct-category-name-medical
group: market
Loading
Loading