chest and groin: Far From Home

Spatison · Nov 11, 2024 · 9146e36 · 9146e36
1 parent 3efcf85
commit 9146e36
Showing 14 changed files with 202 additions and 90 deletions.
diff --git a/Content.Shared/Body/Part/BodyPartType.cs b/Content.Shared/Body/Part/BodyPartType.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Body.Part
     public enum BodyPartType
     {
         Other = 0,
-        Torso, // TODO: remove it
+        Torso,
         Chest, // WD EDIT
         Groin, // WD EDIT
         Head,

diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
@@ -73,17 +73,18 @@
   - type: BodyPart
     partType: Foot
 
+# WD EDIT START
 - type: entity
-  id: TorsoAnimal
-  name: animal torso
+  id: ChestAnimal
+  name: animal chest
   parent: PartAnimal
   noSpawn: true
   components:
   - type: Sprite
     layers:
-    - state: torso_m
+    - state: chest_m
   - type: BodyPart
-    partType: Torso
+    partType: Chest
   - type: Damageable
     damageContainer: Biological
   - type: Extractable
@@ -94,3 +95,25 @@
       - ReagentId: Blood
         Quantity: 20
 
+- type: entity
+  id: GroinAnimal
+  name: animal groin
+  parent: PartAnimal
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: groin_m
+  - type: BodyPart
+    partType: Groin
+  - type: Damageable
+    damageContainer: Biological
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+# WD EDIT END
+
diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml
@@ -1,20 +1,39 @@
 # Just copypasta of some animal basic body parts for interaction,
 # It's basically as animals except a different torso with different organs
 - type: entity
-  id: TorsoRat
-  name: "animal torso"
+  id: ChestRat
+  name: "animal chest"
   parent: PartAnimal
   noSpawn: true
   components:
   - type: BodyPart
-    partType: Torso
+    partType: Chest
   - type: Damageable
     damageContainer: Biological
   - type: Tag
     tags:
       - Trash
   # TODO get a proper rat king & servant torso sprite.
-  # currently their torso is just a small dead rat....
+  # currently their chest is just a small dead rat....
   - type: Sprite
     sprite: Mobs/Animals/mouse.rsi
     state: splat-0
+
+- type: entity
+  id: GroinRat
+  name: "animal groin"
+  parent: PartAnimal
+  noSpawn: true
+  components:
+  - type: BodyPart
+    partType: Groin
+  - type: Damageable
+    damageContainer: Biological
+  - type: Tag
+    tags:
+      - Trash
+  # TODO get a proper rat king & servant torso sprite.
+  # currently their groin is just a small dead rat....
+  - type: Sprite
+    sprite: Mobs/Animals/mouse.rsi
+    state: splat-0
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -102,7 +102,7 @@
   abstract: true
   components:
   - type: BodyPart
-    partType: Torso
+    partType: Chest
   - type: Tag
     tags:
     - Trash
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/animal.yml b/Resources/Prototypes/Body/Prototypes/Animal/animal.yml
@@ -1,17 +1,23 @@
-- type: body
+# WD EDIT
+- type: body
   id: Animal
   name: "animal"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganAnimalStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal
@@ -23,17 +29,22 @@
 - type: body
   id: Mouse
   name: "mouse"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganMouseStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Prototypes/Animal/bloodsucker.yml
@@ -1,17 +1,23 @@
-- type: body
+# WD EDIT
+- type: body
   id: Bloodsucker
   name: "bloodsucker"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganBloodsuckerStomach
         liver: OrganBloodsuckerLiver
-        heart: OrganBloodsuckerHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml b/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml
@@ -1,17 +1,23 @@
-- type: body
+# WD EDIT
+- type: body
   id: AnimalHemocyanin
   name: "hemocyanin"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganArachnidHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganAnimalStomach
         liver: OrganAnimalLiver
-        heart: OrganArachnidHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
@@ -1,18 +1,24 @@
-- type: body
+# WD EDIT
+- type: body
   id: AnimalNymphBrain
   name: "nymph"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         brain: OrganDionaBrain
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganAnimalStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal
@@ -24,17 +30,18 @@
 - type: body
   id: AnimalNymphLungs
   name: "nymph"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
+    chest:
+      part: ChestAnimal
       organs:
         lungs: OrganDionaLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      organs:
         stomach: OrganAnimalStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal
@@ -46,17 +53,18 @@
 - type: body
   id: AnimalNymphStomach
   name: "nymph"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
+    chest:
+      part: ChestAnimal
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      organs:
         stomach: OrganDionaStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
@@ -1,18 +1,24 @@
-- type: body
+# WD EDIT
+- type: body
   id: AnimalRuminant
   name: "ruminant"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
-      - legs
+      - groin
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganAnimalRuminantStomach
         stomach2: OrganAnimalRuminantStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     legs:
       part: LegsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Friendshaped.yml b/Resources/Prototypes/Body/Prototypes/Friendshaped.yml
@@ -1,18 +1,24 @@
-- type: body
+# WD EDIT
+- type: body
   id: Friendshaped
   name: "Friend-Shaped"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       connections:
+      - groin
       - hands
-      - legs
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      connections:
+      - legs
+      organs:
         stomach: OrganFriendStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
     hands:
       part: HandsAnimal

diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml
@@ -1,13 +1,17 @@
-- type: body
+# WD EDIT
+- type: body
   id: Mothroach
   name: "mothroach"
-  root: torso
+  root: chest
   slots:
-    torso:
-      part: TorsoAnimal
+    chest:
+      part: ChestAnimal
       organs:
         lungs: OrganAnimalLungs
+        heart: OrganAnimalHeart
+    groin:
+      part: GroinAnimal
+      organs:
         stomach: OrganMothStomach
         liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys