Merge remote-tracking branch 'upstream/master'

2024-06-19 12:59:49 +03:00
parent 675e0b0c04 8f027d5333
commit 94cae056d7
59 changed files with 334 additions and 4 deletions
--- a/Resources/Audio/White/Items/Cup/drop.ogg
+++ b/Resources/Audio/White/Items/Cup/drop.ogg
--- a/Resources/Audio/White/Items/Cup/pickup.ogg
+++ b/Resources/Audio/White/Items/Cup/pickup.ogg
--- a/Resources/Audio/White/Items/Handcuffs/drop.ogg
+++ b/Resources/Audio/White/Items/Handcuffs/drop.ogg
--- a/Resources/Audio/White/Items/Handcuffs/pickup.ogg
+++ b/Resources/Audio/White/Items/Handcuffs/pickup.ogg
--- a/Resources/Audio/White/Items/Weapon/Laser/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Laser/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Laser/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Laser/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Laser/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Laser/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/drop2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/drop2.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/drop3.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/drop3.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/pickup3.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/pickup3.ogg
--- a/Resources/Audio/White/Items/Weapon/Pistol/pickup4.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pistol/pickup4.ogg
--- a/Resources/Audio/White/Items/Weapon/Pulse/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pulse/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Pulse/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Pulse/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/collide1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/collide1.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/drop2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/drop2.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/Revolver/putin1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Revolver/putin1.ogg
--- a/Resources/Audio/White/Items/Weapon/Shotgun/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Shotgun/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Shotgun/drop2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Shotgun/drop2.ogg
--- a/Resources/Audio/White/Items/Weapon/Shotgun/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Shotgun/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Shotgun/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Shotgun/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/Shotgun/pickup3.ogg
+++ b/Resources/Audio/White/Items/Weapon/Shotgun/pickup3.ogg
--- a/Resources/Audio/White/Items/Weapon/Sniper/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Sniper/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/Sniper/drop2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Sniper/drop2.ogg
--- a/Resources/Audio/White/Items/Weapon/Sniper/drop3.ogg
+++ b/Resources/Audio/White/Items/Weapon/Sniper/drop3.ogg
--- a/Resources/Audio/White/Items/Weapon/Sniper/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/Sniper/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/Sniper/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/Sniper/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/rifle/drop1.ogg
+++ b/Resources/Audio/White/Items/Weapon/rifle/drop1.ogg
--- a/Resources/Audio/White/Items/Weapon/rifle/drop2.ogg
+++ b/Resources/Audio/White/Items/Weapon/rifle/drop2.ogg
--- a/Resources/Audio/White/Items/Weapon/rifle/pickup1.ogg
+++ b/Resources/Audio/White/Items/Weapon/rifle/pickup1.ogg
--- a/Resources/Audio/White/Items/Weapon/rifle/pickup2.ogg
+++ b/Resources/Audio/White/Items/Weapon/rifle/pickup2.ogg
--- a/Resources/Audio/White/Items/Weapon/rifle/pickup3.ogg
+++ b/Resources/Audio/White/Items/Weapon/rifle/pickup3.ogg
--- a/Resources/Audio/White/Magic/Recall/disappearance.ogg
+++ b/Resources/Audio/White/Magic/Recall/disappearance.ogg
--- a/Resources/Audio/White/Magic/Recall/link.ogg
+++ b/Resources/Audio/White/Magic/Recall/link.ogg
--- a/Resources/Audio/White/Magic/Recall/recall.ogg
+++ b/Resources/Audio/White/Magic/Recall/recall.ogg