Merge branch 'master' into add-user-info-imitator

SerbiaStrong-220 · Feb 14, 2024 · b514100 · b514100
2 parents 9b5ca81 + 766a8c7
commit b514100
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/Resources/Audio/SS220/StationEvents/attributions.yml b/Resources/Audio/SS220/StationEvents/attributions.yml
@@ -6,4 +6,9 @@
 - files: ["ourclasstrial.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created for Danganronpa V3"
-  source: "https://www.youtube.com/watch?v=Yb2oKpPJ_qk"
+  source: "https://www.youtube.com/watch?v=Yb2oKpPJ_qk"
+
+- files: ["meat.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Chaemann for SS220"
+  source: "https://github.com/SerbiaStrong-220"
diff --git a/Resources/Audio/SS220/StationEvents/meat.ogg b/Resources/Audio/SS220/StationEvents/meat.ogg
diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml
@@ -76,3 +76,12 @@
   id: 7
   time: '2024-02-12T15:15:16.0000000+00:00'
   url: https://api.github.com/repos/SerbiaStrong-220/space-station-14/pulls/725
+- author: Ady4
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
+      \u0430\u044F \u043C\u0443\u0437\u044B\u043A\u0430 \u044F\u0434\u0435\u0440\u043D\
+      \u043E\u0439 \u0431\u043E\u0435\u0433\u043E\u043B\u043E\u0432\u043A\u0438."
+    type: Add
+  id: 8
+  time: '2024-02-13T16:49:39.0000000+00:00'
+  url: https://api.github.com/repos/SerbiaStrong-220/space-station-14/pulls/733
diff --git a/Resources/Maps/axioma.yml b/Resources/Maps/axioma.yml
@@ -98569,24 +98569,12 @@ entities:
       anchored: True
       pos: 29.5,-89.5
       parent: 3
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
   - uid: 19951
     components:
     - type: Transform
       anchored: True
       pos: 26.5,-91.5
       parent: 3
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
   - uid: 32549
     components:
     - type: Transform

diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -6,3 +6,4 @@
     - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
     - /Audio/SS220/StationEvents/broken.ogg # SS220-NukeMusic
     - /Audio/SS220/StationEvents/ourclasstrial.ogg # SS220-NukeMusic
+    - /Audio/SS220/StationEvents/meat.ogg # SS220-NukeMusic