From 5a3883040806f37b01d9e52afd23286a7bca0eea Mon Sep 17 00:00:00 2001 From: Zekins Date: Wed, 14 Aug 2024 19:33:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B2=D0=B7=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=BE=D0=BB=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Body/Organs/moth.yml | 6 +++++- Resources/Prototypes/Body/Organs/reptilian.yml | 10 +++++++++- .../Corvax/Entities/Mobs/Species/elzuosa.yml | 4 ++-- .../DeltaV/Entities/Mobs/Species/vulpkanin.yml | 8 ++++++-- .../Prototypes/Entities/Mobs/Species/arachnid.yml | 8 ++++++-- Resources/Prototypes/Entities/Mobs/Species/diona.yml | 6 +++++- Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 6 +++++- Resources/Prototypes/Entities/Mobs/Species/human.yml | 6 +++++- Resources/Prototypes/Entities/Mobs/Species/moth.yml | 6 +++++- .../Prototypes/Entities/Mobs/Species/reptilian.yml | 8 ++++++-- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 6 +++++- Resources/Prototypes/Entities/Mobs/Species/vox.yml | 8 ++++++-- 12 files changed, 65 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index d214bb93efe..1136c4a64cf 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: OrganMothStomach parent: [OrganAnimalStomach, OrganHumanStomach] noSpawn: true @@ -10,6 +10,10 @@ # - Fruit # Frontier # - Pill # Frontier # - Crayon # Frontier + specialDigestible: # Corvax-MRP + tags: + - ClothMade + - Paper - type: SolutionContainerManager solutions: stomach: diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index 3e3028c46a9..0763a112930 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -12,6 +12,14 @@ # - Pill # Frontier # - Crayon # Frontier # - Paper # Frontier + specialDigestible: # Corvax-MRP + tags: + - Fruit + - ReptilianFood + - Meat + - Pill + - Crayon + - Paper - type: SolutionContainerManager solutions: stomach: @@ -20,4 +28,4 @@ maxVol: 5 reagents: - ReagentId: UncookedAnimalProteins - Quantity: 5 \ No newline at end of file + Quantity: 5 diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml index db18832b9af..7ad0732d120 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml @@ -7,8 +7,8 @@ - type: Hunger # Corvax-Frontier starvationDamage: types: - Cold: 0.5 - Bloodloss: 0.5 + Cold: 0.15 + Bloodloss: 0.15 - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. sprite: Corvax/Mobs/Species/Elzuosa/parts.rsi state: full diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 6bfddac6d0d..7b358a29cf4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -7,7 +7,11 @@ components: - type: HumanoidAppearance species: Vulpkanin - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Carriable # Carrying system from nyanotrasen. - type: Inventory # Allows vulps to wear properly shaped helmets speciesId: vulpkanin @@ -125,4 +129,4 @@ description: A dummy vulpkanin meant to be used in character setup. components: - type: HumanoidAppearance - species: Vulpkanin \ No newline at end of file + species: Vulpkanin diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 45d1ed8bf45..b7b1d470d46 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -10,7 +10,11 @@ requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed - type: HumanoidAppearance species: Arachnid - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Thirst - type: Sericulture action: ActionSericulture @@ -132,4 +136,4 @@ - type: HumanoidAppearance species: Arachnid -#88w88 \ No newline at end of file +#88w88 diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index f6b263e8fd5..3c831911c6b 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -7,7 +7,11 @@ components: - type: HumanoidAppearance species: Diona - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 baseDecayRate: 0.0083 - type: Thirst baseDecayRate: 0.0083 diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 24cec085e45..67f9890e5f3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -5,7 +5,11 @@ id: BaseMobDwarf abstract: true components: - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Thirst - type: Carriable # Carrying system from nyanotrasen. - type: Icon diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 54bc5e03ab9..b58965f1189 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -5,7 +5,11 @@ name: Urist McHands abstract: true components: - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. sprite: Mobs/Species/Human/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 733d161f0e0..504c7bd9173 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -9,7 +9,11 @@ species: Moth hideLayersOnEquip: - HeadTop - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Thirst - type: Carriable # Carrying system from nyanotrasen. - type: Icon diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index b5f96460fb5..6b3c96da8a4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -11,7 +11,11 @@ - Snout - HeadTop - HeadSide - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Puller needsHands: false - type: Thirst @@ -76,4 +80,4 @@ - type: HumanoidAppearance species: Reptilian -#Weh \ No newline at end of file +#Weh diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 31db778a00d..34b1efbe832 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -4,7 +4,11 @@ id: BaseMobSlimePerson abstract: true components: - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Thirst - type: Carriable # Carrying system from nyanotrasen. - type: Icon diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 4d5239e50c5..7e0525104b8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -1,9 +1,13 @@ -- type: entity +- type: entity parent: BaseMobSpeciesOrganic id: BaseMobVox abstract: true components: - - type: Hunger + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.15 + Bloodloss: 0.15 - type: Thirst - type: Icon sprite: Mobs/Species/Vox/parts.rsi