Добавление музыки, газов в артефакты и изменение антажного подноса

AdventureTimeSS14 · Sep 8, 2024 · f360c95 · f360c95
1 parent b55629e
commit f360c95
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 3 deletions.
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
@@ -29,7 +29,13 @@ public sealed partial class GasArtifactComponent : Component
         Gas.Tritium,
         Gas.Ammonia,
         Gas.NitrousOxide,
-        Gas.Frezon
+        Gas.Frezon,
+        //ADT-Gas-Start
+        Gas.BZ,
+        Gas.Hydrogen,
+        Gas.Halon,
+        Gas.AntiNoblium
+        //ADT-Gas-End
     };
 
     /// <summary>

diff --git a/Resources/Audio/ADT/Lobby/The_Wrong_Party.ogg b/Resources/Audio/ADT/Lobby/The_Wrong_Party.ogg
diff --git a/Resources/Audio/ADT/Lobby/attributions.yml b/Resources/Audio/ADT/Lobby/attributions.yml
@@ -0,0 +1,14 @@
+- files: ["The_Wrong_Party.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "The Wrong Party by Leon Riskin."
+  source: "https://gamemusicandsoundeffects.com/product/the-wrong-party/"
+
+- files: ["friday_night.ogg"]
+  license: "Custom"
+  copyright: "Friday Night by Leon Riskin. Royalty-free music. Purchased for the Space Station 14: Adventure Time project."
+  source: "https://gamemusicandsoundeffects.com/product/friday-night/"
+
+- files: ["space_oddity.ogg"]
+  license: "Custom"
+  copyright: "Space Oddity by Chris Hadfield."
+  source: "https://www.youtube.com/watch?v=KaOC9danxNo"
diff --git a/Resources/Audio/ADT/Lobby/friday_night.ogg b/Resources/Audio/ADT/Lobby/friday_night.ogg
diff --git a/Resources/Audio/ADT/Lobby/space_oddity.ogg b/Resources/Audio/ADT/Lobby/space_oddity.ogg
diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml
@@ -21,7 +21,7 @@
   icon: { sprite: ADT/Objects/Specific/Service/iron_tray.rsi, state: icon}
   productEntity: ADTAntagIronTray
   cost:
-    Telecrystal: 2
+    Telecrystal: 3
   categories:
   - UplinkJob
   conditions:
@@ -31,3 +31,4 @@
     - Clown
     - Mime
     - Botanist
+    - Bartender
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/Iron_tray.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/Iron_tray.yml
@@ -33,7 +33,11 @@
   description: An iron tray to store and service food
   suffix: Антаг
   components:
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 8
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 12
+        Slash: 20
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -17,3 +17,6 @@
     - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic
     - /Audio/Lobby/atomicamnesiammx.ogg
     - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
+    - /Audio/ADT/Lobby/friday_night.ogg # ADT tweak
+    - /Audio/ADT/Lobby/space_oddity.ogg # ADT tweak
+    - /Audio/ADT/Lobby/The_Wrong_Party.ogg # ADT tweak