Merge branch 'master' into 2020-04-28-tool-component

# Conflicts: # SpaceStation14.sln.DotSettings
2020-05-22 11:31:18 +02:00
parent 1e91b9f075 958c101e52
commit d2d6c2cecd
56 changed files with 1128 additions and 43 deletions
--- a/Resources/Prototypes/SoundCollections/body_fall.yml
+++ b/Resources/Prototypes/SoundCollections/body_fall.yml
@@ -0,0 +1,7 @@
+- type: sound_collection
+  id: bodyfall
+  files:
+  - /Audio/effects/bodyfall1.ogg
+  - /Audio/effects/bodyfall2.ogg
+  - /Audio/effects/bodyfall3.ogg
+  - /Audio/effects/bodyfall4.ogg
--- a/Resources/Prototypes/SoundCollections/sparks.yml
+++ b/Resources/Prototypes/SoundCollections/sparks.yml
@@ -0,0 +1,7 @@
+- type: sound_collection
+  id: sparks
+  files:
+  - /Audio/effects/sparks1.ogg
+  - /Audio/effects/sparks2.ogg
+  - /Audio/effects/sparks3.ogg
+  - /Audio/effects/sparks4.ogg