diff --git a/Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs b/Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs index 0f593841037..fedf632828c 100644 --- a/Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs +++ b/Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs @@ -52,7 +52,7 @@ private void ActivateAgility(Entity ent, Entity(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(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); diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_cough.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_cough.ogg new file mode 100644 index 00000000000..8e947ccb56f Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_cough.ogg differ diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_laught.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_laught.ogg new file mode 100644 index 00000000000..47abcbd9ea1 Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_laught.ogg differ diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg new file mode 100644 index 00000000000..76381ee8b8e Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/resomi_sneeze.ogg differ diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 84be839e17f..3d7dad13a28 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -19,6 +19,7 @@ - Moth - Reptilian - Vulpkanin # Corvax-MRP + - Resomi #Corvax-Next - type: loadoutEffectGroup id: EffectSpeciesVox diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml b/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml index a6298b7a76d..e8d0cfc172b 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml +++ b/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 diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Reactions/biological.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Reactions/biological.yml new file mode 100644 index 00000000000..cb802df8be8 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Species/resomi.yml b/Resources/Prototypes/_CorvaxNext/Species/resomi.yml index 5614dfaff62..aa444c2f6d0 100644 --- a/Resources/Prototypes/_CorvaxNext/Species/resomi.yml +++ b/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" diff --git a/Resources/Prototypes/_CorvaxNext/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_CorvaxNext/Voice/speech_emote_sounds.yml index fe171fe1b86..ddbc8dfd99e 100644 --- a/Resources/Prototypes/_CorvaxNext/Voice/speech_emote_sounds.yml +++ b/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 diff --git a/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail.png b/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail.png index c04f9723e08..5535c2d525e 100644 Binary files a/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail.png and b/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail.png differ diff --git a/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail_feathers.png b/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail_feathers.png index 9d26d682491..ac22a353b4f 100644 Binary files a/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail_feathers.png and b/Resources/Textures/_CorvaxNext/Mobs/Customization/resomi_parts.rsi/tail_feathers.png differ diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/belt.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/belt.png index 3bfc191dbae..46abece46b7 100644 Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/belt.png and b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/belt.png differ diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/head.png index 6a451a2af87..cd79c62e5e4 100644 Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/head.png and b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/head.png differ diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/neck.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/neck.png index 81037000cf4..4702d3da3da 100644 Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/neck.png and b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/displacement.rsi/neck.png differ