[FIX] Я не ебу че грабли сделал

Browse Source

# Conflicts:
#	Resources/Prototypes/Catalog/catalog.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Mobs/Player/skrell.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/dwarf.yml
#	Resources/Prototypes/Species/reptilian.yml
#	Resources/Prototypes/Species/skeleton.yml
#	Resources/Prototypes/Species/skrell.yml
#	Resources/Prototypes/Species/slime.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Voice/speech_emote_sounds.yml

...

This commit is contained in:

rhailrake

2023-05-25 23:44:55 +06:00

committed by Remuchi

parent 58a368f703

commit 01d2be78a0

9 changed files with 42 additions and 66 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Resources/Audio/Voice/Felinid/cat_wilhelm.ogg Normal file

Binary file not shown.