diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 327c8a089d..fdf6029fbc 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -9,6 +9,7 @@ using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System.Linq; using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Sound; using Content.Shared.GameObjects.Components.Storage; using Robust.Server.GameObjects; @@ -70,7 +71,12 @@ namespace Content.Server.GameObjects.Components break; } } + ModifyComponents(); + if (Owner.TryGetComponent(out SoundComponent soundComponent)) + { + soundComponent.Play("/Audio/machines/closetclose.ogg"); + } } private void OpenStorage() @@ -78,10 +84,14 @@ namespace Content.Server.GameObjects.Components Open = true; EmptyContents(); ModifyComponents(); + if (Owner.TryGetComponent(out SoundComponent soundComponent)) + { + soundComponent.Play("/Audio/machines/closetopen.ogg"); + } } private void ModifyComponents() - { + { if (Owner.TryGetComponent(out var collidableComponent)) { collidableComponent.CollisionEnabled = IsCollidableWhenOpen || !Open; diff --git a/Resources/Audio/machines/closetclose.ogg b/Resources/Audio/machines/closetclose.ogg new file mode 100644 index 0000000000..b1e3c23294 Binary files /dev/null and b/Resources/Audio/machines/closetclose.ogg differ diff --git a/Resources/Audio/machines/closetopen.ogg b/Resources/Audio/machines/closetopen.ogg new file mode 100644 index 0000000000..1ee1b0de5c Binary files /dev/null and b/Resources/Audio/machines/closetopen.ogg differ diff --git a/Resources/Prototypes/Entities/buildings/storage/closet_base.yml b/Resources/Prototypes/Entities/buildings/storage/closet_base.yml index b9f5f20b8c..6223c880e5 100644 --- a/Resources/Prototypes/Entities/buildings/storage/closet_base.yml +++ b/Resources/Prototypes/Entities/buildings/storage/closet_base.yml @@ -34,6 +34,7 @@ - type: StorageVisualizer2D state_open: generic_open state_closed: generic_door + - type: Sound placement: snap: diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_base.yml b/Resources/Prototypes/Entities/buildings/storage/crate_base.yml index 161b954fdf..7de66823e1 100644 --- a/Resources/Prototypes/Entities/buildings/storage/crate_base.yml +++ b/Resources/Prototypes/Entities/buildings/storage/crate_base.yml @@ -38,3 +38,4 @@ state_open: crate_open state_closed: crate_door + - type: Sound