]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Destruction & impact sound rework pass 1 (#24282)
authorKara <lunarautomaton6@gmail.com>
Fri, 19 Jan 2024 15:33:07 +0000 (08:33 -0700)
committerGitHub <noreply@github.com>
Fri, 19 Jan 2024 15:33:07 +0000 (10:33 -0500)
commit818b07ecf82bdd72dc5524f6bc093067b2ef6472
tree1628af57730b0ec25e4f128292132202da256064
parentbdb1399ada20dfe7638ce7af1727192e6d9de17f
Destruction & impact sound rework pass 1 (#24282)

* 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
157 files changed:
Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
Content.Server/Ame/Components/AmeControllerComponent.cs
Content.Server/ImmovableRod/ImmovableRodComponent.cs
Content.Shared/Doors/Components/DoorComponent.cs
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs
Resources/Audio/Effects/attributions.yml
Resources/Audio/Effects/bang.ogg [deleted file]
Resources/Audio/Effects/glass_break1.ogg
Resources/Audio/Effects/glass_break2.ogg
Resources/Audio/Effects/glass_break3.ogg
Resources/Audio/Effects/glass_break4.ogg [new file with mode: 0644]
Resources/Audio/Effects/glass_crack1.ogg [new file with mode: 0644]
Resources/Audio/Effects/glass_crack2.ogg [new file with mode: 0644]
Resources/Audio/Effects/glass_crack3.ogg [new file with mode: 0644]
Resources/Audio/Effects/glass_crack4.ogg [new file with mode: 0644]
Resources/Audio/Effects/glass_hit.ogg [deleted file]
Resources/Audio/Effects/glass_smack.ogg [moved from Resources/Audio/Effects/wall_bonk.ogg with 60% similarity]
Resources/Audio/Effects/glass_smash.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_break1.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_break2.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_break3.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_break4.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_break5.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_glass_break1.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_glass_break2.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_scrape1.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_scrape2.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_scrape3.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_slam1.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_slam2.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_slam3.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_slam4.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_slam5.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_thud1.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_thud2.ogg [new file with mode: 0644]
Resources/Audio/Effects/metal_thud3.ogg [new file with mode: 0644]
Resources/Audio/Effects/metalbreak.ogg [deleted file]
Resources/Audio/Effects/weak_hit1.ogg [new file with mode: 0644]
Resources/Audio/Effects/weak_hit2.ogg [moved from Resources/Audio/Weapons/tap.ogg with 100% similarity]
Resources/Audio/Effects/window_shatter1.ogg [new file with mode: 0644]
Resources/Audio/Effects/window_shatter2.ogg [new file with mode: 0644]
Resources/Audio/Effects/window_shatter3.ogg [new file with mode: 0644]
Resources/Audio/Effects/wood_destroy1.ogg [new file with mode: 0644]
Resources/Audio/Effects/wood_destroy2.ogg [new file with mode: 0644]
Resources/Audio/Effects/wood_destroy3.ogg [new file with mode: 0644]
Resources/Audio/Effects/wood_destroy_heavy1.ogg [new file with mode: 0644]
Resources/Audio/Effects/woodhit.ogg [deleted file]
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Entities/Objects/Power/lights.yml
Resources/Prototypes/Entities/Objects/Shields/shields.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Resources/Prototypes/Entities/Objects/base_item.yml
Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
Resources/Prototypes/Entities/Structures/Furniture/altar.yml
Resources/Prototypes/Entities/Structures/Furniture/beds.yml
Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
Resources/Prototypes/Entities/Structures/Furniture/sink.yml
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
Resources/Prototypes/Entities/Structures/Machines/frame.yml
Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
Resources/Prototypes/Entities/Structures/Machines/research.yml
Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
Resources/Prototypes/Entities/Structures/Power/apc.yml
Resources/Prototypes/Entities/Structures/Power/chargers.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
Resources/Prototypes/Entities/Structures/Storage/storage.yml
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
Resources/Prototypes/Entities/Structures/Walls/girders.yml
Resources/Prototypes/Entities/Structures/Walls/railing.yml
Resources/Prototypes/Entities/Structures/Walls/walls.yml
Resources/Prototypes/Entities/Structures/Windows/mining.yml
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
Resources/Prototypes/Entities/Structures/Windows/uranium.yml
Resources/Prototypes/Entities/Structures/Windows/window.yml
Resources/Prototypes/Entities/Structures/hydro_tray.yml
Resources/Prototypes/Entities/Structures/meat_spike.yml
Resources/Prototypes/SoundCollections/destruction.yml [new file with mode: 0644]
Resources/Prototypes/SoundCollections/glassbreak.yml [deleted file]
Resources/Prototypes/SoundCollections/gun_impacts.yml [moved from Resources/Prototypes/SoundCollections/impacts.yml with 100% similarity]
Resources/Prototypes/SoundCollections/hit_impacts.yml [new file with mode: 0644]
Resources/Prototypes/SoundCollections/traits.yml