From 13704a255c00601ebab17a706493df365f7674fe Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sun, 27 Dec 2020 13:32:48 -0400 Subject: [PATCH] Fixes the audio and icon (#2854) --- .../Components/Cargo/CargoTelepadComponent.cs | 2 +- .../Prototypes/Catalog/Cargo/cargo_security.yml | 2 +- ...OUTERCLOTHING.png => equipped-OUTERCLOTHING.png} | Bin .../Vests/oldarmor.rsi/{armor.png => icon.png} | Bin 4 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/{armor-equipped-OUTERCLOTHING.png => equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/{armor.png => icon.png} (100%) diff --git a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs index a85c8386a3..83f20b12ee 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs @@ -82,7 +82,7 @@ namespace Content.Server.GameObjects.Components.Cargo { if (!Deleted && !Owner.Deleted && _currentState == CargoTelepadState.Teleporting && _teleportQueue.Count > 0) { - EntitySystem.Get().PlayFromEntity("/Audio/machines/phasein.ogg", Owner, AudioParams.Default.WithVolume(-8f)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/phasein.ogg", Owner, AudioParams.Default.WithVolume(-8f)); Owner.EntityManager.SpawnEntity(_teleportQueue[0].Product, Owner.Transform.Coordinates); _teleportQueue.RemoveAt(0); if (Owner.TryGetComponent(out var spriteComponent)) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 16e76cc60f..560b34a3cc 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ description: "Three vests of well-rounded, decently-protective armor. Requires Security access to open." icon: sprite: Clothing/OuterClothing/Vests/oldarmor.rsi - state: armor + state: icon product: CrateSecurityArmor cost: 1500 category: Security diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor-equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor.png rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/icon.png