first (#116)

Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs

@@ -52,7 +52,7 @@ private void ActivateAgility(Entity<AgillitySkillComponent> ent, Entity<BaseActi
         if (!TryComp<MovementSpeedModifierComponent>(ent.Owner, out var comp))
             return;
 
-        _popup.PopupEntity(Loc.GetString("agility-activated-massage"), ent.Owner);
+        _popup.PopupEntity(Loc.GetString("agility-activated-massage"), ent.Owner, ent.Owner);
 
         ent.Comp.SprintSpeedCurrent += ent.Comp.SprintSpeedModifier; // adding a modifier to the base running speed
         _movementSpeedModifier.RefreshMovementSpeedModifiers(ent.Owner);
@@ -68,7 +68,7 @@ private void DeactivateAgility(EntityUid uid, AgillitySkillComponent component,
         if (!TryComp<MovementSpeedModifierComponent>(uid, out var comp))
             return;
 
-        _popup.PopupEntity(Loc.GetString("agility-deactivated-massage"), uid);
+        _popup.PopupEntity(Loc.GetString("agility-deactivated-massage"), uid, uid);
 
         component.SprintSpeedCurrent = 1f; // return the base running speed to normal
         _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);

Resources/Prototypes/Loadouts/Miscellaneous/survival.yml

@@ -19,6 +19,7 @@
     - Moth
     - Reptilian
     - Vulpkanin # Corvax-MRP
+    - Resomi #Corvax-Next
 
 - type: loadoutEffectGroup
   id: EffectSpeciesVox

Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml

@@ -30,6 +30,19 @@
     sprite: _CorvaxNext/Mobs/Effects/onfire.rsi
     normalState: Resomi_minor_burning
     alternateState: Resomi_burning
+  - type: Fixtures
+    fixtures: # TODO: This needs a second fixture just for mob collisions.
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        # they r smaller
+        density: 120
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
   - type: HumanoidAppearance
     species: Resomi
   - type: Hunger
@@ -56,7 +69,7 @@
       types:
         Slash: 5
   - type: Temperature
-    heatDamageThreshold: 315
+    heatDamageThreshold: 325
     coldDamageThreshold: 230
     currentTemperature: 310.15
     specificHeat: 42
@@ -66,6 +79,13 @@
     heatDamage:
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      260: 0.8
+      250: 0.6
+      230: 0.4
+  - type: ThermalRegulator
+    normalBodyTemperature: 300.15
   - type: Vocal
     sounds:
       Male: MaleResomi

Resources/Prototypes/_CorvaxNext/Recipes/Reactions/biological.yml

@@ -0,0 +1,15 @@
+- type: reaction
+  id: ResomiBloodBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    ResomiBlood:
+      amount: 30
+  products:
+    Water: 9
+    Iron: 2
+    Sugar: 1
+    Nitrogen: 4
+    CarbonDioxide: 3
+    Protein: 4

Resources/Prototypes/_CorvaxNext/Species/resomi.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Resomi
   name: species-name-resomi
-  roundStart: false
+  roundStart: true
   prototype: MobResomi
   sprites: MobResomiSprites
   defaultSkinTone: "#faf7f7"

Resources/Prototypes/_CorvaxNext/Voice/speech_emote_sounds.yml

@@ -6,7 +6,11 @@
     Scream:
       path: /Audio/_CorvaxNext/Voice/Resomi/resomi_scream.ogg
     Laugh:
-      collection: MaleLaugh
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_laught.ogg
+    Sneeze:
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg
+    Cough:
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg
     Honk:
       collection: BikeHorn
     Whistle:
@@ -19,6 +23,12 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: DeathGasp
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Sigh:
+      collection: MaleSigh
 
 - type: emoteSounds
   id: FemaleResomi
@@ -28,7 +38,11 @@
     Scream:
       path: /Audio/_CorvaxNext/Voice/Resomi/resomi_scream.ogg
     Laugh:
-      collection: FemaleLaugh
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_laught.ogg
+    Sneeze:
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg
+    Cough:
+      path: /Audio/_CorvaxNext/Voice/Resomi/resomi_cough.ogg
     Honk:
       collection: BikeHorn
     Whistle:
@@ -40,5 +54,11 @@
     Gasp:
       collection: FemaleGasp
     DefaultDeathgasp:
-      collection: FemaleDeathGasp
+      collection: DeathGasp
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Sigh:
+      collection: FemaleSigh