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

Nyano Race Fix #381

Merged
merged 6 commits into from
Oct 7, 2023
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 @@ -111,7 +111,7 @@ private void OnHairball(EntityUid uid, FelinidComponent component, HairballActio
}

_popupSystem.PopupEntity(Loc.GetString("hairball-cough", ("name", Identity.Entity(uid, EntityManager))), uid);
SoundSystem.Play("/Audio/Effects/Species/hairball.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f));
SoundSystem.Play("/Audio/Nyanotrasen/Voice/Felinid/hairball.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f));

EnsureComp<CoughingUpHairballComponent>(uid);
args.Handled = true;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ cat_scream1.ogg licensed under CC0 1.0 taken from Queen_Westeros at https://free
cat_scream2.ogg licensed under CC4.0 taken from InspectorJ at https://freesound.org/people/InspectorJ/sounds/415209/
cat_scream3.ogg licensed under CC sampling plus 1.0 taken from Hamface at https://freesound.org/people/Hamface/sounds/98669/
cat_wilhelm.ogg used with apologies to type moon
hairball.ogg taken from https://en.wikipedia.org/wiki/File:Common_house_cat_coughing_hairball.ogv CC-BY-SA-3.0
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_NF/species/species.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
## Species Names

species-name-vulpkanin = Vulpkanin
7 changes: 0 additions & 7 deletions Resources/Locale/en-US/_Nyano/species/species.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
## Species Names

species-name-human = Unmutated Human
species-name-dwarf = Dwarf
species-name-felinid = Felinid
species-name-reptilian = Reptilian
species-name-slime = Slime Person
species-name-oni = Oni
species-name-arachne = Arachne
species-name-diona = Diona
species-name-moth = Moth
6 changes: 6 additions & 0 deletions Resources/Prototypes/Species/species_weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@
Human: 5
Reptilian: 4
SlimePerson: 4
Moth: 3
Felinid: 3
Vulpkanin: 3
Arachnid: 3
Oni: 2
Dwarf: 2
Diona: 2
30 changes: 0 additions & 30 deletions Resources/Prototypes/_Nyano/Body/Organs/moth.yml

This file was deleted.

31 changes: 0 additions & 31 deletions Resources/Prototypes/_Nyano/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
- type: damageModifierSet
id: SizeChanged
coefficients:
Blunt: 3.33
Slash: 3.33
Piercing: 3.33

- type: damageModifierSet
id: Felinid
coefficients:
Expand All @@ -26,27 +19,3 @@
Cold: 0.85
Heat: 1.25
Poison: 0.9

- type: damageModifierSet
id: ShockAbsorber
coefficients:
Blunt: 0.7
Slash: 0.5
Piercing: 0.7
Shock: 0
flatReductions:
Blunt: 5
Heat: 5

- type: damageModifierSet
id: Carp
coefficients:
Blunt: 0.65
Slash: 1.35

- type: damageModifierSet
id: Bear
coefficients:
Slash: 0.75
flatReductions:
Piercing: 7
180 changes: 0 additions & 180 deletions Resources/Prototypes/_Nyano/Entities/Body/Parts/moth.yml

This file was deleted.

49 changes: 0 additions & 49 deletions Resources/Prototypes/_Nyano/Entities/Body/Prototypes/moth.yml

This file was deleted.

Loading
Loading