From: Henry Date: Mon, 18 Sep 2023 00:20:11 +0000 (-0700) Subject: Added the ability to eat organs, mmm tastes like people (#20225) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0397a3eef147085bd84cedc645724b70721bfb29;p=space-station-14.git Added the ability to eat organs, mmm tastes like people (#20225) * added ability to eat organs * Update animal.yml * adjusting for inflation * test --- diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index e84528fbb4..db7793210b 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -4,10 +4,21 @@ abstract: true components: - type: Organ + - type: Food - type: Sprite sprite: Mobs/Species/Human/organs.rsi - type: StaticPrice price: 50 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: FlavorProfile + flavors: + - chicken # everything kinda tastes like chicken - type: entity @@ -35,6 +46,11 @@ Lung: maxVol: 100.0 canReact: false + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity id: OrganAnimalStomach @@ -49,6 +65,11 @@ solutions: stomach: maxVol: 40 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Stomach - type: Metabolizer maxReagents: 3 diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index d21a2c1763..3ec991af86 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -16,6 +16,11 @@ reagents: - ReagentId: Nutriment Quantity: 10 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity id: OrganArachnidStomach @@ -32,6 +37,11 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Metabolizer updateFrequency: 1.5 @@ -64,6 +74,11 @@ Lung: maxVol: 100.0 canReact: false + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity id: OrganArachnidHeart diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 3da64f3bbd..52087f062a 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -16,6 +16,14 @@ reagents: - ReagentId: Nutriment Quantity: 10 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: FlavorProfile + flavors: + - people - type: entity id: OrganDionaBrain @@ -35,6 +43,11 @@ Lung: maxVol: 100 canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Brain - type: Lung #lungs in they head. why they there tho? - type: Metabolizer @@ -69,6 +82,11 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Stomach - type: Metabolizer maxReagents: 6 diff --git a/Resources/Prototypes/Body/Organs/dwarf.yml b/Resources/Prototypes/Body/Organs/dwarf.yml index b29296eb8e..afe2c66b26 100644 --- a/Resources/Prototypes/Body/Organs/dwarf.yml +++ b/Resources/Prototypes/Body/Organs/dwarf.yml @@ -26,6 +26,11 @@ solutions: stomach: maxVol: 75 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Stomach - type: Metabolizer # mm very yummy diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 8b4aedfc93..91142e8def 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -15,6 +15,14 @@ reagents: - ReagentId: Nutriment Quantity: 10 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: FlavorProfile + flavors: + - people - type: entity id: OrganHumanBrain @@ -98,6 +106,11 @@ Lung: maxVol: 100.0 canReact: false + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity id: OrganHumanHeart @@ -130,6 +143,11 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Stomach # The stomach metabolizes stuff like foods and drinks. # TODO: Have it work off of the ent's solution container, and move this diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index c9c66b15ea..551d8d4d1f 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -11,6 +11,11 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Metabolizer maxReagents: 6 metabolizerTypes: [ Moth ] diff --git a/Resources/Prototypes/Body/Organs/rat.yml b/Resources/Prototypes/Body/Organs/rat.yml index 868505cb43..fb93012d97 100644 --- a/Resources/Prototypes/Body/Organs/rat.yml +++ b/Resources/Prototypes/Body/Organs/rat.yml @@ -15,5 +15,10 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: Sprite state: stomach diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index 1761313807..d7145ee36f 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -8,3 +8,8 @@ solutions: stomach: maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index 3b78b4f4e3..4bb07da4dc 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/Resources/Prototypes/Body/Organs/slime.yml @@ -21,6 +21,11 @@ solutions: stomach: maxVol: 50.0 + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity @@ -51,3 +56,8 @@ Lung: maxVol: 100.0 canReact: false + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index c1bdf1adc7..b23797d590 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -4,7 +4,7 @@ sprite: Mobs/Animals/bee.rsi state: 0 product: CrateNPCBee - cost: 4000 + cost: 4200 category: Livestock group: market @@ -14,7 +14,7 @@ sprite: Mobs/Animals/butterfly.rsi state: butterfly product: CrateNPCButterflies - cost: 2500 + cost: 2700 category: Livestock group: market @@ -34,7 +34,7 @@ sprite: Mobs/Animals/chicken.rsi state: icon-1 product: CrateNPCChicken - cost: 2500 + cost: 2600 category: Livestock group: market @@ -44,7 +44,7 @@ sprite: Mobs/Animals/crab.rsi state: crab product: CrateNPCCrab - cost: 1800 + cost: 2000 category: Livestock group: market @@ -54,7 +54,7 @@ sprite: Mobs/Animals/duck.rsi state: icon-0 product: CrateNPCDuck - cost: 3500 + cost: 3800 category: Livestock group: market @@ -124,7 +124,7 @@ sprite: Mobs/Animals/mouse.rsi state: icon-0 product: CrateNPCMouse - cost: 2500 + cost: 2700 category: Livestock group: market