arachne real

DeltaV-Station · Jan 20, 2025 · 5c995eb · 5c995eb
1 parent 6ed40ee
commit 5c995eb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 34 deletions.
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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  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]
+  speciesRestriction: [Arachnid, Arachne]] # EE Arachne
   sprites:
   - sprite: Mobs/Customization/Arachnid/arms.rsi
     state: stripes_left

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
@@ -36,6 +36,7 @@
     sprite: Mobs/Species/Moth/parts.rsi
     state: "torso_m"
   - type: BodyPart #"Other" type
+    slotId: thorax
   - type: Extractable
     juiceSolution:
       reagents:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
@@ -38,27 +38,28 @@
     thorax:
       part: ThoraxSpider
       connections:
-      - left foreleg
-      - left second leg
-      - left third leg
-      - left hind leg
-      - right foreleg
-      - right second leg
-      - right third leg
-      - right hind leg
-    left foreleg:
+      # The slots needs to start with (symmetry) (part) or they're not gonna be registered
+      - left leg (fore)
+      - left leg (second)
+      - left leg (third)
+      - left leg (hind)
+      - right leg (fore)
+      - right leg (second)
+      - right leg (third)
+      - right leg (hind)
+    left leg (fore):
       part: LeftLegSpider
-    left second leg:
+    left leg (second):
       part: LeftLegSpider
-    left third leg:
+    left leg (third):
       part: LeftLegSpider
-    left hind leg:
+    left leg (hind):
       part: LeftLegSpider
-    right foreleg:
+    right leg (fore):
       part: RightLegSpider
-    right second leg:
+    right leg (second):
       part: RightLegSpider
-    right third leg:
+    right leg (third):
       part: RightLegSpider
-    right hind leg:
+    right leg (hind):
       part: RightLegSpider
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/arachne.yml
@@ -65,6 +65,7 @@
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair"]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
       state: bald
       sprite: Mobs/Customization/human_hair.rsi
@@ -104,6 +105,7 @@
   - type: Tag
     tags:
     - CanPilot
+    - FootstepSound
     - DoorBumpOpener
   - type: Bloodstream
     bloodReagent: DemonsBlood
@@ -205,6 +207,7 @@
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
       state: bald
       sprite: Mobs/Customization/human_hair.rsi

diff --git a/Resources/Prototypes/_EE/Species/arachne.yml b/Resources/Prototypes/_EE/Species/arachne.yml
@@ -8,9 +8,6 @@
   markingLimits: MobArachneMarkingLimits
   dollPrototype: MobArachneDummy
   skinColoration: HumanToned
-  femaleFirstNames: names_arachnid_first
-  sexes:
-  - Female
 
 - type: markingPoints
   id: MobArachneMarkingLimits