Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resomi (release) #116

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- Moth
- Reptilian
- Vulpkanin # Corvax-MRP
- Resomi #Corvax-Next

- type: loadoutEffectGroup
id: EffectSpeciesVox
Expand Down
22 changes: 21 additions & 1 deletion Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -56,7 +69,7 @@
types:
Slash: 5
- type: Temperature
heatDamageThreshold: 315
heatDamageThreshold: 325
coldDamageThreshold: 230
currentTemperature: 310.15
specificHeat: 42
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Resources/Prototypes/_CorvaxNext/Species/resomi.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Resomi
name: species-name-resomi
roundStart: false
roundStart: true
prototype: MobResomi
sprites: MobResomiSprites
defaultSkinTone: "#faf7f7"
Expand Down
26 changes: 23 additions & 3 deletions Resources/Prototypes/_CorvaxNext/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -19,6 +23,12 @@
collection: MaleGasp
DefaultDeathgasp:
collection: DeathGasp
Yawn:
collection: MaleYawn
Snore:
collection: Snores
Sigh:
collection: MaleSigh

- type: emoteSounds
id: FemaleResomi
Expand All @@ -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:
Expand All @@ -40,5 +54,11 @@
Gasp:
collection: FemaleGasp
DefaultDeathgasp:
collection: FemaleDeathGasp
collection: DeathGasp
Yawn:
collection: FemaleYawn
Snore:
collection: Snores
Sigh:
collection: FemaleSigh

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading