tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destruction & impact sound rework pass 1 (#24282)

Browse Source 
* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist
This commit is contained in:
Kara
2024-01-19 08:33:07 -07:00
committed by GitHub
parent bdb1399ada
commit 818b07ecf8
157 changed files with 455 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
View File

@@ -64,7 +64,7 @@ namespace Content.IntegrationTests.Tests.Destructible
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
{SpawnedEntityId}:
@@ -86,7 +86,7 @@ namespace Content.IntegrationTests.Tests.Destructible
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroyHeavy
- !type:SpawnEntitiesBehavior
spawn:
{SpawnedEntityId}:

3
Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
View File

@@ -106,7 +106,6 @@ namespace Content.IntegrationTests.Tests.Destructible
Assert.Multiple(() =>
{
Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
Assert.That(spawnThreshold.Spawn, Is.Not.Null);
Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));
@@ -173,7 +172,6 @@ namespace Content.IntegrationTests.Tests.Destructible
Assert.Multiple(() =>
{
Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
Assert.That(spawnThreshold.Spawn, Is.Not.Null);
Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));
@@ -236,7 +234,6 @@ namespace Content.IntegrationTests.Tests.Destructible
Assert.Multiple(() =>
{
Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
Assert.That(spawnThreshold.Spawn, Is.Not.Null);
Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));

2
Content.Server/Ame/Components/AmeControllerComponent.cs
View File

@@ -59,7 +59,7 @@ public sealed partial class AmeControllerComponent : SharedAmeControllerComponen
/// </summary>
[DataField("injectSound")]
[ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
public SoundSpecifier InjectSound = new SoundCollectionSpecifier("MetalThud");
/// <summary>
/// The last time this could have injected fuel into the AME.

2
Content.Server/ImmovableRod/ImmovableRodComponent.cs
View File

@@ -8,7 +8,7 @@ public sealed partial class ImmovableRodComponent : Component
public int MobCount = 0;
[DataField("hitSound")]
public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
public SoundSpecifier Sound = new SoundCollectionSpecifier("MetalSlam");
[DataField("hitSoundProbability")]
public float HitSoundProbability = 0.1f;

2
Content.Shared/Doors/Components/DoorComponent.cs
View File

@@ -100,7 +100,7 @@ public sealed partial class DoorComponent : Component
/// Sound to play when a disarmed (hands comp with 0 hands) entity opens the door. What?
/// </summary>
[DataField("tryOpenDoorSound")]
public SoundSpecifier TryOpenDoorSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam");
/// <summary>
/// Sound to play when door has been emagged or possibly electrically tampered

2
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
View File

@@ -138,7 +138,7 @@ public sealed partial class MeleeWeaponComponent : Component
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("soundNoDamage"), AutoNetworkedField]
public SoundSpecifier NoDamageSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/tap.ogg");
public SoundSpecifier NoDamageSound { get; set; } = new SoundCollectionSpecifier("WeakHit");
}
/// <summary>

19
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -740,22 +740,27 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
{
var playedSound = false;
if (Deleted(target))
return;
// hitting can obv destroy an entity so we play at coords and not following them
var coords = Transform(target).Coordinates;
// Play sound based off of highest damage type.
if (TryComp<MeleeSoundComponent>(target, out var damageSoundComp))
{
if (type == null && damageSoundComp.NoDamageSound != null)
{
Audio.PlayPredicted(damageSoundComp.NoDamageSound, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
else if (type != null && damageSoundComp.SoundTypes?.TryGetValue(type, out var damageSoundType) == true)
{
Audio.PlayPredicted(damageSoundType, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(damageSoundType, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
else if (type != null && damageSoundComp.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true)
{
Audio.PlayPredicted(damageSoundGroup, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(damageSoundGroup, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
}
@@ -765,12 +770,12 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
{
if (hitSoundOverride != null)
{
Audio.PlayPredicted(hitSoundOverride, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(hitSoundOverride, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
else if (hitSound != null)
{
Audio.PlayPredicted(hitSound, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(hitSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
}
@@ -789,10 +794,10 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
break;
// No damage, fallback to tappies
case null:
Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/tap.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
break;
case "Brute":
Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/smash.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
Audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
break;
}
}

2
Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs
View File

@@ -88,7 +88,7 @@ public sealed partial class ArtifactCrusherComponent : Component
/// Sound played at the end of a successful crush.
/// </summary>
[DataField, AutoNetworkedField]
public SoundSpecifier? CrushingCompleteSound = new SoundPathSpecifier("/Audio/Effects/metal_crunch.ogg");
public SoundSpecifier? CrushingCompleteSound = new SoundCollectionSpecifier("MetalCrunch");
/// <summary>
/// Sound played throughout the entire crushing. Cut off if ended early.

25
Resources/Audio/Effects/attributions.yml
View File

@@ -93,11 +93,6 @@
license: Custom
source: https://gdc.sonniss.com
- files: ["wall_bonk.ogg"]
copyright: '"Nuts and Bolts" by 344 Audio of SONNISS.com. See https://sonniss.com/gdc-bundle-license/ for license.'
license: Custom
source: https://gdc.sonniss.com
- files: ["pop.ogg"]
copyright: '"pop.ogg" by mirrorcult of GitHub.com'
license: "CC0-1.0"
@@ -132,6 +127,26 @@
license: "CC-BY-NC-4.0"
source: "https://freesound.org/people/PNMCarrieRailfan/sounds/682439/"
- files: ["metal_slam5.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break5.ogg", "metal_glass_break1.ogg", "metal_glass_break2.ogg"]
copyright: 'Created by and released in a sound pack by PNMCarrieRailfan on Freesound.org. Cut, edited and exported to mono .ogg by mirrorcult (github)'
license: "CC-BY-NC-4.0"
source: "https://freesound.org/people/PNMCarrieRailfan/packs/38016/"
- files: ["glass_break1.ogg", "glass_break2.ogg", "glass_break3.ogg", "glass_break4.ogg", "glass_smack.ogg", "glass_smash.ogg", "metal_thud1.ogg", "metal_thud2.ogg", "metal_thud3.ogg", "weak_hit.ogg", "wood_destroy1.ogg", "window_shatter1.ogg", "window_shatter2.ogg", "window_shatter3.ogg"]
copyright: "CM-SS13 at 84dc482572649ae7c2264c71ea1fe9fd169e4774"
license: "CC-BY-SA-3.0"
source: "https://github.com/cmss13-devs/cmss13"
- files: ["glass_crack1.ogg", "glass_crack2.ogg", "glass_crack3.ogg", "glass_crack4.ogg", "metal_scrape1.ogg", "metal_scrape2.ogg", "metal_scrape3.ogg"]
copyright: "Baystation 12 at 23c0d851246ebbaeb0df647318ce9874da895d3d"
license: "CC-BY-SA-3.0"
source: "https://github.com/Baystation12/Baystation12"
- files: ["wood_destroy2.ogg", "wood_destroy3.ogg", "wood_destroy_heavy1.ogg", "metal_slam1.ogg", "metal_slam2.ogg", "metal_slam3.ogg"]
copyright: "Based on sounds from OpenSourceWeb at edb003dc8ff5009476a9bcb74e79206039fb3390, edited and reworked by mirrorcult"
license: "CC-BY-SA-3.0"
source: "https://github.com/Open-SourceWeb/OpenSourceWeb"
- files: ["voteding.ogg"]
copyright: '"Bike, Bell Ding, Single, 01-01.wav" byInspectorJ (www.jshaw.co.uk) of Freesound.org; The volume has been reduced.'
license: "CC-BY-4.0"

BIN
Resources/Audio/Effects/bang.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_break1.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_break2.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_break3.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_break4.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_crack1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_crack2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_crack3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_crack4.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_hit.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/wall_bonk.ogg → Resources/Audio/Effects/glass_smack.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/glass_smash.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_break1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_break2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_break3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_break4.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_break5.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_glass_break1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_glass_break2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_scrape1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_scrape2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_scrape3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_slam1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_slam2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_slam3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_slam4.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_slam5.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_thud1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_thud2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metal_thud3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/metalbreak.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Effects/weak_hit1.ogg Normal file
View File

Binary file not shown.

0
Resources/Audio/Weapons/tap.ogg → Resources/Audio/Effects/weak_hit2.ogg
View File

BIN
Resources/Audio/Effects/window_shatter1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/window_shatter2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/window_shatter3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/wood_destroy1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/wood_destroy2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/wood_destroy3.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/wood_destroy_heavy1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Effects/woodhit.ogg
View File

Binary file not shown.

4
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
View File

@@ -14,7 +14,7 @@
types:
Blunt: 5
soundHit:
path: /Audio/Effects/hit_kick.ogg
collection: MetalThud
- type: CombatMode
- type: NoSlip
- type: StaticPrice
@@ -159,7 +159,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:EmptyContainersBehaviour
containers:
- borg_brain

2
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
View File

@@ -26,7 +26,7 @@
types:
Blunt: 5
soundHit:
path: /Audio/Effects/hit_kick.ogg
collection: MetalThud
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:

2
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View File

@@ -13,7 +13,7 @@
types:
Blunt: 5
soundHit:
path: /Audio/Effects/hit_kick.ogg
collection: MetalThud
- type: Clickable
- type: Damageable
damageContainer: Inorganic

2
Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
View File

@@ -62,7 +62,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -8
- !type:SpawnEntitiesBehavior

4
Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
View File

@@ -223,7 +223,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/glass_break1.ogg
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
FloodlightBroken:
@@ -259,7 +259,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:

2
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
View File

@@ -34,7 +34,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -8
- !type:DoActsBehavior

3
Resources/Prototypes/Entities/Objects/Power/lights.yml
View File

@@ -6,8 +6,7 @@
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
collection: GlassSmash
- type: Sprite
sprite: Objects/Power/light_bulb.rsi
layers:

20
Resources/Prototypes/Entities/Objects/Shields/shields.yml
View File

@@ -47,7 +47,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:
@@ -160,7 +161,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -215,7 +217,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:
@@ -273,7 +276,7 @@
max: 1
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
#Magic/Cult Shields (give these to wizard for now)
@@ -346,7 +349,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/glass_break1.ogg
sound:
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetGlass:
@@ -440,7 +444,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
BrokenEnergyShield:
@@ -518,7 +523,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:

4
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View File

@@ -401,7 +401,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: ItemMapper
mapLayers:
cart_plunger:
@@ -544,7 +544,7 @@
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: entity
name: plunger

2
Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
View File

@@ -40,7 +40,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: Appearance
- type: UserInterface
interfaces:

2
Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
View File

@@ -67,7 +67,7 @@
max: 5
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: PointLight

4
Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
View File

@@ -44,7 +44,7 @@
max: 5
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -107,6 +107,6 @@
max: 10
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]

2
Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
View File

@@ -39,7 +39,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:DumpRestockInventory
- !type:DoActsBehavior
acts: [ "Destruction" ]

6
Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
View File

@@ -37,7 +37,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:ExplodeBehavior
- type: entity
@@ -125,7 +125,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:ExplodeBehavior
- !type:SpawnEntitiesBehavior # in future should also emit a cloud of hot gas
spawn:
@@ -402,7 +402,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: entity
parent: VehicleUnicycle

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

@@ -255,7 +255,7 @@
types:
Heat: 5
soundHit:
path: "/Audio/Weapons/tap.ogg"
collection: WeakHit
forceSound: true
- type: entity
@@ -295,7 +295,7 @@
types:
Heat: 1
soundHit:
path: "/Audio/Weapons/tap.ogg"
collection: WeakHit
forceSound: true
- type: entity
@@ -866,7 +866,7 @@
types:
Heat: 2
soundHit:
path: "/Audio/Weapons/tap.ogg"
collection: WeakHit
forceSound: true
- type: entity

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
View File

@@ -23,7 +23,7 @@
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
@@ -86,7 +86,7 @@
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:

3
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
View File

@@ -31,7 +31,8 @@
damage: 15
behaviors:
- !type:PlaySoundBehavior
sound: /Audio/Effects/metalbreak.ogg
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DamageOnLand

4
Resources/Prototypes/Entities/Objects/base_item.yml
View File

@@ -10,7 +10,7 @@
- type: MovedByPressure
- type: EmitSoundOnCollide
sound:
path: /Audio/Effects/wall_bonk.ogg
collection: WeakHit
- type: EmitSoundOnLand
sound:
path: /Audio/Effects/drop.ogg
@@ -21,7 +21,7 @@
types:
Blunt: 5
soundHit:
path: /Audio/Effects/hit_kick.ogg
collection: MetalThud
- type: CollisionWake
- type: TileFrictionModifier
modifier: 0.5

2
Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
View File

@@ -23,7 +23,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
PartRodMetal1:

2
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
View File

@@ -53,7 +53,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- type: ReagentDispenser
storageWhitelist:
tags:

3
Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
View File

@@ -22,6 +22,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

3
Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View File

@@ -140,8 +140,7 @@
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
collection: GlassSmack
- type: Door
occludes: false
- type: Occluder

4
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
View File

@@ -118,6 +118,10 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
# TODO this should go to the broken node first
- !type:PlaySoundBehavior
sound:
collection: MetalSlam
- type: Construction
graph: Airlock
node: airlock

2
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
View File

@@ -233,7 +233,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:

3
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
View File

@@ -8,8 +8,7 @@
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
collection: GlassSmash
- type: InteractionOutline
- type: Physics
- type: Fixtures

36
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
View File

@@ -41,7 +41,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior
@@ -98,7 +98,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank1:
@@ -141,7 +141,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior
@@ -182,7 +182,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior
@@ -220,7 +220,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior
@@ -267,13 +267,16 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- trigger:
!type:DamageTrigger
damage: 5
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/glass_break2.ogg
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
ShardGlass:
@@ -316,13 +319,16 @@
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- trigger:
!type:DamageTrigger
damage: 20
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/glass_break2.ogg
collection: GlassBreak
- !type:ChangeConstructionNodeBehavior
node: TableFrame
- !type:SpawnEntitiesBehavior
@@ -368,13 +374,16 @@
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/glass_break2.ogg
collection: GlassBreak
- !type:ChangeConstructionNodeBehavior
node: TableFrame
- !type:SpawnEntitiesBehavior
@@ -414,13 +423,16 @@
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- trigger:
!type:DamageTrigger
damage: 15
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -458,7 +470,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -589,7 +601,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank1:
@@ -632,7 +644,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior

6
Resources/Prototypes/Entities/Structures/Furniture/altar.yml
View File

@@ -53,7 +53,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
@@ -187,7 +187,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroyHeavy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -382,7 +382,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:

4
Resources/Prototypes/Entities/Structures/Furniture/beds.yml
View File

@@ -105,7 +105,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -144,7 +144,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:

2
Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
View File

@@ -26,7 +26,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroyHeavy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:

6
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
View File

@@ -45,7 +45,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: StaticPrice
price: 10
@@ -191,7 +191,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
@@ -289,7 +289,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:

3
Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
View File

@@ -22,7 +22,8 @@
visible: false
- type: MovedByPressure
- type: DamageOnHighSpeedImpact
soundHit: /Audio/Effects/bang.ogg
soundHit:
collection: MetalThud
- type: InteractionOutline
- type: Physics
- type: Fixtures

2
Resources/Prototypes/Entities/Structures/Furniture/sink.yml
View File

@@ -58,7 +58,7 @@
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: AmbientSound
enabled: false
volume: -8

9
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
View File

@@ -13,8 +13,7 @@
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
collection: GlassSmash
- type: Transform
anchored: true
- type: Clickable
@@ -49,6 +48,9 @@
behaviors: #excess damage, don't spawn entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- trigger:
!type:DamageTrigger
damage: 50
@@ -61,6 +63,9 @@
max: 2
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
placement:
mode: SnapgridCenter
snap:

2
Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
View File

@@ -41,7 +41,7 @@
- !type:EmptyAllContainersBehaviour
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- type: entity
parent: BaseLightStructure

3
Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
View File

@@ -8,8 +8,7 @@
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
collection: GlassSmash
- type: Construction
graph: Computer
node: computer

2
Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
View File

@@ -90,7 +90,7 @@
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior

3
Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
View File

@@ -63,6 +63,9 @@
damage: 100
behaviors:
- !type:EmptyAllContainersBehaviour
- !type:PlaySoundBehavior
sound:
collection: WindowShatter
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
View File

@@ -85,7 +85,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:ExplodeBehavior
- type: GuideHelp
guides:

2
Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
View File

@@ -40,7 +40,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: entity
abstract: true

3
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
View File

@@ -38,6 +38,9 @@
!type:DamageTrigger
damage: 50
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

3
Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
View File

@@ -39,6 +39,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
View File

@@ -50,7 +50,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:

3
Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
View File

@@ -88,6 +88,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

6
Resources/Prototypes/Entities/Structures/Machines/frame.yml
View File

@@ -45,6 +45,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: start
- !type:DoActsBehavior
@@ -97,6 +100,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: missingWires
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
View File

@@ -113,7 +113,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalGlassBreak
- !type:SpawnEntitiesBehavior
spawn:
MachineFrameDestroyed:

3
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -25,6 +25,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

3
Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
View File

@@ -51,6 +51,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

3
Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
View File

@@ -59,6 +59,9 @@
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior

4
Resources/Prototypes/Entities/Structures/Machines/research.yml
View File

@@ -45,7 +45,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
@@ -112,7 +112,7 @@
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:

4
Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
View File

@@ -82,7 +82,7 @@
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
collection: MetalBreak
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
@@ -91,4 +91,4 @@
types:
Blunt: 5
soundHit:
path: /Audio/Effects/bang.ogg
collection: MetalThud

Some files were not shown because too many files have changed in this diff Show More