diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs index 2b862a83ac..74a7d65946 100644 --- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.FixedPoint; +using Robust.Shared.Audio; using Robust.Shared.GameStates; namespace Content.Shared.Chemistry.Components; @@ -51,4 +52,10 @@ public sealed partial class SolutionTransferComponent : Component [DataField("canChangeTransferAmount")] [ViewVariables(VVAccess.ReadWrite)] public bool CanChangeTransferAmount { get; set; } = false; + + // Sunrise added start + [DataField] + public SoundSpecifier? TransferSound = new SoundCollectionSpecifier("SolutionTransfer", + AudioParams.Default.WithVolume(-5f).WithMaxDistance(3f).WithVariation(0.15f)); + // Sunrise added end } diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs index b0f55a3272..44eafbf701 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.FixedPoint; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; using Robust.Shared.Network; using Robust.Shared.Player; @@ -21,6 +22,7 @@ public sealed class SolutionTransferSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; // Sunrise added /// /// Default transfer amounts for the set-transfer verb. @@ -161,10 +163,15 @@ public sealed class SolutionTransferSystem : EntitySystem public FixedPoint2 Transfer(EntityUid user, EntityUid sourceEntity, Entity source, - EntityUid targetEntity, + Entity targetEntity, // Sunrise edit Entity target, FixedPoint2 amount) { + // Sunrise added start + if (!Resolve(targetEntity.Owner, ref targetEntity.Comp)) + return FixedPoint2.Zero; + // Sunrise added end + var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity); // Check if the source is cancelling the transfer @@ -202,6 +209,10 @@ public sealed class SolutionTransferSystem : EntitySystem var solution = _solution.SplitSolution(source, actualAmount); _solution.AddSolution(target, solution); + // Sunrise added start + _audio.PlayPvs(targetEntity.Comp.TransferSound, targetEntity); + // Sunrise added end + var ev = new SolutionTransferredEvent(sourceEntity, targetEntity, user, actualAmount); RaiseLocalEvent(targetEntity, ref ev); diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index da86e89252..6fa28fd4f6 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -62,17 +62,20 @@ public abstract class ClothingSystem : EntitySystem if (TryComp(slotEntity, out ClothingComponent? item) && !item.QuickEquip) continue; - if (!_invSystem.TryUnequip(userEnt, slotDef.Name, true, inventory: userEnt, checkDoafter: true)) + // Sunrise edit - убрал тихое надевание через быстрое надевание + if (!_invSystem.TryUnequip(userEnt, slotDef.Name, false, inventory: userEnt, checkDoafter: true)) continue; - if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, true, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true)) + // Sunrise edit - убрал тихое надевание через быстрое надевание + if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, false, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true)) continue; _handsSystem.PickupOrDrop(userEnt, slotEntity.Value, handsComp: userEnt); } else { - if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, true, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true)) + // Sunrise edit - убрал тихое надевание через быстрое надевание + if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, false, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true)) continue; } diff --git a/Content.Shared/Nutrition/Components/DrinkComponent.cs b/Content.Shared/Nutrition/Components/DrinkComponent.cs index 17baaef5a3..210e22a31d 100644 --- a/Content.Shared/Nutrition/Components/DrinkComponent.cs +++ b/Content.Shared/Nutrition/Components/DrinkComponent.cs @@ -13,7 +13,7 @@ public sealed partial class DrinkComponent : Component public string Solution = "drink"; [DataField, AutoNetworkedField] - public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/Items/drink.ogg"); + public SoundSpecifier UseSound = new SoundCollectionSpecifier("DrinkSounds"); // Sunrise edit [DataField, AutoNetworkedField] public FixedPoint2 TransferAmount = FixedPoint2.New(5); diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg new file mode 100644 index 0000000000..f605559185 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg new file mode 100644 index 0000000000..3a6cf1dcbb Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg new file mode 100644 index 0000000000..c9b2e9764b Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg new file mode 100644 index 0000000000..0a61f1d595 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg new file mode 100644 index 0000000000..87aef78577 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg new file mode 100644 index 0000000000..4ec9353b34 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg new file mode 100644 index 0000000000..c5486b531c Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg new file mode 100644 index 0000000000..2e6cbafb8c Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg new file mode 100644 index 0000000000..1145c23c12 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg differ diff --git a/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg new file mode 100644 index 0000000000..22b2874c79 Binary files /dev/null and b/Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Cases/close.ogg b/Resources/Audio/_Sunrise/Items/Cases/close.ogg new file mode 100644 index 0000000000..00fc9cd650 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Cases/close.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Cases/open.ogg b/Resources/Audio/_Sunrise/Items/Cases/open.ogg new file mode 100644 index 0000000000..5be680517f Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Cases/open.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg b/Resources/Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg new file mode 100644 index 0000000000..751f4fcee9 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg b/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg new file mode 100644 index 0000000000..4222ae8e86 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg b/Resources/Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg new file mode 100644 index 0000000000..cde06408df Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Equip/base_equip.ogg b/Resources/Audio/_Sunrise/Items/Equip/base_equip.ogg new file mode 100644 index 0000000000..d90751d20d Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Equip/base_equip.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/GasTanks/insert.ogg b/Resources/Audio/_Sunrise/Items/GasTanks/insert.ogg new file mode 100644 index 0000000000..e8268fe403 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/GasTanks/insert.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/GasTanks/remove.ogg b/Resources/Audio/_Sunrise/Items/GasTanks/remove.ogg new file mode 100644 index 0000000000..01b76f1553 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/GasTanks/remove.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg new file mode 100644 index 0000000000..a25ee74578 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg new file mode 100644 index 0000000000..b859e69afc Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Cases/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Cases/drop.ogg new file mode 100644 index 0000000000..bf2b5070a8 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Cases/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Cases/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Cases/pickup.ogg new file mode 100644 index 0000000000..9f5a1d6fa7 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Cases/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg new file mode 100644 index 0000000000..4c0d37c923 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg new file mode 100644 index 0000000000..b3797c4d1b Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Glass/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Glass/drop.ogg new file mode 100644 index 0000000000..8d0ceeb4fc Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Glass/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Glass/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Glass/pickup.ogg new file mode 100644 index 0000000000..226eb6abdb Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Glass/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg new file mode 100644 index 0000000000..8892e120e0 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg new file mode 100644 index 0000000000..b28def3a51 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/ID/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/ID/drop.ogg new file mode 100644 index 0000000000..f74c6ab4c9 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/ID/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/ID/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/ID/pickup.ogg new file mode 100644 index 0000000000..1dcab18dd6 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/ID/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Leather/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Leather/drop.ogg new file mode 100644 index 0000000000..d9d5ebf539 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Leather/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Leather/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Leather/pickup.ogg new file mode 100644 index 0000000000..baa983daea Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Leather/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Metal/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Metal/drop.ogg new file mode 100644 index 0000000000..7d722993b8 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Metal/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Metal/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Metal/pickup.ogg new file mode 100644 index 0000000000..5574bdecc0 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Metal/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Plastic/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Plastic/drop.ogg new file mode 100644 index 0000000000..858470b8ad Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Plastic/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg new file mode 100644 index 0000000000..ef5f5d7176 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Rod/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Rod/pickup.ogg new file mode 100644 index 0000000000..e81a3f3af1 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Rod/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Shoes/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Shoes/drop.ogg new file mode 100644 index 0000000000..dc02fd511a Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Shoes/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg new file mode 100644 index 0000000000..7266d61518 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg new file mode 100644 index 0000000000..fe10b931cc Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg new file mode 100644 index 0000000000..1719fb8c92 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg new file mode 100644 index 0000000000..e553af9495 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Wood/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Wood/drop.ogg new file mode 100644 index 0000000000..ff5db20803 Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Wood/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Wood/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Wood/pickup.ogg new file mode 100644 index 0000000000..4c4ae281df Binary files /dev/null and b/Resources/Audio/_Sunrise/Items/Handling/Wood/pickup.ogg differ diff --git a/Resources/Audio/_Sunrise/Structures/Closets/close.ogg b/Resources/Audio/_Sunrise/Structures/Closets/close.ogg new file mode 100644 index 0000000000..124f5d85f5 Binary files /dev/null and b/Resources/Audio/_Sunrise/Structures/Closets/close.ogg differ diff --git a/Resources/Audio/_Sunrise/Structures/Closets/open.ogg b/Resources/Audio/_Sunrise/Structures/Closets/open.ogg new file mode 100644 index 0000000000..86cbcea0d0 Binary files /dev/null and b/Resources/Audio/_Sunrise/Structures/Closets/open.ogg differ diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index a18487ba3e..d5edf50ad1 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -1,5 +1,5 @@ - type: entity - parent: [Clothing, ContentsExplosionResistanceBase] + parent: [BackpackSounds, Clothing, ContentsExplosionResistanceBase] # Sunrise edit id: ClothingBackpack name: backpack description: You wear this on your back and put items into it. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml index 81fddf379b..dce223cdcd 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingBeltStorageBase + parent: [BackpackSounds, ClothingBeltStorageBase] # Sunrise edit id: ClothingBeltStorageWaistbag name: leather waist bag description: A leather waist bag meant for carrying small items. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index 1d8d38da79..9196a8d445 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -7,6 +7,13 @@ state: icon - type: Clothing slots: [gloves] + # Sunrise added start + equipSound: + path: /Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg + params: + volume: -4 + maxDistance: 3 + # Sunrise added end - type: Food requiresSpecialDigestion: true - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 1190c67420..8fe550835b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -29,7 +29,7 @@ #Basic Helmet (Security Helmet) - type: entity - parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband] + parent: [HelmetSounds, ClothingHeadHelmetArmoredBase, BaseSecurityContraband] # Sunrise edit id: ClothingHeadHelmetBasic name: helmet description: Standard security gear. Protects the head from impacts. @@ -45,7 +45,7 @@ #Mercenary Helmet - type: entity - parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ] + parent: [HelmetSounds, ClothingHeadHelmetArmoredBase, BaseMajorContraband] # Sunrise edit id: ClothingHeadHelmetMerc name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. @@ -57,7 +57,7 @@ #SWAT Helmet - type: entity - parent: [ClothingHeadHelmetBase, BaseSecurityContraband] + parent: [HelmetSounds, ClothingHeadHelmetBase, BaseSecurityContraband] # Sunrise edit id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -93,7 +93,7 @@ #Light Riot Helmet - type: entity - parent: [ClothingHeadHelmetBase, BaseSecurityContraband] + parent: [HelmetSounds, ClothingHeadHelmetBase, BaseSecurityContraband] # Sunrise edit id: ClothingHeadHelmetRiot name: light riot helmet description: It's a helmet specifically designed to protect against close range attacks. @@ -112,7 +112,7 @@ #Bombsuit Helmet - type: entity - parent: ClothingHeadBase + parent: [HelmetSounds, ClothingHeadBase] # Sunrise edit id: ClothingHeadHelmetBombSuit name: bombsuit helmet description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce. @@ -235,7 +235,7 @@ #Fire Helmet - type: entity - parent: ClothingHeadLightBase + parent: [HelmetSounds, ClothingHeadLightBase] # Sunrise edit id: ClothingHeadHelmetFire name: fire helmet description: An atmos tech's best friend. Provides some heat resistance and looks cool. @@ -459,7 +459,7 @@ #Justice Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [HelmetSounds, ClothingHeadHelmetBasic] # Sunrise edit id: ClothingHeadHelmetJustice name: justice helm description: Advanced security gear. Protects the station from ne'er-do-wells. diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index e2733b2468..b06c1f6831 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -3,6 +3,23 @@ parent: Clothing id: ClothingShoesBase components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg + params: + volume: -2 + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Shoes/drop.ogg + params: + volume: -2 + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Shoes/drop.ogg + params: + volume: -2 + # Sunrise added end - type: Clothing slots: - FEET diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml index da9a7f8b1a..e6c21f9811 100644 --- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml +++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml @@ -3,6 +3,11 @@ parent: BaseItem id: Clothing components: + - type: Clothing + equipSound: + collection: EquipSounds + params: + maxDistance: 3 - type: Item size: Normal - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 548b1b9180..97dc820692 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -86,6 +86,8 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/drinkglass_pickup.ogg + params: + volume: -3 - type: EmitSoundOnDrop sound: path: /Audio/_Sunrise/Items/Handling/drinkglass_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 2e2f2979bc..c3204ccfd8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -127,6 +127,17 @@ id: FoodPlatePlastic description: A large blue plastic plate, excellent for a birthday cake. components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/drop.ogg + # Sunrise added end - type: Sprite sprite: Objects/Consumable/Food/plates.rsi state: plate-plastic @@ -140,7 +151,7 @@ - type: entity name: plastic plate - parent: BaseItem + parent: [PlasticSounds, BaseItem] # Sunrise edit id: FoodPlateSmallPlastic description: A blue plastic plate, excellent for slices of birthday cake. components: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index c01b07ef56..762b5728b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -280,7 +280,7 @@ - type: Extractable grindableSolutionName: food - type: DamageOnInteract - damage: + damage: types: Heat: 4 Caustic: 4 @@ -307,7 +307,7 @@ volume: -5 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 5 # The nettle will "wilt" after 5 hits. @@ -1747,7 +1747,7 @@ - type: entity name: glasstle - parent: FoodProduceBase + parent: [GlassSounds, FoodProduceBase] # Sunrise edit id: FoodGlasstle description: A fragile crystal plant with lot of spiky thorns. components: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml index 5e91d53847..bc9c817abc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml @@ -1,6 +1,6 @@ - type: entity id: CigarCase - parent: [ BaseStorageItem, BaseBagOpenClose ] + parent: [ CaseSounds, BaseStorageItem, BaseBagOpenClose ] # Sunrise edit name: cigar case description: A case for holding your cigars when you are not smoking them. components: diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index a797352bf9..250fdf3ed3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [GlassSounds, BaseItem] # Sunrise edit id: SheetGlassBase name: glass description: A sheet of glass, used often on the station in various applications. diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 2fcf70c9aa..82efb5a5ee 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [MetalSounds, BaseItem] # Sunrise edit id: SheetMetalBase description: A sheet of metal, used often on the station in various applications. components: @@ -242,4 +242,4 @@ components: - type: Stack lingering: true - count: 0 \ No newline at end of file + count: 0 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index aee5f7ff65..6bb343357f 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -149,7 +149,7 @@ count: 0 - type: entity - parent: SheetOtherBase + parent: [PlasticSounds, SheetOtherBase] # Sunrise edit id: SheetPlastic name: plastic suffix: Full diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 6f98663ff5..1ad4250cea 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -84,6 +84,17 @@ name: cloth suffix: Full components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/drop.ogg + # Sunrise added end - type: Healing damageContainers: - Biological @@ -173,6 +184,17 @@ name: durathread suffix: Full components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Leather/drop.ogg + # Sunrise added end - type: Stack stackType: Durathread baseLayer: base @@ -232,6 +254,17 @@ name: wood suffix: Full components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Wood/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Wood/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Wood/drop.ogg + # Sunrise added end - type: Material - type: PhysicalComposition materialComposition: diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index d603580951..e39693c7e3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -26,6 +26,20 @@ name: metal rod suffix: Full components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Rod/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Rod/pickup.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Rod/pickup.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/_Sunrise/Items/Handling/Rod/pickup.ogg + # Sunrise added end - type: PhysicalComposition materialComposition: Steel: 50 #Half of a regular steel sheet to reflect the crafting recipe diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index 77ddcf0d98..a781226bc2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseStorageItem + parent: [CaseSounds, BaseStorageItem] # Sunrise edit id: BriefcaseBase description: Useful for carrying items in your hands. abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index e997ce218a..7c53001eab 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -5,6 +5,17 @@ description: A card necessary to access various areas aboard the station. abstract: true components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/ID/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/ID/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/ID/drop.ogg + # Sunrise added end - type: Sprite sprite: Objects/Misc/id_cards.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml index 9304d09eb6..75a1331191 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml @@ -2,7 +2,7 @@ id: MedalCase name: medal case description: Case with medals. - parent: [ BaseStorageItem, BaseBagOpenClose, BaseCommandContraband ] + parent: [ CaseSounds, BaseStorageItem, BaseBagOpenClose, BaseCommandContraband ] # Sunrise edit components: - type: Sprite sprite: Objects/Storage/medalcase.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 983cfaf0ae..f7afe20098 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -211,7 +211,7 @@ - type: entity name: steel tile - parent: FloorTileItemBase + parent: [MetalSounds, FloorTileItemBase] id: FloorTileItemSteel components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index e735b2dcdd..8c49af8aeb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml @@ -10,7 +10,7 @@ - type: SpaceGarbage - type: entity - parent: UtensilBase + parent: [PlasticSounds, UtensilBase] # Sunrise edit id: UtensilBasePlastic abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 82f91669cd..fd8728e988 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -1,7 +1,7 @@ - type: entity name: first aid kit description: It's an emergency medical kit for those serious boo-boos. - parent: BaseStorageItem + parent: [CaseSounds, BaseStorageItem] # Sunrise edit id: Medkit components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml index 5d63b2d1b5..00ab75dfe9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -45,9 +45,13 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/crowbar_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/crowbar_drop.ogg + params: + volume: -2 # Sunrise end # Standard (grey) Crowbar diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 0dd7db2432..7b33a4fb1a 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -3,6 +3,28 @@ parent: BaseItem id: GasTankBase components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg + params: + volume: -2 + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg + params: + volume: -2 + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg + params: + volume: -2 + - type: EmitSoundOnCollide + sound: + path: /Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg + params: + volume: -2 + # Sunrise added end - type: Sprite sprite: Objects/Tanks/generic.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index c8d94bb48f..3f1de7eff1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -11,9 +11,13 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/wirecutter_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/wirecutter_drop.ogg + params: + volume: -2 # Sunrise edit - type: Tag tags: @@ -65,9 +69,13 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/screwdriver_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/screwdriver_drop.ogg + params: + volume: -2 # Sunrise end - type: Tag tags: @@ -117,9 +125,13 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/wrench_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/wrench_drop.ogg + params: + volume: -2 # Sunrise end - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index e5b8e0464a..4f1f425b8f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -11,9 +11,13 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/weldingtool_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/welder_drop.ogg + params: + volume: -2 # Sunrise end - type: Sprite sprite: Objects/Tools/welder.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index c3f33f35da..af1aba6040 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -4,6 +4,17 @@ id: Stunbaton description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. components: + # Sunrise added start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg + # Sunrise added end - type: Sprite sprite: Objects/Weapons/Melee/stunbaton.rsi layers: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index cde9d27b4f..5ca5db2af3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2188,6 +2188,12 @@ components: - type: VendingMachine pack: TankDispenserEVAInventory + # Sunrise added start + soundVend: + path: /Audio/_Sunrise/Items/GasTanks/remove.ogg + params: + volume: -3 + # Sunrise added end - type: Sprite sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers state: dispenser @@ -2201,6 +2207,12 @@ components: - type: VendingMachine pack: TankDispenserEngineeringInventory + # Sunrise added start + soundVend: + path: /Audio/_Sunrise/Items/GasTanks/remove.ogg + params: + volume: -3 + # Sunrise added end - type: Sprite sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers layers: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index f454c84480..aa507c421d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -98,6 +98,16 @@ - type: GasPortable - type: GasCanister gasTankSlot: + # Sunrise added start + insertSound: + path: /Audio/_Sunrise/Items/GasTanks/insert.ogg + params: + volume: -3 + ejectSound: + path: /Audio/_Sunrise/Items/GasTanks/remove.ogg + params: + volume: -3 + # Sunrise added end name: comp-gas-canister-slot-name-gas-tank whitelist: components: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 84b25d1351..6348fe4b15 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -56,6 +56,16 @@ layer: - MachineLayer - type: EntityStorage + # Sunrise edit start + closeSound: + path: /Audio/_Sunrise/Structures/Closets/close.ogg + params: + volume: -1 + openSound: + path: /Audio/_Sunrise/Structures/Closets/open.ogg + params: + volume: -1 + # Sunrise edit end - type: ContainerContainer containers: entity_storage: !type:Container diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml index 0aaf7ccb51..52b6c9a66d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml @@ -10,7 +10,7 @@ sprite: _Sunrise/Clothing/Head/Helmets/security_medic.rsi - type: entity - parent: ClothingHeadBase + parent: [HelmetSounds, ClothingHeadBase] id: ClothingHeadHelmetPilot name: security pilot's helmet description: A thick pilot's helmet that provides good head protection. diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml index 42d4b8b2f3..b1231912db 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml @@ -139,7 +139,7 @@ name: glasscap description: Glass doesn't grow on trees! It grows on mushrooms, of course. id: GlassLog - parent: ProduceBase + parent: [GlassSounds, ProduceBase] # Sunrise edit components: - type: Sprite sprite: _Sunrise/Objects/Specific/Hydroponics/glasscap.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml index 445a0b0196..3cca790e4f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml @@ -40,6 +40,15 @@ damage: 20 - type: UseDelay delay: 0.4 + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg - type: Item sprite: _Sunrise/Objects/Weapons/Melee/telebaton.rsi size: Small diff --git a/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml b/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml index 5f32825ef9..2a937730bc 100644 --- a/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml +++ b/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml @@ -19,12 +19,18 @@ - type: EmitSoundOnPickup sound: path: /Audio/_Sunrise/Items/Handling/multitool_pickup.ogg + params: + volume: -2 - type: EmitSoundOnDrop sound: path: /Audio/Items/multitool_drop.ogg + params: + volume: -2 - type: EmitSoundOnLand sound: path: /Audio/Items/multitool_drop.ogg + params: + volume: -2 - type: entity id: DiskSounds @@ -55,4 +61,110 @@ path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg - type: EmitSoundOnCollide sound: - path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg \ No newline at end of file + path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg + +- type: entity + id: HelmetSounds + abstract: true + components: + - type: Clothing + equipSound: + path: /Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg + params: + volume: -5 + maxDistance: 3 + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg + params: + volume: -5 + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Helmets/drop.ogg + params: + volume: -5 + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Helmets/drop.ogg + params: + volume: -5 + +- type: entity + id: BackpackSounds + abstract: true + components: + - type: Clothing + equipSound: + path: /Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg + params: + maxDistance: 3 + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg + +- type: entity + id: PlasticSounds + abstract: true + components: + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Plastic/drop.ogg + +- type: entity + id: GlassSounds + abstract: true + components: + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Glass/pickup.ogg + params: + volume: -2 + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Glass/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Glass/drop.ogg + +- type: entity + id: MetalSounds + abstract: true + components: + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Metal/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Metal/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Metal/drop.ogg + +- type: entity + id: CaseSounds + abstract: true + components: + - type: Storage + storageOpenSound: /Audio/_Sunrise/Items/Cases/open.ogg + storageCloseSound: /Audio/_Sunrise/Items/Cases/close.ogg + - type: EmitSoundOnPickup + sound: + path: /Audio/_Sunrise/Items/Handling/Cases/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_Sunrise/Items/Handling/Cases/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Items/Handling/Cases/drop.ogg diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/drink.yml b/Resources/Prototypes/_Sunrise/SoundCollections/drink.yml new file mode 100644 index 0000000000..f2f7d251b9 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/SoundCollections/drink.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: DrinkSounds + files: + - /Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg + - /Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg + - /Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg + - /Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg + - /Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/misc.yml b/Resources/Prototypes/_Sunrise/SoundCollections/misc.yml index b918c4d45b..b4a2e411a1 100644 --- a/Resources/Prototypes/_Sunrise/SoundCollections/misc.yml +++ b/Resources/Prototypes/_Sunrise/SoundCollections/misc.yml @@ -11,3 +11,8 @@ - /Audio/_Sunrise/Voice/Slime/блабл-бламп.ogg - /Audio/_Sunrise/Voice/Slime/блюмп.ogg - /Audio/_Sunrise/Voice/Slime/бламп.ogg + +- type: soundCollection + id: EquipSounds + files: + - /Audio/_Sunrise/Items/Equip/base_equip.ogg diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/solution_transfer.yml b/Resources/Prototypes/_Sunrise/SoundCollections/solution_transfer.yml new file mode 100644 index 0000000000..39d65a9f57 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/SoundCollections/solution_transfer.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: SolutionTransfer + files: + - /Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg + - /Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg + - /Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg + - /Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg + - /Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg