batch changes

batch of changes I made for Floof station ported over to the upstream branch

Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml

@@ -329,6 +329,20 @@
         - ReagentSlimeNorepinephricAcid
         - ReagentSlimeEphedrine
         - ReagentSlimeRobustHarvest
+        - ReagentSlimeIchor
+        - ReagentSlimeBleach
+        - ReagentSlimeSoap
+        - ReagentSlimeSpacelube
+        - ReagentSlimeBuzzachloricbees
+        - ReagentSlimeWehjuice
+        - ReagentCognizine
+        - ReagentSlimeOpporozidone
+        - ReagentSlimeNecrosol
+        - ReagentSlimeSpaceDrugs
+        - ReagentSlimeUnstableMutagen
+        - ReagentSlimeLead
+        - ReagentSlimechlorinetriflouride
+        - ReagentSlimePotassium
         - ReagentSlimeLotophagoiOil
       chance: 1
 
@@ -560,4 +574,4 @@
         color: "#3e901c"
   - type: GhostRole
     prob: 1 #it's significantly more psionic than the others
-    description: ghost-role-information-angry-slimes-description
+    description: ghost-role-information-angry-slimes-description

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -58,13 +58,18 @@
         layer:
         - MobLayer
   - type: MobState
-    allowedStates:
-    - Alive
-    - Dead
+  - type: Deathgasp
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritFakeDeath
+      - ActionCritLastWords
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      50: Critical
+      100: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
       25: 0.5
@@ -92,6 +97,7 @@
       Dead:
         Base: dead
   - type: Puller
+    needsHands: false
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -121,8 +127,11 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: Psionic #Nyano - Summary: makes psionic by default.
+  - type: Psionic
     removable: false
+  - type: InnatePsionicPowers
+    powersToAdd:
+      - TelepathyPower
   - type: LanguageKnowledge
     speaks:
     - Xeno
@@ -144,7 +153,8 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      100: Critical
+      150: Dead
   - type: Stamina
     critThreshold: 300
   - type: SlowOnDamage
@@ -177,7 +187,8 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      80: Dead
+      80: Critical
+      130: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
       40: 0.7
@@ -214,7 +225,8 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      300: Dead
+      300: Critical
+      350: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
       150: 0.7
@@ -239,10 +251,10 @@
     - CannotSuicide
   - type: LanguageKnowledge
     speaks:
-    - TauCetiBasic
+    - GalacticCommon
     - Xeno
     understands:
-    - TauCetiBasic
+    - GalacticCommon
     - Xeno
 
 - type: entity
@@ -260,7 +272,8 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      100: Critical
+      150: Dead
   - type: MovementSpeedModifier
     baseSprintSpeed: 4
   - type: MeleeWeapon
@@ -299,7 +312,7 @@
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 5
+       Brute: 10
   - type: Fixtures
     fixtures:
       fix1:
@@ -321,6 +334,7 @@
     drawdepth: Mobs
     sprite: Mobs/Aliens/Xenos/rouny.rsi
     offset: 0,0.6
+    scale: 0.7, 0.7
   - type: Butcherable
     butcheringType: Spike
     spawned:

Resources/Prototypes/Floof/Body/Organs/Friendstomach.yml

@@ -0,0 +1,15 @@
+- type: entity
+  id: OrganFriendStomach
+  parent: OrganAnimalStomach
+  noSpawn: true
+  components:
+  - type: Stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 100
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5

Resources/Prototypes/Floof/Body/Prototypes/Friendshaped.yml

@@ -0,0 +1,24 @@
+- type: body
+  id: Friendshaped
+  name: "Friend-Shaped"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - hands
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganFriendStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    hands:
+      part: HandsAnimal
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal