diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 378969698e..18af32295b 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -29,7 +29,7 @@ id: OrganDionaBrain parent: [BaseDionaOrgan, OrganHumanBrain] name: brain - description: "The central hub of a silva's pseudo-neurological activity, its root-like tendrils search for its former body." + description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body." components: - type: Item size: Small @@ -67,7 +67,7 @@ id: OrganDionaStomach parent: BaseDionaOrgan name: stomach - description: "The silva's equivalent of a stomach, it reeks of asparagus and vinegar." + description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar." components: - type: Sprite state: stomach @@ -82,7 +82,7 @@ Quantity: 5 - type: Stomach - type: Metabolizer - maxReagents: 2 + maxReagents: 6 metabolizerTypes: [ Plant ] removeEmpty: true groups: diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 623db59a83..a7eb60cf30 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -450,7 +450,7 @@ effects: - !type:SatiateThirst factor: 4 - - !type:CP14ManaChange + - !type:CP14ManaChange #CE change manaDelta: 0.2 safe: true conditions: diff --git a/Resources/Prototypes/_CP14/Body/Organs/silva.yml b/Resources/Prototypes/_CP14/Body/Organs/silva.yml new file mode 100644 index 0000000000..4dc3ec7290 --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Organs/silva.yml @@ -0,0 +1,129 @@ +- type: entity + id: CP14BaseSilvaOrgan + parent: BaseItem + abstract: true + components: + - type: Sprite + sprite: Mobs/Species/Diona/organs.rsi + - type: Organ + - type: Food + - type: Extractable + grindableSolutionName: organ + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - type: FlavorProfile + flavors: + - people + +- type: entity + id: CP14OrganSilvaBrain + parent: [CP14BaseSilvaOrgan, OrganHumanBrain] + name: brain + description: "The central hub of a silva's pseudo-neurological activity, its root-like tendrils search for its former body." + components: + - type: Item + size: Small + heldPrefix: brain + - type: Sprite + state: brain + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: GreyMatter + Quantity: 5 + +- type: entity + id: CP14OrganSilvaEyes + parent: CP14BaseSilvaOrgan + name: eyes + description: "I see you!" + components: + - type: Sprite + layers: + - state: eyeball-l + - state: eyeball-r + +- type: entity + id: CP14OrganSilvaStomach + parent: CP14BaseSilvaOrgan + name: stomach + description: "The silva's equivalent of a stomach, it reeks of asparagus and vinegar." + components: + - type: Sprite + state: stomach + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - type: Stomach + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Plant ] + removeEmpty: true + groups: + - id: Food + - id: Drink + - id: Medicine + - id: Poison + - id: Narcotic + - id: Alcohol + rateModifier: 0.1 + - type: Item + size: Small + heldPrefix: stomach + +- type: entity + id: CP14OrganSilvaLungs + parent: CP14BaseSilvaOrgan + name: lungs + description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen." + components: + - type: Sprite + state: lungs + - type: Item + size: Small + heldPrefix: lungs + - type: Lung + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Plant ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml b/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml index 9e85c4a084..eb78376db6 100644 --- a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml +++ b/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml @@ -8,8 +8,8 @@ connections: - torso organs: - brain: OrganDionaBrain - eyes: OrganDionaEyes + brain: CP14OrganSilvaBrain + eyes: CP14OrganSilvaEyes torso: part: TorsoDiona connections: @@ -18,8 +18,8 @@ - right_leg - left_leg organs: - lungs: OrganDionaLungs - stomach: OrganDionaStomach + lungs: CP14OrganSilvaLungs + stomach: CP14OrganSilvaStomach right_arm: part: CP14RightArmHuman connections: