From 2eade87f0fc3bb0c7884db12acc66e1e5efa414a Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:15:58 +0200 Subject: [PATCH] should be fine --- Resources/Prototypes/Body/Organs/arachnid.yml | 16 ++++++++-------- Resources/Prototypes/Body/Organs/base.yml | 11 ++++------- Resources/Prototypes/Body/Organs/diona.yml | 10 +++++----- Resources/Prototypes/Body/Organs/human.yml | 1 - Resources/Prototypes/Body/Organs/rat.yml | 6 +++--- Resources/Prototypes/Body/Organs/slime.yml | 3 +-- Resources/Prototypes/Body/Organs/vox.yml | 4 ++-- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 540289f5690329..9034f1c3447c7c 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -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 @@ -18,7 +18,7 @@ updateInterval: 1.5 - type: entity - parent: [BaseArachnidOrgan, BaseOrganLungs] + parent: [BaseOrganLungs, BaseArachnidOrgan] id: OrganArachnidLungs description: Filters oxygen from an atmosphere... just more greedily. components: @@ -26,7 +26,7 @@ updateInterval: 1.5 - type: entity - parent: [BaseArachnidOrgan, BaseOrganHeart] + parent: [BaseOrganHeart, BaseArachnidOrgan] id: OrganArachnidHeart description: A disgustingly persistent little biological pump made for spiders. components: @@ -36,7 +36,7 @@ - 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: @@ -44,7 +44,7 @@ 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: @@ -52,10 +52,10 @@ 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 diff --git a/Resources/Prototypes/Body/Organs/base.yml b/Resources/Prototypes/Body/Organs/base.yml index f7090a3f6baebd..d2234cda481859 100644 --- a/Resources/Prototypes/Body/Organs/base.yml +++ b/Resources/Prototypes/Body/Organs/base.yml @@ -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 @@ -37,7 +35,7 @@ - type: Gibbable - type: entity - parent: BaseOrgan + parent: BaseBaseOrgan id: BaseOrganBrain name: brain desctription: The source of incredible, unending intelligence. Honk. @@ -235,7 +233,6 @@ # base animal organs - type: entity - parent: BaseOrgan id: BaseAnimalOrgan abstract: true components: @@ -275,6 +272,8 @@ id: OrganAnimalStomach categories: [ HideSpawnMenu ] components: + - type: Metabolizer + metabolizerTypes: [ Animal ] - type: SolutionContainerManager solutions: stomach: @@ -284,8 +283,6 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 - - type: Metabolizer - metabolizerTypes: [ Animal ] - type: entity parent: [BaseOrganLiver, BaseAnimalOrgan] diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index e7ca8a2aa06483..52a208c07bb300 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseOrgan id: BaseDionaOrgan abstract: true + suffix: diona components: - type: Sprite sprite: Mobs/Species/Diona/organs.rsi @@ -9,15 +9,15 @@ 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 @@ -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: diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 9bc71635af6311..ecf9ac80c22919 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -1,5 +1,4 @@ - type: entity - parent: BaseOrgan id: BaseHumanOrgan abstract: true components: diff --git a/Resources/Prototypes/Body/Organs/rat.yml b/Resources/Prototypes/Body/Organs/rat.yml index 241f49035e266d..4a3d712a4d4735 100644 --- a/Resources/Prototypes/Body/Organs/rat.yml +++ b/Resources/Prototypes/Body/Organs/rat.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseOrganLungs + parent: OrganAnimalLungs id: OrganRatLungs - suffix: "rat" + suffix: rat components: - type: Metabolizer metabolizerTypes: [ Rat ] @@ -9,7 +9,7 @@ - type: entity parent: OrganAnimalStomach id: OrganRatStomach - suffix: "rat" + suffix: rat components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index 5aadfd56018c98..a32fb3ee866cb1 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/Resources/Prototypes/Body/Organs/slime.yml @@ -1,5 +1,4 @@ -- type: entity - parent: BaseOrgan +- type: entity id: BaseSlimeOrgan abstract: true components: diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml index d8bf2d67c3cd58..030fbb4151710a 100644 --- a/Resources/Prototypes/Body/Organs/vox.yml +++ b/Resources/Prototypes/Body/Organs/vox.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseOrganLungs + parent: OrganHumanLungs id: OrganVoxLungs - suffix: "vox" + suffix: vox components: - type: Metabolizer metabolizerTypes: [ Vox ]