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

Make Brains Not Food #1044

Merged
merged 1 commit into from
Oct 13, 2024
Merged
Changes from all 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
Make Brains Not Food
VMSolidus committed Oct 13, 2024
commit 585809883b83275ff31757dacdcb686f7b550350
13 changes: 7 additions & 6 deletions Resources/Prototypes/Body/Organs/diona.yml
Original file line number Diff line number Diff line change
@@ -27,11 +27,12 @@

- type: entity
id: OrganDionaBrain
parent: [BaseDionaOrgan, OrganHumanBrain]
parent: OrganHumanBrain
name: brain
description: "The source of incredible, unending intelligence. Honk."
components:
- type: Sprite
sprite: Mobs/Species/Diona/organs.rsi
state: brain
- type: SolutionContainerManager
solutions:
@@ -102,7 +103,7 @@
layers:
- state: lung-l
- state: lung-r
- type: Lung
- type: Lung
- type: Metabolizer
removeEmpty: true
solutionOnBody: false
@@ -131,7 +132,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

@@ -170,11 +171,11 @@

- type: entity
id: OrganDionaNymphStomach
parent: MobDionaNymphAccent
parent: MobDionaNymphAccent
noSpawn: true
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
@@ -186,7 +187,7 @@
noSpawn: true
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
16 changes: 8 additions & 8 deletions Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,13 @@
- type: Sprite
sprite: Mobs/Species/Human/organs.rsi
- type: Organ

- type: entity
id: BaseHumanOrgan
parent: BaseHumanOrganUnGibbable
abstract: true
components:
- type: Gibbable
- type: Food
- type: Extractable
grindableSolutionName: organ
@@ -27,13 +34,6 @@
tags:
- Meat

- type: entity
id: BaseHumanOrgan
parent: BaseHumanOrganUnGibbable
abstract: true
components:
- type: Gibbable

- type: entity
id: OrganHumanBrain
parent: BaseHumanOrganUnGibbable
@@ -67,7 +67,7 @@
- type: FlavorProfile
flavors:
- people

- type: entity
id: OrganHumanEyes
parent: BaseHumanOrgan
4 changes: 2 additions & 2 deletions Resources/Prototypes/Body/Organs/slime.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: SentientSlimeCore
parent: [BaseItem, OrganHumanBrain]
parent: OrganHumanBrain
name: sentient slime core
description: "The source of incredible, unending gooeyness."
components:
@@ -34,7 +34,7 @@
- ReagentId: Slime
Quantity: 10


- type: entity
id: OrganSlimeLungs
parent: BaseHumanOrgan