diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 7125f10992..58610b1d1d 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -4580,3 +4580,24 @@ id: 311 time: '2024-06-19T02:47:36.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/364 +- author: ThereDrD + changes: + - message: "\u0425\u043E\u0442\u0444\u0438\u043A\u0441 \u0437\u0432\u0443\u043A\u043E\ + \u0432" + type: Fix + id: 312 + time: '2024-06-19T10:08:29.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/366 +- author: ThereDrD + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0437\u0432\u0443\ + \u043A\u0438 \u043E\u0440\u0443\u0436\u0438\u044F \u0434\u043B\u044F \u043F\u0443\ + \u043B\u0435\u043C\u0435\u0442\u043E\u0432" + type: Add + - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u044B \u043D\u0435\u043F\ + \u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0435 \u0437\u0432\u0443\u043A\ + \u0438 \u0443 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u043E\u0432" + type: Fix + id: 313 + time: '2024-06-19T15:59:59.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/367 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 49b2eeaada..67e738d1b5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -60,6 +60,15 @@ price: 500 - type: UseDelay delay: 1 + - type: EmitSoundOnPickup + sound: + collection: RiflesPickUp + - type: EmitSoundOnDrop + sound: + collection: RiflesDrop + - type: EmitSoundOnLand + sound: + collection: RiflesDrop - 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 32957cb12c..80475c2b4a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -27,7 +27,7 @@ collection: RiflesDrop - type: EmitSoundOnLand sound: - collection: RiflesPickUp + collection: RiflesDrop - type: entity name: china lake diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index fbd87ca72f..080b8212db 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -58,7 +58,7 @@ collection: RiflesDrop - type: EmitSoundOnLand sound: - collection: RiflesPickUp + collection: RiflesDrop - type: entity name: AKMS diff --git a/Resources/Prototypes/_White/Sound/collections.yml b/Resources/Prototypes/_White/Sound/collections.yml index 7811fd5072..4c913b8c31 100644 --- a/Resources/Prototypes/_White/Sound/collections.yml +++ b/Resources/Prototypes/_White/Sound/collections.yml @@ -1,15 +1,15 @@ - type: soundCollection id: RiflesPickUp files: - - /Audio/White/Items/Weapon/Rifle/pickup1.ogg - - /Audio/White/Items/Weapon/Rifle/pickup2.ogg - - /Audio/White/Items/Weapon/Rifle/pickup3.ogg + - /Audio/White/Items/Weapon/rifle/pickup1.ogg + - /Audio/White/Items/Weapon/rifle/pickup2.ogg + - /Audio/White/Items/Weapon/rifle/pickup3.ogg - type: soundCollection id: RiflesDrop files: - - /Audio/White/Items/Weapon/Rifle/drop1.ogg - - /Audio/White/Items/Weapon/Rifle/drop2.ogg + - /Audio/White/Items/Weapon/rifle/drop1.ogg + - /Audio/White/Items/Weapon/rifle/drop2.ogg - type: soundCollection id: PistolsPickUp