diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index bf865a07fd..378969698e 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 diona's pseudo-neurological activity, its root-like tendrils search for its former body." + 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 @@ -67,7 +67,7 @@ id: OrganDionaStomach parent: BaseDionaOrgan name: stomach - description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar." + description: "The silva'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: 6 + maxReagents: 2 metabolizerTypes: [ Plant ] removeEmpty: true groups: @@ -108,7 +108,7 @@ - type: Item size: Small heldPrefix: lungs - - type: Lung + - type: Lung - type: Metabolizer removeEmpty: true solutionOnBody: false @@ -137,7 +137,7 @@ description: "The source of incredible, unending intelligence. Honk." components: - type: Brain - - type: Nymph # This will make the organs turn into a nymph when they're removed. + - type: Nymph # This will make the organs turn into a nymph when they're removed. entityPrototype: OrganDionaNymphBrain transferMind: true @@ -176,11 +176,11 @@ - type: entity id: OrganDionaNymphStomach - parent: MobDionaNymphAccent + parent: MobDionaNymphAccent categories: [ HideSpawnMenu ] name: diona nymph suffix: Stomach - description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. + description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. components: - type: IsDeadIC - type: Body @@ -192,7 +192,7 @@ categories: [ HideSpawnMenu ] name: diona nymph suffix: Lungs - description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. + description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. components: - type: IsDeadIC - type: Body diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 68448bc0c9..623db59a83 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -450,6 +450,12 @@ effects: - !type:SatiateThirst factor: 4 + - !type:CP14ManaChange + manaDelta: 0.2 + safe: true + conditions: + - !type:OrganType + type: Plant Gas: effects: - !type:HealthChange diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml b/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml index 9c304166c5..9e85c4a084 100644 --- a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml +++ b/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml @@ -8,21 +8,18 @@ connections: - torso organs: - brain: OrganHumanBrain - eyes: OrganHumanEyes + brain: OrganDionaBrain + eyes: OrganDionaEyes torso: - part: TorsoHuman + part: TorsoDiona connections: - right_arm - left_arm - right_leg - left_leg organs: - heart: OrganHumanHeart - lungs: OrganHumanLungs - stomach: OrganHumanStomach - liver: OrganHumanLiver - kidneys: OrganHumanKidneys + lungs: OrganDionaLungs + stomach: OrganDionaStomach right_arm: part: CP14RightArmHuman connections: diff --git a/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml b/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml index af1775ed97..616c3ca0e3 100644 --- a/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml @@ -32,6 +32,12 @@ effects: - !type:SatiateThirst factor: 15 + - !type:CP14ManaChange + manaDelta: 4 + safe: true + conditions: + - !type:OrganType + type: Plant pricePerUnit: 1.0 # Most basic effect - type: reagent @@ -47,7 +53,7 @@ metabolismRate: 0.05 effects: - !type:CP14ManaChange - manaDelta: 1.5 + manaDelta: 3 safe: true pricePerUnit: 5.0 # 2×Energia (0.4) + 1×Motion (0.2) + Water (0.1) = 0.7 → x7.14 (high value)