diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs index ecd176750c..df9b94be07 100644 --- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs +++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs @@ -1,4 +1,5 @@ -using System; +using System; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -39,7 +40,7 @@ namespace Content.Client.Disposal.Visualizers private string? _stateFlush; [DataField("flush_sound", required: true)] - private string? _flushSound; + private SoundSpecifier _flushSound = default!; [DataField("flush_time", required: true)] private float _flushTime; @@ -58,9 +59,9 @@ namespace Content.Client.Disposal.Visualizers var sound = new AnimationTrackPlaySound(); _flushAnimation.AnimationTracks.Add(sound); - if (_flushSound != null) + if (_flushSound.TryGetSound(out var flushSound)) { - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_flushSound, 0)); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(flushSound, 0)); } } diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs index 8f6c0651b1..4f5a745e01 100644 --- a/Content.Client/Doors/AirlockVisualizer.cs +++ b/Content.Client/Doors/AirlockVisualizer.cs @@ -1,8 +1,8 @@ using System; -using Content.Client.Wires; using Content.Client.Wires.Visualizers; using Content.Shared.Audio; using Content.Shared.Doors; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -18,13 +18,13 @@ namespace Content.Client.Doors private const string AnimationKey = "airlock_animation"; [DataField("open_sound", required: true)] - private string _openSound = default!; + private SoundSpecifier _openSound = default!; [DataField("close_sound", required: true)] - private string _closeSound = default!; + private SoundSpecifier _closeSound = default!; [DataField("deny_sound", required: true)] - private string _denySound = default!; + private SoundSpecifier _denySound = default!; [DataField("animation_time")] private float _delay = 0.8f; @@ -55,9 +55,9 @@ namespace Content.Client.Doors var sound = new AnimationTrackPlaySound(); CloseAnimation.AnimationTracks.Add(sound); - if (_closeSound != null) + if (_closeSound.TryGetSound(out var closeSound)) { - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_closeSound, 0)); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(closeSound, 0)); } } @@ -81,9 +81,9 @@ namespace Content.Client.Doors var sound = new AnimationTrackPlaySound(); OpenAnimation.AnimationTracks.Add(sound); - if (_openSound != null) + if (_openSound.TryGetSound(out var openSound)) { - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_openSound, 0)); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(openSound, 0)); } } @@ -97,9 +97,9 @@ namespace Content.Client.Doors var sound = new AnimationTrackPlaySound(); DenyAnimation.AnimationTracks.Add(sound); - if (_denySound != null) + if (_denySound.TryGetSound(out var denySound)) { - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_denySound, 0, () => AudioHelpers.WithVariation(0.05f))); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(denySound, 0, () => AudioHelpers.WithVariation(0.05f))); } } } diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs index 703c76a14a..4d629dcd67 100644 --- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs +++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs @@ -1,5 +1,6 @@ using System; using Content.Shared.Light; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -17,7 +18,7 @@ namespace Content.Client.Light.Visualizers { [DataField("minBlinkingTime")] private float _minBlinkingTime = 0.5f; [DataField("maxBlinkingTime")] private float _maxBlinkingTime = 2; - [DataField("blinkingSound")] private string? _blinkingSound; + [DataField("blinkingSound")] private SoundSpecifier _blinkingSound = default!; private bool _wasBlinking; @@ -124,13 +125,13 @@ namespace Content.Client.Light.Visualizers } }; - if (_blinkingSound != null) + if (_blinkingSound.TryGetSound(out var blinkingSound)) { blinkingAnim.AnimationTracks.Add(new AnimationTrackPlaySound() { KeyFrames = { - new AnimationTrackPlaySound.KeyFrame(_blinkingSound, 0.5f) + new AnimationTrackPlaySound.KeyFrame(blinkingSound, 0.5f) } }); } diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs index 96d16890a2..246a4c181a 100644 --- a/Content.Client/Trigger/TimerTriggerVisualizer.cs +++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs @@ -1,4 +1,5 @@ -using System; +using System; +using Content.Shared.Sound; using Content.Shared.Trigger; using JetBrains.Annotations; using Robust.Client.Animations; @@ -15,7 +16,7 @@ namespace Content.Client.Trigger private const string AnimationKey = "priming_animation"; [DataField("countdown_sound", required: true)] - private string? _countdownSound; + private SoundSpecifier _countdownSound = default!; private Animation PrimingAnimation = default!; @@ -28,11 +29,11 @@ namespace Content.Client.Trigger flick.LayerKey = TriggerVisualLayers.Base; flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f)); - if (_countdownSound != null) + if (_countdownSound.TryGetSound(out var countdownSound)) { var sound = new AnimationTrackPlaySound(); PrimingAnimation.AnimationTracks.Add(sound); - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound, 0)); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(countdownSound, 0)); } } } diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs index ca176e9c39..64a56ef03a 100644 --- a/Content.Server/Projectiles/Components/ProjectileComponent.cs +++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs @@ -26,9 +26,8 @@ namespace Content.Server.Projectiles.Components public bool DeleteOnCollide { get; } = true; // Get that juicy FPS hit sound - [DataField("soundHit")] public string? SoundHit = default; - private SoundSpecifier _soundHit = default!; - [DataField("soundHitSpecies")] public string? SoundHitSpecies = default; + [DataField("soundHit")] public SoundSpecifier SoundHit = default!; + [DataField("soundHitSpecies")] public SoundSpecifier SoundHitSpecies = default!; public bool DamagedEntity; diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index cb05bcf8aa..76b1b7c32a 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -33,13 +33,13 @@ namespace Content.Server.Projectiles var playerFilter = Filter.Pvs(coordinates); if (!otherEntity.Deleted && - otherEntity.HasComponent() && component.SoundHitSpecies != null) + otherEntity.HasComponent() && component.SoundHitSpecies.TryGetSound(out var soundHitSpecies)) { - SoundSystem.Play(playerFilter, component.SoundHitSpecies, coordinates); + SoundSystem.Play(playerFilter, soundHitSpecies, coordinates); } - else if (component.SoundHit != null) + else if (component.SoundHit.TryGetSound(out var soundHit)) { - SoundSystem.Play(playerFilter, component.SoundHit, coordinates); + SoundSystem.Play(playerFilter, soundHit, coordinates); } if (!otherEntity.Deleted && otherEntity.TryGetComponent(out IDamageableComponent? damage)) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 8ca177e8e3..c7ccddd253 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -499,8 +499,8 @@ entities: pos: 39.53893,-0.77325034 parent: 853 type: Transform - - useSoundCollection: '' - useSound: /Audio/Items/jaws_pry.ogg + - useSound: + path: /Audio/Items/jaws_pry.ogg type: Tool - uid: 54 type: ClothingHandsGlovesLatex diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 67ef75c4fa..dc884e1a04 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -15,7 +15,8 @@ sprite: Clothing/Back/Backpacks/backpack.rsi - type: Storage capacity: 100 - storageSoundCollection : storageRustle + storageSoundCollection: + collection: storageRustle - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index b00d921e26..8aa43092ee 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -15,7 +15,8 @@ - back - type: Storage capacity: 100 - storageSoundCollection : storageRustle + storageSoundCollection: + collection: storageRustle - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index c2b7944466..73c04b2c56 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -15,7 +15,8 @@ sprite: Clothing/Back/Satchels/satchel.rsi - type: Storage capacity: 100 - storageSoundCollection : storageRustle + storageSoundCollection: + collection: storageRustle - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 8863546e1c..69a594bab6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -20,7 +20,8 @@ - type: Clothing sprite: Clothing/Shoes/Specific/clown.rsi - type: FootstepModifier - footstepSoundCollection: footstep_clown + footstepSoundCollection: + collection: footstep_clown - type: entity parent: ClothingShoesBase diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml index b73a7f60b3..e1d93ccc3b 100644 --- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml +++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml @@ -23,17 +23,25 @@ tools: - behavior: Prying state: icon - useSound: /Audio/Items/jaws_pry.ogg - changeSound: /Audio/Items/change_jaws.ogg + useSound: + path: /Audio/Items/jaws_pry.ogg + changeSound: + path: /Audio/Items/change_jaws.ogg - behavior: Cutting state: icon - useSound: /Audio/Items/jaws_cut.ogg - changeSound: /Audio/Items/change_jaws.ogg + useSound: + path: /Audio/Items/jaws_cut.ogg + changeSound: + path: /Audio/Items/change_jaws.ogg - behavior: Screwing state: icon - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg + useSound: + path: /Audio/Items/drill_use.ogg + changeSound: + path: /Audio/Items/change_drill.ogg - behavior: Anchoring state: icon - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg + useSound: + path: /Audio/Items/drill_use.ogg + changeSound: + path: /Audio/Items/change_drill.ogg diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 6e018f8f0b..1e03310877 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -8,7 +8,8 @@ drawdepth: FloorObjects - type: SolutionContainer - type: Puddle - spill_sound: /Audio/Effects/Fluids/splat.ogg + spill_sound: + path: /Audio/Effects/Fluids/splat.ogg recolor: true - type: Clickable - type: Slippery diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index cef117e5da..d7bbe39452 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -34,7 +34,8 @@ - type: MovedByPressure - type: Barotrauma - type: DamageOnHighSpeedImpact - soundHit: /Audio/Effects/hit_kick.ogg + soundHit: + path: /Audio/Effects/hit_kick.ogg - type: Sprite noRot: true drawdepth: Mobs diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 915d97340a..0b9407b025 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -35,7 +35,8 @@ - type: MovedByPressure - type: Barotrauma - type: DamageOnHighSpeedImpact - soundHit: /Audio/Effects/hit_kick.ogg + soundHit: + path: /Audio/Effects/hit_kick.ogg - type: Hunger - type: Thirst # Organs diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 07ff40713f..3dafbe4a9d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -24,8 +24,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpillBehavior { } - !type:SpawnEntitiesBehavior spawn: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index b80ef6f762..a610a361f4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -103,8 +103,8 @@ # !type:DamageTrigger # damage: 10 # behaviors: - # - !type:PlaySoundCollectionBehavior - # soundCollection: desecration + # - !type:PlaySoundBehavior + # collection:: desecration # - !type:SpawnEntitiesBehavior # spawn: # EggBoxBroken: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 51b70bb466..2768df6b6b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -10,7 +10,8 @@ description: A small plastic pack with condiments to put on your food. components: - type: Drink - openSounds: packetOpenSounds + openSounds: + collection: packetOpenSounds - type: SolutionContainer maxVol: 10 - type: SolutionTransfer @@ -309,7 +310,8 @@ description: A thin glass bottle used to store condiments. components: - type: Drink - openSounds: pop + openSounds: + collection: pop - type: SolutionContainer maxVol: 30 - type: SolutionTransfer @@ -444,7 +446,8 @@ description: A smaller glass bottle used to store condiments. components: - type: Drink - openSounds: pop + openSounds: + collection: pop - type: SolutionContainer maxVol: 15 - type: SolutionTransfer diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 061ab23fe9..02d0bc4015 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -27,8 +27,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpawnEntitiesBehavior spawn: FoodPlateTrash: @@ -66,8 +66,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpawnEntitiesBehavior spawn: FoodPlateSmallTrash: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index fa7bc163fa..dbb7781c35 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -55,8 +55,8 @@ !type:DamageTrigger damage: 6 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: canOpenSounds + - !type:PlaySoundBehavior + collection:: canOpenSounds - !type:SpawnEntitiesBehavior spawn: FoodTinPeachesOpen: @@ -103,8 +103,8 @@ !type:DamageTrigger damage: 6 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: canOpenSounds + - !type:PlaySoundBehavior + collection:: canOpenSounds - !type:SpawnEntitiesBehavior spawn: FoodTinPeachesMaintOpen: @@ -151,8 +151,8 @@ !type:DamageTrigger damage: 6 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: canOpenSounds + - !type:PlaySoundBehavior + collection:: canOpenSounds - !type:SpawnEntitiesBehavior spawn: FoodTinBeansOpen: @@ -201,8 +201,8 @@ !type:DamageTrigger damage: 6 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: canOpenSounds + - !type:PlaySoundBehavior + collection:: canOpenSounds - !type:SpawnEntitiesBehavior spawn: FoodTinMREOpen: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml index 06c818d1b9..1ecdb853b0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -34,8 +34,8 @@ !type:DamageTrigger damage: 1 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: desecration + - !type:PlaySoundBehavior + collection:: desecration - !type:SpawnEntitiesBehavior spawn: Eggshells: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 59703f8286..28db9749cd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -28,8 +28,10 @@ maxVol: 50 - type: SolutionTransfer - type: Drink - openSounds: packetOpenSounds - useSound: /Audio/Items/eating_1.ogg + openSounds: + collection: packetOpenSounds + useSound: + path: /Audio/Items/eating_1.ogg - type: Spillable - type: entity @@ -56,8 +58,8 @@ !type:DamageTrigger damage: 2 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: desecration + - !type:PlaySoundBehavior + collection:: desecration - !type:SpawnEntitiesBehavior spawn: PuddleFlour: @@ -91,8 +93,8 @@ !type:DamageTrigger damage: 2 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: desecration + - !type:PlaySoundBehavior + collection:: desecration - !type:SpawnEntitiesBehavior spawn: PuddleFlour: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 5d40cb2ea7..9bb1b60596 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -254,8 +254,8 @@ !type:DamageTrigger damage: 1 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: desecration + - !type:PlaySoundBehavior + collection:: desecration - !type:SpawnEntitiesBehavior spawn: PuddleTomato: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index d7a7ab1de6..507493fb6e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -27,8 +27,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpillBehavior { } - !type:SpawnEntitiesBehavior spawn: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index c11de84171..fbe99e7b01 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -33,8 +33,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpillBehavior { } - !type:SpawnEntitiesBehavior spawn: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml index fb0c40b4f8..36106a0d09 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml @@ -4,7 +4,8 @@ abstract: true components: - type: Drink - openSounds: bottleOpenSounds + openSounds: + collection: bottleOpenSounds - type: SolutionContainer maxVol: 100 - type: SolutionTransfer @@ -27,8 +28,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpillBehavior { } - !type:SpawnEntitiesBehavior spawn: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index 0999937871..16ab842b8a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml @@ -4,7 +4,8 @@ abstract: true components: - type: Drink - openSounds: canOpenSounds + openSounds: + collection: canOpenSounds pressurized: true - type: SolutionContainer maxVol: 20 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 3ab1f035c5..a626670610 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -478,9 +478,12 @@ - Single fireRate: 0.5 capacity: 1 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Weapons/Guns/Gunshots/click.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/drawbow2.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/click.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/drawbow2.ogg - type: entity parent: BaseItem @@ -517,9 +520,12 @@ caliber: Cap capacity: 6 autoCycle: true - soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index 40fffbd0a8..b97334b339 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -35,7 +35,8 @@ - type: MeleeWeapon damage: 10 damageType: Blunt - hitSound: /Audio/Weapons/smash.ogg + hitSound: + path: /Audio/Weapons/smash.ogg - type: Appearance visuals: - type: SprayVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 81b3b2c0c5..3ac0747b96 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -110,7 +110,8 @@ damage: 10 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/glass_break1.ogg + sound: + path: /Audio/Effects/glass_break1.ogg - !type:SpawnEntitiesBehavior spawn: FloodlightBroken: @@ -141,7 +142,8 @@ damage: 20 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index 23229182c1..d84ce1cb34 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -37,11 +37,16 @@ brokenIconState: cuff-broken brokenName: broken cables brokenDesc: These cables are broken in several places and don't seem very useful. - startCuffSound: /Audio/Items/Handcuffs/rope_start.ogg - endCuffSound: /Audio/Items/Handcuffs/rope_end.ogg - startUncuffSound: /Audio/Items/Handcuffs/rope_start.ogg - endUncuffSound: /Audio/Items/Handcuffs/rope_breakout.ogg - startBreakoutSound: /Audio/Items/Handcuffs/rope_takeoff.ogg + startCuffSound: + path: /Audio/Items/Handcuffs/rope_start.ogg + endCuffSound: + path: /Audio/Items/Handcuffs/rope_end.ogg + startUncuffSound: + path: /Audio/Items/Handcuffs/rope_start.ogg + endUncuffSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg + startBreakoutSound: + path: /Audio/Items/Handcuffs/rope_takeoff.ogg - type: Construction graph: makeshifthandcuffs node: cuffscable diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml index 605ac31e3b..d0e78cfd95 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml @@ -13,7 +13,8 @@ turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out # Sounds legit nuff - litSound: /Audio/Items/Flare/flare_on.ogg + litSound: + path: /Audio/Items/Flare/flare_on.ogg loopedSound: /Audio/Items/Flare/flare_burn.ogg - type: Sprite sprite: Objects/Misc/torch.rsi diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 8d4066c16c..b888015807 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -16,16 +16,16 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:DoActsBehavior acts: [ "Breakage" ] - trigger: !type:DamageTrigger damage: 10 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: ShardGlass: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml index b325f2d340..2e65461a29 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml @@ -12,7 +12,8 @@ capacity: 125 quickInsert: true areaInsert: true - storageSoundCollection: trashBagRustle + storageSoundCollection: + collection: trashBagRustle - type: entity name: trash bag @@ -29,4 +30,5 @@ capacity: 125 quickInsert: true areaInsert: true - storageSoundCollection: trashBagRustle + storageSoundCollection: + collection: trashBagRustle diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index a6d63ea250..5ef8d09cc8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -28,8 +28,10 @@ - type: BodyBagEntityStorage CanWeldShut: false Capacity: 1 - closeSound: /Audio/Misc/zip.ogg - openSound: /Audio/Misc/zip.ogg + closeSound: + path: /Audio/Misc/zip.ogg + openSound: + path: /Audio/Misc/zip.ogg - type: Appearance visuals: - type: StorageVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index 0bf360a9d2..7d5e861912 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -49,7 +49,8 @@ sprite: Objects/Specific/Medical/Surgery/drill.rsi - type: ItemCooldown - type: MeleeWeapon - hitSound: /Audio/Items/drill_hit.ogg + hitSound: + path: /Audio/Items/drill_hit.ogg # Scalpel @@ -72,7 +73,8 @@ sprite: Objects/Specific/Medical/Surgery/scalpel.rsi - type: ItemCooldown - type: MeleeWeapon - hitSound: /Audio/Weapons/bladeslice.ogg + hitSound: + path: /Audio/Weapons/bladeslice.ogg damage: 12 - type: entity @@ -140,12 +142,15 @@ # tools: # - behavior: VesselCompression # state: hemostat -# useSound: /Audio/Items/jaws_pry.ogg -# changeSound: /Audio/Items/change_jaws.ogg +# useSound: +# path: /Audio/Items/jaws_pry.ogg +# changeSound: +# path: /Audio/Items/change_jaws.ogg # - behavior: Setting # state: setter # useSound: -# changeSound: /Audio/Items/change_jaws.ogg +# changeSound: +# path: /Audio/Items/change_jaws.ogg - type: entity name: hemostat @@ -209,7 +214,8 @@ - type: Item HeldPrefix: improv - type: MeleeWeapon - hitSound: /Audio/Weapons/bladeslice.ogg + hitSound: + path: /Audio/Weapons/bladeslice.ogg damage: 10 - type: entity @@ -227,7 +233,8 @@ - type: Item HeldPrefix: electric - type: MeleeWeapon - hitSound: /Audio/Items/drill_hit.ogg + hitSound: + path: /Audio/Items/drill_hit.ogg damage: 15 - type: entity @@ -245,5 +252,6 @@ - type: Item HeldPrefix: advanced - type: MeleeWeapon - hitSound: /Audio/Items/drill_hit.ogg + hitSound: + path: /Audio/Items/drill_hit.ogg damage: 20 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index ccde62dfbd..4b65806d9d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -41,8 +41,8 @@ !type:DamageTrigger damage: 5 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection:: GlassBreak - !type:SpillBehavior { } - !type:SpawnEntitiesBehavior spawn: diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml index 10703a68e0..cbe6c707b3 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml @@ -15,7 +15,8 @@ - type: Tool qualities: - Cutting - useSound: /Audio/Items/wirecutter.ogg + useSound: + path: /Audio/Items/wirecutter.ogg speed: 0.05 - type: Item sprite: Objects/Tools/Cowtools/haycutters.rsi @@ -55,7 +56,8 @@ - type: Tool qualities: - Anchoring - useSound: /Audio/Items/ratchet.ogg + useSound: + path: /Audio/Items/ratchet.ogg speed: 0.05 - type: entity @@ -74,7 +76,8 @@ - type: Tool qualities: - Prying - useSound: /Audio/Items/crowbar.ogg + useSound: + path: /Audio/Items/crowbar.ogg speed: 0.05 - type: TilePrying diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index cf2d18ee78..984b99cabe 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml @@ -13,7 +13,8 @@ iconStateSpent: flare_spent turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Flare/flare_on.ogg + litSound: + path: /Audio/Items/Flare/flare_on.ogg loopedSound: /Audio/Items/Flare/flare_burn.ogg - type: Sprite sprite: Objects/Misc/flare.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 7f14e7b9aa..36193d19d0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -13,7 +13,8 @@ iconStateSpent: glowstick_unlit turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Handcuffs/rope_breakout.ogg + litSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg - type: Sprite sprite: Objects/Misc/glowstick.rsi layers: @@ -74,7 +75,8 @@ iconStateSpent: glowstick_unlit turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Handcuffs/rope_breakout.ogg + litSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg - type: Sprite sprite: Objects/Misc/glowstick.rsi layers: @@ -109,7 +111,8 @@ iconStateSpent: glowstick_unlit turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Handcuffs/rope_breakout.ogg + litSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg - type: Sprite sprite: Objects/Misc/glowstick.rsi layers: @@ -144,7 +147,8 @@ iconStateSpent: glowstick_unlit turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Handcuffs/rope_breakout.ogg + litSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg - type: Sprite sprite: Objects/Misc/glowstick.rsi layers: @@ -179,7 +183,8 @@ iconStateSpent: glowstick_unlit turnOnBehaviourID: turn_on fadeOutBehaviourID: fade_out - litSound: /Audio/Items/Handcuffs/rope_breakout.ogg + litSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg - type: Sprite sprite: Objects/Misc/glowstick.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 532d847ac8..a9f3d16df9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -25,12 +25,16 @@ tools: - behavior: Prying state: jaws_pry - useSound: /Audio/Items/jaws_pry.ogg - changeSound: /Audio/Items/change_jaws.ogg + useSound: + path: /Audio/Items/jaws_pry.ogg + changeSound: + path: /Audio/Items/change_jaws.ogg - behavior: Cutting state: jaws_cutter - useSound: /Audio/Items/jaws_cut.ogg - changeSound: /Audio/Items/change_jaws.ogg + useSound: + path: /Audio/Items/jaws_cut.ogg + changeSound: + path: /Audio/Items/change_jaws.ogg - type: entity name: syndicate jaws of life diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index b1ed42b7fb..b87e081f3e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -24,7 +24,8 @@ sprite: Objects/Tools/matches.rsi - type: Matchstick duration: 10 - igniteSound: /Audio/Items/match_strike.ogg + igniteSound: + path: /Audio/Items/match_strike.ogg - type: PointLight enabled: false radius: 1.1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index ec91c98612..9f1e302eff 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -10,7 +10,8 @@ - type: ItemCooldown - type: MeleeWeapon damage: 10 - hitSound: "/Audio/Weapons/smash.ogg" + hitSound: + path: "/Audio/Weapons/smash.ogg" - type: entity name: emergency toolbox diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 990ad18342..b2f2ff1f24 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -18,7 +18,8 @@ - type: Tool qualities: - Cutting - useSound: /Audio/Items/wirecutter.ogg + useSound: + path: /Audio/Items/wirecutter.ogg - type: RandomSpriteColor state: cutters colors: @@ -85,7 +86,8 @@ - type: Tool qualities: - Anchoring - useSound: /Audio/Items/ratchet.ogg + useSound: + path: /Audio/Items/ratchet.ogg - type: entity name: crowbar @@ -108,7 +110,8 @@ - type: Tool qualities: - Prying - useSound: /Audio/Items/crowbar.ogg + useSound: + path: /Audio/Items/crowbar.ogg - type: TilePrying - type: entity @@ -132,7 +135,8 @@ - type: Tool qualities: - Prying - useSound: /Audio/Items/crowbar.ogg + useSound: + path: /Audio/Items/crowbar.ogg - type: TilePrying - type: entity @@ -181,12 +185,16 @@ tools: - behavior: Screwing state: drill_screw - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg + useSound: + path: /Audio/Items/drill_use.ogg + changeSound: + path: /Audio/Items/change_drill.ogg - behavior: Anchoring state: drill_bolt - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg + useSound: + path: /Audio/Items/drill_use.ogg + changeSound: + path: /Audio/Items/change_drill.ogg - type: entity name: RCD diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index d8be2765fa..24790b676f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -8,7 +8,8 @@ caliber: Shotgun ammoSpread: 40 projectilesFired: 6 - soundCollectionEject: ShellEject + soundCollectionEject: + collection: ShellEject - type: Sprite netsync: false noRot: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e853d05048..75d69d611e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -29,7 +29,8 @@ powerCellPrototype: PowerCellSmallStandard powerCellRemovable: true ammoPrototype: RedLaser - soundGunshot: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: Appearance visuals: - type: MagVisualizer @@ -68,7 +69,8 @@ powerCellPrototype: PowerCellSmallSuper powerCellRemovable: true ammoPrototype: RedHeavyLaser - soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: Appearance visuals: - type: MagVisualizer @@ -109,7 +111,8 @@ powerCellRemovable: true fireCost: 600 ammoPrototype: XrayLaser - soundGunshot: /Audio/Weapons/Guns/Gunshots/laser3.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: Appearance visuals: - type: MagVisualizer @@ -152,7 +155,8 @@ powerCellPrototype: PowerCellSmallStandard powerCellRemovable: false ammoPrototype: BulletTaser - soundGunshot: /Audio/Weapons/Guns/Gunshots/taser.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser.ogg - type: Appearance visuals: - type: MagVisualizer @@ -191,7 +195,8 @@ powerCellPrototype: PowerCellMediumStandard powerCellRemovable: true ammoPrototype: RedLaser - soundGunshot: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: Appearance visuals: - type: MagVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index 2cbb0b05eb..52c1b400c6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml @@ -35,7 +35,8 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: /Audio/Effects/countdown.ogg + countdown_sound: + path: /Audio/Effects/countdown.ogg - type: entity name: flashbang @@ -74,7 +75,8 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: /Audio/Effects/countdown.ogg + countdown_sound: + path: /Audio/Effects/countdown.ogg - type: entity name: Syndicate minibomb @@ -109,7 +111,8 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: /Audio/Effects/countdown.ogg + countdown_sound: + path: /Audio/Effects/countdown.ogg - type: entity name: the nuclear option @@ -143,4 +146,5 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: /Audio/Effects/countdown.ogg + countdown_sound: + path: /Audio/Effects/countdown.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index bb216bbad4..38386baca6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -24,14 +24,22 @@ angleIncrease: 10 angleDecay: 60 magNeedsOpenBolt: true - soundGunshot: /Audio/Weapons/Guns/Gunshots/lmg.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/lmg_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundAutoEject: /Audio/Weapons/Guns/EmptyAlarm/lmg_empty_alarm.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/lmg.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/lmg_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundAutoEject: + path: /Audio/Weapons/Guns/EmptyAlarm/lmg_empty_alarm.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg - type: entity name: L6 SAW diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 2a8652cfaf..7edcff9e9d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -35,9 +35,12 @@ fillPrototype: GrenadeFrag fireRate: 1 capacity: 3 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -67,9 +70,12 @@ fillPrototype: RocketAmmo fireRate: 0.5 capacity: 1 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - type: MagVisualizer @@ -99,6 +105,9 @@ fillPrototype: FoodPieBananaCream fireRate: 5 capacity: 5 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Effects/bang.ogg - soundInsert: /Audio/Items/bikehorn.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Effects/bang.ogg + soundInsert: + path: /Audio/Items/bikehorn.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 401ce2a41d..aa6d2bac1c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -31,13 +31,20 @@ angleIncrease: 10 angleDecay: 60 magFillPrototype: MagazinePistol - soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/pistol_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -160,13 +167,20 @@ angleIncrease: 10 angleDecay: 60 magFillPrototype: MagazinePistol - soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/pistol_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -201,11 +215,16 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/hpistol.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/hpistol_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/hpistol_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg - type: Appearance visuals: - type: MagVisualizer @@ -245,7 +264,8 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/silenced.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/silenced.ogg - type: entity name: mk 58 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 6a1d9694b8..8e39dd3c38 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -25,7 +25,8 @@ linearDamping: 0 angularDamping: 0 - type: Projectile - soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg + soundHit: + path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg damages: Piercing: 20 @@ -36,7 +37,8 @@ abstract: true components: - type: Projectile - soundHit: /Audio/Weapons/Guns/Hits/snap.ogg + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg damages: Piercing: 10 - type: FlashOnTrigger @@ -74,7 +76,8 @@ abstract: true components: - type: Projectile - soundHit: /Audio/Weapons/Guns/Hits/snap.ogg + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg damages: Blunt: 3 - type: StunOnCollide @@ -139,7 +142,8 @@ mask: - Opaque - type: Projectile - soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg + soundHit: + path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg damages: Heat: 20 - type: Tag @@ -184,7 +188,8 @@ state: grenade - type: Projectile deleteOnCollide: false - soundHit: /Audio/Effects/gen_hit.ogg + soundHit: + path: /Audio/Effects/gen_hit.ogg - type: StunOnCollide stunAmount: 8 knockdownAmount: 8 @@ -222,7 +227,8 @@ state: grenade - type: Projectile deleteOnCollide: false - soundHit: /Audio/Effects/flash_bang.ogg + soundHit: + path: /Audio/Effects/flash_bang.ogg - type: FlashOnTrigger range: 7 - type: SoundOnTrigger @@ -265,7 +271,8 @@ state: foamdart - type: Projectile deleteOnCollide: true - soundHit: /Audio/Guns/Hits/snap.ogg + soundHit: + path: /Audio/Guns/Hits/snap.ogg damages: Blunt: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 86e9184f21..e8db31c29f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -37,9 +37,12 @@ caliber: Magnum capacity: 5 autoCycle: true - soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -67,10 +70,14 @@ fillPrototype: CartridgeMagnum caliber: Magnum capacity: 7 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg - soundEject: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: entity name: Mateba @@ -91,7 +98,11 @@ fillPrototype: CartridgeMagnum caliber: Magnum capacity: 7 - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg - soundEject: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 161e87fa22..691ab0bf61 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -22,13 +22,20 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 90 - soundGunshot: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - type: entity name: AKMS @@ -58,10 +65,14 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 90 - soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer @@ -97,10 +108,14 @@ maxAngle: 60 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer @@ -139,10 +154,14 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - soundRack: /Audio/Weapons/Guns/Cock/batrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/batrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -180,10 +199,14 @@ maxAngle: 60 angleIncrease: 10 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/m41.ogg - soundRack: /Audio/Weapons/Guns/Cock/m41_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/m41_reload.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/m41.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/m41_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/m41_reload.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer @@ -221,10 +244,14 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -304,10 +331,14 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -345,10 +376,14 @@ maxAngle: 25 angleIncrease: 15 angleDecay: 25 - soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 88a8167472..2aa0e7fc77 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -25,13 +25,20 @@ angleIncrease: 10 angleDecay: 60 magFillPrototype: MagazinePistolSmg - soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/smg_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/smg.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: entity name: Atreides diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index aa7fd8de1e..068ecd6242 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -24,9 +24,12 @@ maxAngle: 60 angleIncrease: 30 angleDecay: 30 - soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - type: entity name: Bojevic @@ -58,13 +61,20 @@ magazineTypes: - Rifle magFillPrototype: MagazineShotgun - soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundRack: /Audio/Weapons/Guns/Cock/smg_cock.ogg - soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - soundMagEject: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: + path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: + path: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + soundMagEject: + path: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -106,11 +116,16 @@ angleIncrease: 30 angleDecay: 30 ammoSpreadRatio: 0.7 - soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - soundBoltOpen: /Audio/Weapons/Guns/Cock/shotgun_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer @@ -228,11 +243,16 @@ maxAngle: 90 angleIncrease: 45 angleDecay: 30 - soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - soundBoltOpen: /Audio/Weapons/Guns/Cock/shotgun_open.ogg - soundBoltClosed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 3b7cb37869..dc784e2b92 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -26,9 +26,12 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 15 - soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg - soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg - soundInsert: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: entity name: Kardashev-Mosin diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index f26e4bd96d..05b7e46d44 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -8,7 +8,8 @@ - Knife - type: ItemCooldown - type: MeleeWeapon - hitSound: /Audio/Weapons/bladeslice.ogg + hitSound: + path: /Audio/Weapons/bladeslice.ogg damage: 12 - type: Sprite netsync: false diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml index 2f33762b74..9db9c1b2ab 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml @@ -39,4 +39,5 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml index 7b88ff7002..96eee35691 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml @@ -42,9 +42,12 @@ - type: Appearance visuals: - type: AirlockVisualizer - open_sound: /Audio/Machines/airlock_open.ogg - close_sound: /Audio/Machines/airlock_close.ogg - deny_sound: /Audio/Machines/airlock_deny.ogg + open_sound: + path: /Audio/Machines/airlock_open.ogg + close_sound: + path: /Audio/Machines/airlock_close.ogg + deny_sound: + path: /Audio/Machines/airlock_deny.ogg - type: WiresVisualizer - type: ApcPowerReceiver - type: Wires diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml index b33fa434c7..8d3fc73512 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml @@ -11,7 +11,10 @@ - type: Appearance visuals: - type: AirlockVisualizer - open_sound: /Audio/Machines/airlock_ext_open.ogg - close_sound: /Audio/Machines/airlock_ext_close.ogg - deny_sound: /Audio/Machines/airlock_deny.ogg + open_sound: + path: /Audio/Machines/airlock_ext_open.ogg + close_sound: + path: /Audio/Machines/airlock_ext_close.ogg + deny_sound: + path: /Audio/Machines/airlock_deny.ogg - type: WiresVisualizer diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index 40fad456b0..e8f8e3e43a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -58,9 +58,12 @@ - type: Appearance visuals: - type: AirlockVisualizer - open_sound: /Audio/Machines/airlock_open.ogg - close_sound: /Audio/Machines/airlock_close.ogg - deny_sound: /Audio/Machines/airlock_deny.ogg + open_sound: + path: /Audio/Machines/airlock_open.ogg + close_sound: + path: /Audio/Machines/airlock_close.ogg + deny_sound: + path: /Audio/Machines/airlock_deny.ogg animation_time: 0.6 - type: WiresVisualizer - type: Wires diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index e9c2fc3f2a..fe92c46e4d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -17,7 +17,8 @@ damage: 1 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: PartRodMetal1: @@ -48,7 +49,8 @@ damage: 15 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -77,7 +79,8 @@ damage: 1 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -109,7 +112,8 @@ damage: 15 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -135,7 +139,8 @@ damage: 75 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -164,7 +169,8 @@ damage: 5 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/glass_break2.ogg + sound: + path: /Audio/Effects/glass_break2.ogg - !type:SpawnEntitiesBehavior spawn: ShardGlass: @@ -193,7 +199,8 @@ damage: 20 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/glass_break2.ogg + sound: + path: /Audio/Effects/glass_break2.ogg - !type:SpawnEntitiesBehavior spawn: ShardGlass: @@ -225,7 +232,8 @@ damage: 15 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/woodhit.ogg + sound: + path: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: MaterialWoodPlank: @@ -254,7 +262,8 @@ damage: 15 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/woodhit.ogg + sound: + path: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: MaterialWoodPlank: @@ -286,7 +295,8 @@ damage: 50 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/picaxe2.ogg + sound: + path: /Audio/Effects/picaxe2.ogg - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 4e4cf4e074..d3121f063b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml @@ -27,7 +27,8 @@ damage: 30 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/woodhit.ogg + sound: + path: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: MaterialWoodPlank: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 07a2513d2a..121e4523da 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -34,7 +34,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/plant_rustle.ogg + sound: + path: /Audio/Effects/plant_rustle.ogg - type: entity id: PottedPlantRandom diff --git a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml index 4965150328..219af9a839 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml @@ -34,7 +34,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - type: entity name: chair @@ -193,7 +194,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/woodhit.ogg + sound: + path: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: MaterialWoodPlank: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 77cba8a15c..8c3b3a7836 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -35,8 +35,8 @@ !type:DamageTrigger damage: 100 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:ChangeConstructionNodeBehavior node: monitorBroken - !type:DoActsBehavior @@ -61,7 +61,8 @@ damage: 50 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base.yml b/Resources/Prototypes/Entities/Structures/Machines/base.yml index 9f7d7faad1..a251c4dfed 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml @@ -28,7 +28,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 2ac286ab18..c52e37616e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -21,7 +21,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -60,7 +61,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml index d8cb9c3f48..6579cfb242 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml @@ -40,7 +40,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: @@ -57,7 +58,8 @@ overlay_full: dispover-full overlay_engaged: dispover-handle state_flush: disposal-flush - flush_sound: /Audio/Machines/disposalflush.ogg + flush_sound: + path: /Audio/Machines/disposalflush.ogg flush_time: 2 - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml index 146ba2fa58..356549836d 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml @@ -11,7 +11,8 @@ shader: unshaded - type: Projectile deleteOnCollide: false - soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg + soundHit: + path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg damages: Radiation: 10 - type: Physics diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index ba39a44907..bad4f42819 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -52,7 +52,8 @@ damage: 200 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml index 2be102cc95..b0d71322f7 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml @@ -32,7 +32,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: GasCanisterBrokenBase: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 7144edd6f1..6420621d67 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -23,7 +23,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: StorageCanisterBroken: @@ -55,7 +56,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: AirCanisterBroken: @@ -84,7 +86,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: OxygenCanisterBroken: @@ -114,7 +117,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: NitrogenCanisterBroken: @@ -145,7 +149,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: CarbonDioxideCanisterBroken: @@ -177,7 +182,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: PlasmaCanisterBroken: @@ -210,7 +216,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: TritiumCanisterBroken: @@ -244,7 +251,8 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: WaterVaporCanisterBroken: @@ -269,7 +277,8 @@ damage: 100 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetPlasteel1: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml index a8fe9b1a7e..f5f95c1f70 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml @@ -28,7 +28,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml index b64910f093..25add8d12a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml @@ -16,7 +16,8 @@ map: ["enum.StorageVisualLayers.Welded"] - type: MovedByPressure - type: DamageOnHighSpeedImpact - soundHit: /Audio/Effects/bang.ogg + soundHit: + path: /Audio/Effects/bang.ogg - type: InteractionOutline - type: Physics fixtures: @@ -46,7 +47,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 70e4f09b5d..4f02fb8c52 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -538,7 +538,8 @@ damage: 15 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/woodhit.ogg + sound: + path: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: MaterialWoodPlank1: diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index 92e4e35a4e..4c6a1251f6 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -36,8 +36,10 @@ CanWeldShut: false IsCollidableWhenOpen: true Capacity: 1 - closeSound: /Audio/Items/deconstruct.ogg - openSound: /Audio/Items/deconstruct.ogg + closeSound: + path: /Audio/Items/deconstruct.ogg + openSound: + path: /Audio/Items/deconstruct.ogg trayPrototype: MorgueTray - type: Appearance visuals: @@ -101,8 +103,10 @@ CanWeldShut: false IsCollidableWhenOpen: true Capacity: 1 - closeSound: /Audio/Items/deconstruct.ogg - openSound: /Audio/Items/deconstruct.ogg + closeSound: + path: /Audio/Items/deconstruct.ogg + openSound: + path: /Audio/Items/deconstruct.ogg trayPrototype: CrematoriumTray doSoulBeep: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index c2704fb71d..9d572776f4 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -34,7 +34,8 @@ damage: 30 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml index de20894f6d..ff22cbf7c8 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml @@ -66,7 +66,8 @@ - type: Appearance visuals: - type: PoweredLightVisualizer - blinkingSound: "/Audio/Machines/light_tube_on.ogg" + blinkingSound: + path: "/Audio/Machines/light_tube_on.ogg" - type: entity id: PoweredlightEmpty diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 365ecd9b81..bf73758531 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -431,12 +431,14 @@ damage: 300 behaviors: - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:ChangeConstructionNodeBehavior node: girder - !type:DoActsBehavior acts: ["Destruction"] - destroySound: /Audio/Effects/metalbreak.ogg + destroySound: + path: /Audio/Effects/metalbreak.ogg - type: IconSmooth key: walls base: solid diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 1672f3ac9a..b16e990e6c 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -16,8 +16,8 @@ !type:DamageTrigger damage: 200 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: ShardGlassPlasma: diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index 2b34fc4eee..42ffc0b5f6 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -17,8 +17,8 @@ !type:DamageTrigger damage: 150 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: ShardGlassReinforced: diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 49aff00bc0..944683d950 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -38,8 +38,8 @@ !type:DamageTrigger damage: 15 behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak + - !type:PlaySoundBehavior + collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: ShardGlass: diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index fcb1cfc7e6..9e51b58796 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -25,7 +25,8 @@ key: catwalk base: catwalk_ - type: FootstepModifier - footstepSoundCollection: footstep_catwalk + footstepSoundCollection: + collection: footstep_catwalk - type: Construction graph: Catwalk node: Catwalk diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index c5ac6e35f1..5aa05a11f3 100644 --- a/Resources/Prototypes/Entities/Structures/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -21,7 +21,8 @@ - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg + sound: + path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: SheetSteel1: diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index e719e598fe..e6a4204143 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -90,7 +90,8 @@ removeDelay: 0.5 diluteReagents: false prototypeId: Smoke - sound: /Audio/Effects/smoke.ogg + sound: + path: /Audio/Effects/smoke.ogg - type: reaction id: Foam diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 38e6d2c26e..e29e1b349a 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -6,7 +6,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemDark @@ -18,7 +19,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -29,7 +31,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemFreezer @@ -41,7 +44,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -52,7 +56,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemGCircuit @@ -64,7 +69,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemLino @@ -76,7 +82,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemMono @@ -88,7 +95,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemReinforced @@ -100,7 +108,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -111,7 +120,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemShowroom @@ -123,7 +133,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemSteel @@ -135,7 +146,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemDirty @@ -147,7 +159,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemTechmaint @@ -159,7 +172,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.25 item_drop: FloorTileItemWhite @@ -171,7 +185,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -182,7 +197,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -193,7 +209,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -204,7 +221,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -215,7 +233,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -226,7 +245,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_asteroid + footstep_sounds: + collection: footstep_asteroid friction: 0.30 - type: tile @@ -237,7 +257,8 @@ - space is_subfloor: false can_crowbar: false - footstep_sounds: footstep_snow + footstep_sounds: + collection: footstep_snow friction: 0.30 - type: tile @@ -248,7 +269,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: FloorTileItemGold @@ -260,7 +282,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: SheetGlass1 @@ -272,7 +295,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 item_drop: SheetRGlass1 @@ -284,7 +308,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -295,7 +320,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -306,7 +332,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -317,7 +344,8 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 - type: tile @@ -328,5 +356,6 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: + collection: footstep_floor friction: 0.30 diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index cd9e3c5178..559c56631f 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -5,7 +5,8 @@ base_turfs: - underplating is_subfloor: true - footstep_sounds: footstep_plating + footstep_sounds: + collection: footstep_plating friction: 0.5 - type: tile @@ -15,7 +16,8 @@ base_turfs: - space is_subfloor: true - footstep_sounds: footstep_plating + footstep_sounds: + collection: footstep_plating friction: 0.5 is_space: true @@ -26,5 +28,6 @@ base_turfs: - lattice is_subfloor: true - footstep_sounds: footstep_plating + footstep_sounds: + collection: footstep_plating friction: 0.5 diff --git a/Resources/Prototypes/Tiles/wood.yml b/Resources/Prototypes/Tiles/wood.yml index c6c1149a23..60d835aa40 100644 --- a/Resources/Prototypes/Tiles/wood.yml +++ b/Resources/Prototypes/Tiles/wood.yml @@ -7,6 +7,7 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_wood + footstep_sounds: + collection: footstep_wood friction: 0.30 item_drop: FloorTileItemWood diff --git a/RobustToolbox b/RobustToolbox index 8fea42ff9a..9397cc4a6b 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 8fea42ff9ac05dfef40f9fec0dfd051ba054dbfa +Subproject commit 9397cc4a6b91c04087540319de58d469d9ceb42e