Merge branch 'unstable'

Fansana · Oct 27, 2024 · e9c1be0 · e9c1be0
2 parents 4051b05 + a39b05b
commit e9c1be0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/Resources/Prototypes/Body/Prototypes/ipc.yml b/Resources/Prototypes/Body/Prototypes/ipc.yml
@@ -12,10 +12,10 @@
     torso:
       part: TorsoIPC
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         brain: PositronicBrain
         heart: OrganIPCPump

diff --git a/Resources/Prototypes/Body/Prototypes/shadowkin.yml b/Resources/Prototypes/Body/Prototypes/shadowkin.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoShadowkin
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganShadowkinHeart
         stomach: OrganShadowkinStomach

diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHarpy
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHarpyLungs

diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
@@ -19,10 +19,10 @@
         liver: OrganAnimalLiver
         kidneys: OrganHumanKidneys
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
     right arm:
       part: RightArmVulpkanin
       connections:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
@@ -13,8 +13,8 @@
     torso:
       part: TorsoHuman
       connections:
-      - left arm
       - right arm
+      - left arm
       - thorax
       organs:
         heart: OrganHumanHeart

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHuman
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -112,6 +112,12 @@
       collection: FemaleCry
     Weh:
       collection: Weh
+    # Floof
+    Yip:
+      collection: Yip
+    Hiss:
+      collection: ReptilianHiss
+    # Floof end
 
 - type: emoteSounds
   id: MaleSlime