Skip to content

Commit

Permalink
should be fine
Browse files Browse the repository at this point in the history
  • Loading branch information
lzk228 committed Sep 20, 2024
1 parent 7722bcc commit 2eade87
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 28 deletions.
16 changes: 8 additions & 8 deletions Resources/Prototypes/Body/Organs/arachnid.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
- type: entity
parent: BaseOrgan
id: BaseArachnidOrgan
abstract: true
suffix: arachnid
components:
- type: Sprite
sprite: Mobs/Species/Arachnid/organs.rsi

- type: entity
parent: [BaseArachnidOrgan, OrganAnimalStomach]
parent: [OrganAnimalStomach, BaseArachnidOrgan]
id: OrganArachnidStomach
components:
- type: Sprite
Expand All @@ -18,15 +18,15 @@
updateInterval: 1.5

- type: entity
parent: [BaseArachnidOrgan, BaseOrganLungs]
parent: [BaseOrganLungs, BaseArachnidOrgan]
id: OrganArachnidLungs
description: Filters oxygen from an atmosphere... just more greedily.
components:
- type: Metabolizer
updateInterval: 1.5

- type: entity
parent: [BaseArachnidOrgan, BaseOrganHeart]
parent: [BaseOrganHeart, BaseArachnidOrgan]
id: OrganArachnidHeart
description: A disgustingly persistent little biological pump made for spiders.
components:
Expand All @@ -36,26 +36,26 @@

- type: entity
id: OrganArachnidLiver
parent: [BaseHumanOrgan, OrganAnimalLiver] #TODO: sprite arachnid liver and change parent from BaseHumanOrgan to BaseArachnidOrgan
parent: [BaseHumanOrgan, OrganAnimalLiver, BaseArachnidOrgan] #TODO: sprite arachnid liver and change parent from BaseHumanOrgan to BaseArachnidOrgan
description: 'Pairing suggestion: chianti and fava beans.'
categories: [ HideSpawnMenu ]
components:
- type: Metabolizer
updateInterval: 1.5

- type: entity
parent: [ BaseHumanOrgan, OrganAnimalKidneys] #TODO: sprite arachnid kidneys and change parent from BaseHumanOrgan to BaseArachnidOrgan
parent: [ BaseHumanOrgan, OrganAnimalKidneys, BaseArachnidOrgan] #TODO: sprite arachnid kidneys and change parent from BaseHumanOrgan to BaseArachnidOrgan
id: OrganArachnidKidneys
categories: [ HideSpawnMenu ]
components:
- type: Metabolizer
updateInterval: 1.5

- type: entity
parent: [BaseArachnidOrgan, BaseOrganEyes]
parent: [BaseOrganEyes, BaseArachnidOrgan]
id: OrganArachnidEyes
description: Two was already too many.

- type: entity
parent: [BaseArachnidOrgan, BaseOrganTongue]
parent: [BaseOrganTongue, BaseArachnidOrgan]
id: OrganArachnidTongue
11 changes: 4 additions & 7 deletions Resources/Prototypes/Body/Organs/base.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
- type: entity # DO NOT USE THIS ONE AS A PARENT
parent: BaseItem
id: BaseBaseOrgan
name: organ
desctription: It's an organ.
abstract: true
components:
- type: Sprite
path: Mobs/Species/Human/organs.rsi
sprite: Mobs/Species/Human/organs.rsi
- type: Organ
- type: Food
- type: Extractable
Expand Down Expand Up @@ -37,7 +35,7 @@
- type: Gibbable

- type: entity
parent: BaseOrgan
parent: BaseBaseOrgan
id: BaseOrganBrain
name: brain
desctription: The source of incredible, unending intelligence. Honk.
Expand Down Expand Up @@ -235,7 +233,6 @@
# base animal organs

- type: entity
parent: BaseOrgan
id: BaseAnimalOrgan
abstract: true
components:
Expand Down Expand Up @@ -275,6 +272,8 @@
id: OrganAnimalStomach
categories: [ HideSpawnMenu ]
components:
- type: Metabolizer
metabolizerTypes: [ Animal ]
- type: SolutionContainerManager
solutions:
stomach:
Expand All @@ -284,8 +283,6 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Metabolizer
metabolizerTypes: [ Animal ]

- type: entity
parent: [BaseOrganLiver, BaseAnimalOrgan]
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Body/Organs/diona.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
- type: entity
parent: BaseOrgan
id: BaseDionaOrgan
abstract: true
suffix: diona
components:
- type: Sprite
sprite: Mobs/Species/Diona/organs.rsi
- type: Tag
tags: [] # rewrite Meat tag

- type: entity
parent: [BaseDionaOrgan, BaseOrganBrain]
parent: [BaseOrganBrain, BaseDionaOrgan]
id: OrganDionaBrain

- type: entity
parent: [BaseDionaOrgan, BaseOrganEyes]
parent: [BaseOrganEyes, BaseDionaOrgan]
id: OrganDionaEyes

- type: entity
parent: [BaseDionaOrgan, BaseOrganStomach]
parent: [BaseOrganStomach, BaseDionaOrgan]
id: OrganDionaStomach
components:
- type: Metabolizer
Expand All @@ -34,7 +34,7 @@
rateModifier: 0.1

- type: entity
parent: [BaseDionaOrgan, BaseOrganLungs]
parent: [BaseOrganLungs, BaseDionaOrgan]
id: OrganDionaLungs
description: Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier.
components:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
- type: entity
parent: BaseOrgan
id: BaseHumanOrgan
abstract: true
components:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Body/Organs/rat.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- type: entity
parent: BaseOrganLungs
parent: OrganAnimalLungs
id: OrganRatLungs
suffix: "rat"
suffix: rat
components:
- type: Metabolizer
metabolizerTypes: [ Rat ]

- type: entity
parent: OrganAnimalStomach
id: OrganRatStomach
suffix: "rat"
suffix: rat
components:
- type: SolutionContainerManager
solutions:
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/Body/Organs/slime.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
- type: entity
parent: BaseOrgan
- type: entity
id: BaseSlimeOrgan
abstract: true
components:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Body/Organs/vox.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: BaseOrganLungs
parent: OrganHumanLungs
id: OrganVoxLungs
suffix: "vox"
suffix: vox
components:
- type: Metabolizer
metabolizerTypes: [ Vox ]
Expand Down

0 comments on commit 2eade87

Please sign in to comment.