diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml index 1aed1e64555..d5ed0cd337d 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml @@ -45,13 +45,11 @@ - - + MinSize="840 640" + SetSize="840 640"> diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs index ee12326df3f..5b70b3373dc 100644 --- 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 }; /// diff --git a/Resources/Audio/ADT/Lobby/The_Wrong_Party.ogg b/Resources/Audio/ADT/Lobby/The_Wrong_Party.ogg new file mode 100644 index 00000000000..ce4994eebe9 Binary files /dev/null and b/Resources/Audio/ADT/Lobby/The_Wrong_Party.ogg differ diff --git a/Resources/Audio/ADT/Lobby/attributions.yml b/Resources/Audio/ADT/Lobby/attributions.yml new file mode 100644 index 00000000000..2891c59dbcb --- /dev/null +++ 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 index bf582b6e8c5..1ecafd8730d 100644 --- 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 index c933b2991fb..9bdb51eb9d7 100644 --- 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 index e7640a25a34..5afddedb2e2 100644 --- 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