Merge remote-tracking branch 'upstream/master'

Content.Server/_White/Wizard/Magic/Other/InstantRecallComponent.cs

@@ -1,7 +1,23 @@
-namespace Content.Server._White.Wizard.Magic.Other;
+using Robust.Shared.Audio;
+
+namespace Content.Server._White.Wizard.Magic.Other;
 
 [RegisterComponent]
 public sealed partial class InstantRecallComponent : Component
 {
     public EntityUid? Item;
+
+    /// <summary>
+    /// Sound to play on use.
+    /// </summary>
+    [DataField]
+    [ViewVariables]
+    public SoundSpecifier LinkSound;
+
+    /// <summary>
+    /// Sound to play on use.
+    /// </summary>
+    [DataField]
+    [ViewVariables]
+    public SoundSpecifier RecallSound;
 }

Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs

@@ -217,6 +217,7 @@ public sealed class WizardSpellsSystem : EntitySystem
             recallComponent.Item = handsComponent.ActiveHandEntity.Value;
             _popupSystem.PopupEntity($"Сопряжено с {MetaData(handsComponent.ActiveHandEntity.Value).EntityName}",
                 msg.Performer, msg.Performer);
+            _audio.PlayPvs(recallComponent.LinkSound, msg.Performer);
             return;
         }
 
@@ -226,12 +227,13 @@ public sealed class WizardSpellsSystem : EntitySystem
             var coordsItem = Transform(recallComponent.Item.Value).Coordinates;
             var coordsPerformer = Transform(msg.Performer).Coordinates;
 
-            Spawn("EffectEmpPulse", coordsItem);
+            Spawn("EffectMagicDisappearance", coordsItem);
 
             _transformSystem.SetCoordinates(recallComponent.Item.Value, coordsPerformer);
             _transformSystem.AttachToGridOrMap(recallComponent.Item.Value);
 
             _handsSystem.TryForcePickupAnyHand(msg.Performer, recallComponent.Item.Value);
+            _audio.PlayPvs(recallComponent.RecallSound, msg.Performer);
 
             msg.Handled = true;
             Speak(msg);

Resources/Changelog/ChangelogWhite.yml

@@ -4540,3 +4540,43 @@
   id: 310
   time: '2024-06-18T14:55:21.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/363
+- author: ThereDrD
+  changes:
+  - message: "\u041A\u0430\u0436\u0434\u044B\u0439 \u0442\u0438\u043F \u043E\u0440\
+      \u0443\u0436\u0438\u044F \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u0441\u0432\
+      \u043E\u0438 \u0443\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u0437\
+      \u0432\u0443\u043A\u0438 \u043F\u043E\u0434\u043D\u044F\u0442\u0438\u044F \u0438\
+      \ \u0440\u043E\u043D\u044F\u043D\u0438\u044F"
+    type: Add
+  - message: "\u0417\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u0432\u043E\
+      \u0437\u0432\u0440\u0430\u0442\u0430 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\
+      \u043E \u0441\u0432\u043E\u0438 \u0437\u0432\u0443\u043A\u0438"
+    type: Add
+  - message: "\u0421\u0442\u0430\u043A\u0430\u043D\u044B \u0441\u043D\u043E\u0432\u0430\
+      \ \u0438\u0437\u0434\u0430\u044E\u0442 \u0437\u0432\u0443\u043A\u0438 \u043F\
+      \u0440\u0438 \u0432\u0437\u0430\u0438\u043C\u043E\u0434\u0435\u0439\u0441\u0442\
+      \u0432\u0438\u0438"
+    type: Add
+  - message: "\u0427\u0430\u0448\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0442\u043E\u0436\u0435 \u0431\u044C\u044E\u0442\u0441\u044F"
+    type: Add
+  - message: "\u0417\u0432\u0443\u043A\u0438 \u0434\u043B\u044F \u0447\u0430\u0448\
+      \u0435\u043A"
+    type: Add
+  - message: "\u0417\u0432\u0443\u043A\u0438 \u043D\u0430\u0440\u0443\u0447\u043D\u0438\
+      \u043A\u043E\u0432"
+    type: Add
+  - message: "\u041F\u0435\u0434\u0430\u043B\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043C\u043E\u0433\u0443\u0442 \u0441\u043A\u0438\u043F\u0430\u0442\u044C\
+      \ \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\
+      \u0437\u0443\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0443 fuckrules"
+    type: Add
+  - message: "\u0424\u0438\u043A\u0441 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\
+      \u0443\u044E\u0449\u0435\u0433\u043E \u043F\u0435\u0440\u0435\u0432\u043E\u0434\
+      \u0430 \u0442\u0440\u0435\u0431\u0443\u0435\u043C\u044B\u0445 \u0440\u0435\u0441\
+      \u0443\u0440\u0441\u043E\u0432 \u0434\u043B\u044F \u043A\u0440\u0430\u0444\u0442\
+      \u0430 \u0432 \u0430\u0432\u0442\u043E\u043B\u0430\u0442\u0430\u0445"
+    type: Fix
+  id: 311
+  time: '2024-06-19T02:47:36.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/364

Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl

@@ -13,7 +13,11 @@ lathe-menu-material-amount = { $amount ->
     [1] {NATURALFIXED($amount, 2)} {$unit}
     *[other] {NATURALFIXED($amount, 2)} {$unit}
 }
+lathe-menu-material-amount-missing = { $amount ->
+    [1] {NATURALFIXED($amount, 1)} {$unit} {$material}, [color=red]требуется {NATURALFIXED($missingAmount, 1)} {$unit}[/color]
+    *[other] {NATURALFIXED($amount, 1)} {$unit} {$material}, [color=red]требуется {NATURALFIXED($missingAmount, 1)} {$unit}[/color]
+}
 lathe-menu-no-materials-message = Материалы не загружены
 lathe-menu-fabricating-message = Создаем...
 lathe-menu-materials-title = Материалы
-lathe-menu-queue-title = Очередь создания
+lathe-menu-queue-title = Очередь создания

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -76,6 +76,12 @@
     solution: drink
   - type: FitsInDispenser
     solution: drink
+  - type: EmitSoundOnPickup
+    sound:
+      path: /Audio/White/Items/handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound:
+      path: /Audio/White/Items/handling/drinkglass_drop.ogg
 
 # Transformable container - normal glass
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml

@@ -6,6 +6,36 @@
   name: base cup
   abstract: true
   components:
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+        transferForensics: true
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnLand
+    ignoreResistances: true
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -39,6 +69,15 @@
         Blunt: 0
   - type: StaticPrice
     price: 20
+  - type: EmitSoundOnPickup
+    sound:
+      path: /Audio/White/Items/Cup/pickup.ogg
+  - type: EmitSoundOnDrop
+    sound:
+      path: /Audio/White/Items/Cup/drop.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/White/Items/Cup/drop.ogg
 
 - type: entity
   parent: DrinkBaseCup

Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml

@@ -28,6 +28,15 @@
     - Security
   - type: UseDelay
     delay: 6
+  - type: EmitSoundOnPickup
+    sound:
+      path: /Audio/White/Items/Handcuffs/pickup.ogg
+  - type: EmitSoundOnDrop
+    sound:
+      path: /Audio/White/Items/Handcuffs/drop.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/White/Items/Handcuffs/drop.ogg
 
 - type: entity
   name: makeshift handcuffs

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -31,6 +31,15 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: LasersPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: LasersDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: LasersDrop
 
 - type: entity
   id: BaseWeaponPowerCell
@@ -259,6 +268,15 @@
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
     fireCost: 100
+  - type: EmitSoundOnPickup
+    sound:
+      collection: PulsePickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: PulseDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: PulseDrop
 
 - type: entity
   name: pulse carbine
@@ -287,6 +305,15 @@
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
     fireCost: 40
+  - type: EmitSoundOnPickup
+    sound:
+      collection: PulsePickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: PulseDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: PulseDrop
 
 - type: entity
   name: pulse rifle
@@ -311,6 +338,15 @@
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
     fireCost: 2.5
+  - type: EmitSoundOnPickup
+    sound:
+      collection: PulsePickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: PulseDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: PulseDrop
 
 - type: entity
   name: laser cannon

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -19,6 +19,15 @@
     containers:
       ballistic-ammo: !type:Container
         ents: []
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RiflesPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RiflesDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RiflesPickUp
 
 - type: entity
   name: china lake

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -66,6 +66,15 @@
   - type: AmmoCounter
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: PistolsPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: PistolsDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: PistolsDrop
 
 - type: entity
   name: viper
@@ -200,7 +209,7 @@
   name: N1984
   parent: BaseWeaponPistol
   id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -49,6 +49,18 @@
       path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RevolversPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RevolversDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RevolversDrop
+  - type: EmitSoundOnCollide
+    sound:
+      collection: RevolversCollide
 
 - type: entity
   name: Deckard

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -50,6 +50,15 @@
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RiflesPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RiflesDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RiflesPickUp
 
 - type: entity
   name: AKMS

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -54,6 +54,15 @@
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RiflesPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RiflesDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RiflesDrop
 
 - type: entity
   name: Atreides

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -43,6 +43,16 @@
         ents: []
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: ShotgunsPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: ShotgunsDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: ShotgunsDrop
+
 
 - type: entity
   name: Bulldog

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -38,6 +38,15 @@
         ents: []
   - type: StaticPrice
     price: 500
+  - type: EmitSoundOnPickup
+    sound:
+      collection: SnipersPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: SnipersDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: SnipersDrop
 
 - type: entity
   name: Kardashev-Mosin

Resources/Prototypes/Magic/white.yml

@@ -288,6 +288,10 @@
     - type: Magic
       requiresClothes: false
     - type: InstantRecall
+      linkSound:
+        path: /Audio/White/Magic/Recall/link.ogg
+      recallSound:
+        path: /Audio/White/Magic/Recall/recall.ogg
     - type: InstantAction
       useDelay: 10
       itemIconStyle: BigAction

Resources/Prototypes/_White/Sound/collections.yml

@@ -0,0 +1,96 @@
+- 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
+
+- type: soundCollection
+  id: RiflesDrop
+  files:
+  - /Audio/White/Items/Weapon/Rifle/drop1.ogg
+  - /Audio/White/Items/Weapon/Rifle/drop2.ogg
+
+- type: soundCollection
+  id: PistolsPickUp
+  files:
+  - /Audio/White/Items/Weapon/Pistol/pickup1.ogg
+  - /Audio/White/Items/Weapon/Pistol/pickup2.ogg
+  - /Audio/White/Items/Weapon/Pistol/pickup3.ogg
+  - /Audio/White/Items/Weapon/Pistol/pickup4.ogg
+
+- type: soundCollection
+  id: PistolsDrop
+  files:
+  - /Audio/White/Items/Weapon/Pistol/drop1.ogg
+  - /Audio/White/Items/Weapon/Pistol/drop2.ogg
+  - /Audio/White/Items/Weapon/Pistol/drop3.ogg
+
+- type: soundCollection
+  id: LasersPickUp
+  files:
+  - /Audio/White/Items/Weapon/Laser/pickup1.ogg
+  - /Audio/White/Items/Weapon/Laser/pickup2.ogg
+
+- type: soundCollection
+  id: LasersDrop
+  files:
+  - /Audio/White/Items/Weapon/Laser/drop1.ogg
+
+- type: soundCollection
+  id: PulsePickUp
+  files:
+  - /Audio/White/Items/Weapon/Pulse/pickup1.ogg
+
+- type: soundCollection
+  id: PulseDrop
+  files:
+  - /Audio/White/Items/Weapon/Pulse/drop1.ogg
+
+- type: soundCollection
+  id: SnipersPickUp
+  files:
+  - /Audio/White/Items/Weapon/Sniper/pickup1.ogg
+  - /Audio/White/Items/Weapon/Sniper/pickup2.ogg
+
+- type: soundCollection
+  id: SnipersDrop
+  files:
+  - /Audio/White/Items/Weapon/Sniper/drop1.ogg
+  - /Audio/White/Items/Weapon/Sniper/drop2.ogg
+  - /Audio/White/Items/Weapon/Sniper/drop3.ogg
+
+- type: soundCollection
+  id: ShotgunsPickUp
+  files:
+  - /Audio/White/Items/Weapon/Shotgun/pickup1.ogg
+  - /Audio/White/Items/Weapon/Shotgun/pickup2.ogg
+  - /Audio/White/Items/Weapon/Shotgun/pickup3.ogg
+
+- type: soundCollection
+  id: ShotgunsDrop
+  files:
+  - /Audio/White/Items/Weapon/Shotgun/drop1.ogg
+  - /Audio/White/Items/Weapon/Shotgun/drop2.ogg
+
+- type: soundCollection
+  id: RevolversPickUp
+  files:
+  - /Audio/White/Items/Weapon/Revolver/pickup1.ogg
+  - /Audio/White/Items/Weapon/Revolver/pickup2.ogg
+
+- type: soundCollection
+  id: RevolversDrop
+  files:
+  - /Audio/White/Items/Weapon/Revolver/drop1.ogg
+  - /Audio/White/Items/Weapon/Revolver/drop2.ogg
+
+- type: soundCollection
+  id: RevolversCollide
+  files:
+  - /Audio/White/Items/Weapon/Revolver/collide1.ogg
+
+- type: soundCollection
+  id: RevolversPutIn
+  files:
+  - /Audio/White/Items/Weapon/Revolver/putin1.ogg

Resources/Prototypes/_White/Wizard/effects.yml

@@ -0,0 +1,7 @@
+- type: entity
+  id: EffectMagicDisappearance
+  noSpawn: true
+  components:
+  - type: EmitSoundOnSpawn
+    sound:
+      path: /Audio/White/Magic/Recall/disappearance.ogg

Resources/clientCommandPerms.yml

@@ -84,3 +84,7 @@
     - uploadfile
     - loadprototype
     - uploadfolder
+
+- Flags: ADMIN
+  Commands:
+    - fuckrules