Merge branch 'space-syndicate:master' into patch-2

space-syndicate · Jun 4, 2024 · e32fc20 · e32fc20
2 parents 22a424b + d31e525
commit e32fc20
Show file tree

Hide file tree

Showing 24 changed files with 132,225 additions and 130,950 deletions.
diff --git a/Resources/Audio/Corvax/Effects/Growl/attributions.yml b/Resources/Audio/Corvax/Effects/Growl/attributions.yml
diff --git a/Resources/Audio/Corvax/Effects/Growl/growl1.ogg b/Resources/Audio/Corvax/Effects/Growl/growl1.ogg
diff --git a/Resources/Audio/Corvax/Effects/Growl/growl2.ogg b/Resources/Audio/Corvax/Effects/Growl/growl2.ogg
diff --git a/Resources/Audio/Corvax/Effects/Growl/growl3.ogg b/Resources/Audio/Corvax/Effects/Growl/growl3.ogg
diff --git a/Resources/Audio/Corvax/Effects/attributions.yml b/Resources/Audio/Corvax/Effects/attributions.yml
diff --git a/Resources/Audio/Corvax/Effects/howl.ogg b/Resources/Audio/Corvax/Effects/howl.ogg
diff --git a/...cale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl b/...cale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl
diff --git a/Resources/Locale/ru-RU/corvax/chat/emotes.ftl b/Resources/Locale/ru-RU/corvax/chat/emotes.ftl
diff --git a/...cale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl b/...cale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl
diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
diff --git a/Resources/Maps/corvax_paper.yml b/Resources/Maps/corvax_paper.yml
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml
diff --git a/Resources/Prototypes/Corvax/Maps/Pools/default.yml b/Resources/Prototypes/Corvax/Maps/Pools/default.yml
diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml
diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml
diff --git a/Resources/Prototypes/Corvax/SoundCollections/growl.yml b/Resources/Prototypes/Corvax/SoundCollections/growl.yml
diff --git a/Resources/Prototypes/Corvax/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Corvax/Voice/speech_emote_sounds.yml
diff --git a/Resources/Prototypes/Corvax/Voice/speech_emotes.yml b/Resources/Prototypes/Corvax/Voice/speech_emotes.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/baked_vulpkanin.png b/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/baked_vulpkanin.png
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/meta.json
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/plate.png b/Resources/Textures/Corvax/Objects/Consumable/Food/plate.rsi/plate.png