From 433f86e7455a936b5104b01994fbd3833b92fc35 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 23 Jan 2025 08:54:12 -0500 Subject: [PATCH] aaaaaaaaa --- .../_EE/metabolism/metabolizer-types.ftl | 1 + .../Mobs/Customization/Markings/arachnid.yml | 30 +++++++++---------- .../Mobs/Customization/Markings/ears.yml | 2 +- .../Mobs/Customization/Markings/gauze.yml | 22 +++++++------- .../Customization/Markings/human_noses.yml | 10 +++---- .../Mobs/Customization/Markings/scars.yml | 10 +++---- .../Mobs/Customization/Markings/tattoos.yml | 16 +++++----- .../Entities/Body/Parts/spider.yml | 6 +++- Resources/Prototypes/Reagents/biological.yml | 27 +++++++++++++++++ .../Mobs/Customization/Markings/makeup.yml | 2 +- .../_EE/Chemistry/metabolizer_types.yml | 3 ++ 11 files changed, 82 insertions(+), 47 deletions(-) create mode 100644 Resources/Locale/en-US/_EE/metabolism/metabolizer-types.ftl create mode 100644 Resources/Prototypes/_EE/Chemistry/metabolizer_types.yml diff --git a/Resources/Locale/en-US/_EE/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/_EE/metabolism/metabolizer-types.ftl new file mode 100644 index 00000000000..f06cdfbeb2b --- /dev/null +++ b/Resources/Locale/en-US/_EE/metabolism/metabolizer-types.ftl @@ -0,0 +1 @@ +metabolizer-type-vampiric = Vampiric diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml index f89e8f62467..0d64e334be5 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml @@ -122,7 +122,7 @@ id: ArachnidTorsoStripes bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: stripes @@ -135,7 +135,7 @@ id: ArachnidTorsoSlashes bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: slashes @@ -148,7 +148,7 @@ id: ArachnidTorsoX bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: x @@ -161,7 +161,7 @@ id: ArachnidTorsoCross bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: cross @@ -174,7 +174,7 @@ id: ArachnidTorsoHeart bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: heart @@ -187,7 +187,7 @@ id: ArachnidTorsoHourglass bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: hourglass @@ -200,7 +200,7 @@ id: ArachnidTorsoNailAndHammer bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: nail-and-hammer @@ -213,7 +213,7 @@ id: ArachnidTorsoStar bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: star @@ -226,7 +226,7 @@ id: ArachnidTorsoArrows bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: arrows @@ -239,7 +239,7 @@ id: ArachnidTorsoCore bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: core @@ -252,7 +252,7 @@ id: ArachnidTorsoFiddleback bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: fiddleback @@ -265,7 +265,7 @@ id: ArachnidTorsoSkull bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: skull @@ -278,7 +278,7 @@ id: ArachnidTorsoTarget bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: target @@ -292,7 +292,7 @@ id: ArachnidRArmStripes bodyPart: RArm markingCategory: Arms - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi state: stripes_right @@ -305,7 +305,7 @@ id: ArachnidLArmStripes bodyPart: LArm markingCategory: Arms - speciesRestriction: [Arachnid, Arachne]] # EE Arachne + speciesRestriction: [Arachnid, Arachne] # EE Arachne sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi state: stripes_left diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml index 6e350880329..143e86a1be0 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml @@ -2,7 +2,7 @@ id: HumanLongEars bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Arachne] # DeltaV Arachne forcedColoring: true followSkinColor: true sprites: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 540d098e505..71d5508e2c9 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Arachne ] # Delta V - Felinid, Oni, Vulpkanin, Rodentia #EE - Arachne coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Rodentia # EE - Arachne coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index 19373e79d8d..12bdf9695fe 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml @@ -4,7 +4,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] # EE - Felinid, Oni, Harpy, Arachne sprites: - sprite: Mobs/Customization/human_noses.rsi state: schnozz @@ -15,7 +15,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] # EE - Felinid, Oni, Harpy, Arachne sprites: - sprite: Mobs/Customization/human_noses.rsi state: nubby @@ -26,7 +26,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] # EE - Felinid, Oni, Harpy, Arachne sprites: - sprite: Mobs/Customization/human_noses.rsi state: droop @@ -37,7 +37,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] # EE - Felinid, Oni, Harpy, Arachne sprites: - sprite: Mobs/Customization/human_noses.rsi state: blob @@ -48,7 +48,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] # EE - Felinid, Oni, Harpy, Arachne sprites: - sprite: Mobs/Customization/human_noses.rsi state: uppie diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 822be2893c4..503c229671c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Arachne] # Delta V - Felinid, Oni, Harpy, Rodentia # EE - Arachne followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Arachne] # Delta V - Felinid, Oni, Harpy, Rodentia # EE - Arachne followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # EE - Felinid, Oni, Arachne sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # EE - Felinid, Oni, Arachne sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # EE - Felinid, Oni, Arachne sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 6310f1b34f2..024bc7831aa 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Arachne] # Delta V - SlimePerson, Felinid, Oni # EE - Arachne sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Arachne] # Delta V - SlimePerson, Felinid, Oni # EE - Arachne sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -32,7 +32,7 @@ id: TattooSilverburghLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # Delta V - Felinid, Oni # EE - Arachne coloring: default: type: @@ -46,7 +46,7 @@ id: TattooSilverburghRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # Delta V - Felinid, Oni # EE - Arachne coloring: default: type: @@ -60,7 +60,7 @@ id: TattooCampbellLeftArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # Delta V - Felinid, Oni # EE - Arachne coloring: default: type: @@ -74,7 +74,7 @@ id: TattooCampbellRightArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] # Delta V - Felinid, Oni # EE - Arachne coloring: default: type: @@ -116,7 +116,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Arachne] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia # EE - Arachne coloring: default: type: @@ -130,7 +130,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Arachne] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia # EE - Arachne coloring: default: type: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml index 1891cf0b065..4970f843ad2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml @@ -37,6 +37,10 @@ state: "torso_m" - type: BodyPart #"Other" type slotId: thorax + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [ ] - type: Extractable juiceSolution: reagents: @@ -77,6 +81,6 @@ - type: BodyPart partType: Leg symmetry: Left - - type: MovementBodyPart # should actual spiders get a seperate part from arachne? + - type: MovementBodyPart #should actual spiders get a seperate part from arachne? walkSpeed : 2.7 sprintSpeed : 5 diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 6490e87ffb1..4e678a29cae 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -23,11 +23,38 @@ - !type:OrganType type: Human shouldHave: false + - !type:SatiateHunger # begin EE + factor: 0.5 + conditions: + - !type:OrganType + type: Vampiric + - !type:AdjustReagent + conditions: + - !type:OrganType + type: Vampiric + reagent: Water + amount: 0.15 + - !type:AdjustReagent + conditions: + - !type:OrganType + type: Vampiric + reagent: Protein + amount: 0.125 + - !type:AdjustReagent + conditions: + - !type:OrganType + type: Vampiric + reagent: Omnizine + amount: 0.2 # end EE Food: effects: - !type:AdjustReagent reagent: UncookedAnimalProteins amount: 0.1 + conditions: # begin EE + - !type:OrganType + type: Vampiric + shouldHave: false # end EE Medicine: effects: - !type:HealthChange diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml index f5f83ca4224..ef940ad5f69 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml @@ -2,7 +2,7 @@ id: MakeupLips bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] # Delta V - Felinid, Oni, Harpy coloring: default: type: diff --git a/Resources/Prototypes/_EE/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_EE/Chemistry/metabolizer_types.yml new file mode 100644 index 00000000000..4beba1f92f7 --- /dev/null +++ b/Resources/Prototypes/_EE/Chemistry/metabolizer_types.yml @@ -0,0 +1,3 @@ +- type: metabolizerType + id: Vampiric + name: metabolizer-type-vampiric