aaaaaaaaa

DeltaV-Station · Jan 23, 2025 · 433f86e · 433f86e
1 parent 5c995eb
commit 433f86e
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 47 deletions.
diff --git a/Resources/Locale/en-US/_EE/metabolism/metabolizer-types.ftl 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: