Merge branch 'plasma-cutters' of https://github.com/AdventureTimeSS14…

…/space_station_ADT into plasma-cutters
AdventureTimeSS14 · Sep 11, 2024 · 311d3f7 · 311d3f7
2 parents a516c16 + d78637b
commit 311d3f7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
@@ -45,13 +45,11 @@
         <SplitContainer Orientation="Vertical"
                         HorizontalExpand="True"
                         VerticalExpand="True">
-
             <ScrollContainer HScrollEnabled="False"
                              HorizontalExpand="True"
                              VerticalExpand="True"
                              MinHeight="50"
                              SizeFlagsStretchRatio="2.5">
-
                 <GridContainer Name="ReagentList"
                                HorizontalExpand="True"
                                VerticalExpand="True"

diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
@@ -4,8 +4,8 @@
             xmlns:ui="clr-namespace:Content.Client.ParticleAccelerator.UI"
             xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
             Title="{Loc 'particle-accelerator-control-menu-device-version-label'}"
-            MinSize="420 320"
-            SetSize="420 320">
+            MinSize="840 640"
+            SetSize="840 640"> <!-- ADT-Tweak: Соотношение увеличено в 2 раза -->
     <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 10 0 0">
         <BoxContainer Orientation="Horizontal" VerticalExpand="True">
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 5">

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,4 @@
+- 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/"
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,4 @@
     - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic
     - /Audio/Lobby/atomicamnesiammx.ogg
     - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
+    - /Audio/ADT/Lobby/The_Wrong_Party.ogg # ADT tweak