diff --git a/Content.Server/_White/Wizard/Magic/Other/InstantRecallComponent.cs b/Content.Server/_White/Wizard/Magic/Other/InstantRecallComponent.cs index e20a7ac19e..18160cc102 100644 --- a/Content.Server/_White/Wizard/Magic/Other/InstantRecallComponent.cs +++ b/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; + + /// + /// Sound to play on use. + /// + [DataField] + [ViewVariables] + public SoundSpecifier LinkSound; + + /// + /// Sound to play on use. + /// + [DataField] + [ViewVariables] + public SoundSpecifier RecallSound; } diff --git a/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs b/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs index a3382739fb..09c658af7a 100644 --- a/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs +++ b/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); diff --git a/Resources/Audio/White/Items/Cup/drop.ogg b/Resources/Audio/White/Items/Cup/drop.ogg new file mode 100644 index 0000000000..4002a19f04 Binary files /dev/null and b/Resources/Audio/White/Items/Cup/drop.ogg differ diff --git a/Resources/Audio/White/Items/Cup/pickup.ogg b/Resources/Audio/White/Items/Cup/pickup.ogg new file mode 100644 index 0000000000..42d3be69a2 Binary files /dev/null and b/Resources/Audio/White/Items/Cup/pickup.ogg differ diff --git a/Resources/Audio/White/Items/Handcuffs/drop.ogg b/Resources/Audio/White/Items/Handcuffs/drop.ogg new file mode 100644 index 0000000000..b94a3a2c8e Binary files /dev/null and b/Resources/Audio/White/Items/Handcuffs/drop.ogg differ diff --git a/Resources/Audio/White/Items/Handcuffs/pickup.ogg b/Resources/Audio/White/Items/Handcuffs/pickup.ogg new file mode 100644 index 0000000000..4dcfadf0d1 Binary files /dev/null and b/Resources/Audio/White/Items/Handcuffs/pickup.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Laser/drop1.ogg b/Resources/Audio/White/Items/Weapon/Laser/drop1.ogg new file mode 100644 index 0000000000..b9f1ea9777 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Laser/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Laser/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Laser/pickup1.ogg new file mode 100644 index 0000000000..6cf95a3d49 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Laser/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Laser/pickup2.ogg b/Resources/Audio/White/Items/Weapon/Laser/pickup2.ogg new file mode 100644 index 0000000000..6d8a8670d9 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Laser/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/drop1.ogg b/Resources/Audio/White/Items/Weapon/Pistol/drop1.ogg new file mode 100644 index 0000000000..29dcca939b Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/drop2.ogg b/Resources/Audio/White/Items/Weapon/Pistol/drop2.ogg new file mode 100644 index 0000000000..5520d2043b Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/drop2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/drop3.ogg b/Resources/Audio/White/Items/Weapon/Pistol/drop3.ogg new file mode 100644 index 0000000000..1b714e1e69 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/drop3.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Pistol/pickup1.ogg new file mode 100644 index 0000000000..8ff8f7a919 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/pickup2.ogg b/Resources/Audio/White/Items/Weapon/Pistol/pickup2.ogg new file mode 100644 index 0000000000..4b9132a445 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/pickup3.ogg b/Resources/Audio/White/Items/Weapon/Pistol/pickup3.ogg new file mode 100644 index 0000000000..e80114447b Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/pickup3.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pistol/pickup4.ogg b/Resources/Audio/White/Items/Weapon/Pistol/pickup4.ogg new file mode 100644 index 0000000000..8adba72a1d Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pistol/pickup4.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pulse/drop1.ogg b/Resources/Audio/White/Items/Weapon/Pulse/drop1.ogg new file mode 100644 index 0000000000..b9f1ea9777 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pulse/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Pulse/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Pulse/pickup1.ogg new file mode 100644 index 0000000000..7b41a98598 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Pulse/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/collide1.ogg b/Resources/Audio/White/Items/Weapon/Revolver/collide1.ogg new file mode 100644 index 0000000000..85560ab4d7 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/collide1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/drop1.ogg b/Resources/Audio/White/Items/Weapon/Revolver/drop1.ogg new file mode 100644 index 0000000000..c261634ab2 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/drop2.ogg b/Resources/Audio/White/Items/Weapon/Revolver/drop2.ogg new file mode 100644 index 0000000000..1cab050240 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/drop2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Revolver/pickup1.ogg new file mode 100644 index 0000000000..3860ed9782 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/pickup2.ogg b/Resources/Audio/White/Items/Weapon/Revolver/pickup2.ogg new file mode 100644 index 0000000000..e9d5c69369 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Revolver/putin1.ogg b/Resources/Audio/White/Items/Weapon/Revolver/putin1.ogg new file mode 100644 index 0000000000..1562ee3af8 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Revolver/putin1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Shotgun/drop1.ogg b/Resources/Audio/White/Items/Weapon/Shotgun/drop1.ogg new file mode 100644 index 0000000000..8c39cc3437 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Shotgun/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Shotgun/drop2.ogg b/Resources/Audio/White/Items/Weapon/Shotgun/drop2.ogg new file mode 100644 index 0000000000..0b1c674c3d Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Shotgun/drop2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Shotgun/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Shotgun/pickup1.ogg new file mode 100644 index 0000000000..d584f3ef34 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Shotgun/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Shotgun/pickup2.ogg b/Resources/Audio/White/Items/Weapon/Shotgun/pickup2.ogg new file mode 100644 index 0000000000..3691efc0b4 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Shotgun/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Shotgun/pickup3.ogg b/Resources/Audio/White/Items/Weapon/Shotgun/pickup3.ogg new file mode 100644 index 0000000000..c002b19cd5 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Shotgun/pickup3.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Sniper/drop1.ogg b/Resources/Audio/White/Items/Weapon/Sniper/drop1.ogg new file mode 100644 index 0000000000..ee8cad0e5f Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Sniper/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Sniper/drop2.ogg b/Resources/Audio/White/Items/Weapon/Sniper/drop2.ogg new file mode 100644 index 0000000000..fd9fcd50f4 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Sniper/drop2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Sniper/drop3.ogg b/Resources/Audio/White/Items/Weapon/Sniper/drop3.ogg new file mode 100644 index 0000000000..8fbd44cdb8 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Sniper/drop3.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Sniper/pickup1.ogg b/Resources/Audio/White/Items/Weapon/Sniper/pickup1.ogg new file mode 100644 index 0000000000..69b6ad8c8f Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Sniper/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/Sniper/pickup2.ogg b/Resources/Audio/White/Items/Weapon/Sniper/pickup2.ogg new file mode 100644 index 0000000000..425c605d3d Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/Sniper/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/rifle/drop1.ogg b/Resources/Audio/White/Items/Weapon/rifle/drop1.ogg new file mode 100644 index 0000000000..8c39cc3437 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/rifle/drop1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/rifle/drop2.ogg b/Resources/Audio/White/Items/Weapon/rifle/drop2.ogg new file mode 100644 index 0000000000..0b1c674c3d Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/rifle/drop2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/rifle/pickup1.ogg b/Resources/Audio/White/Items/Weapon/rifle/pickup1.ogg new file mode 100644 index 0000000000..98e90ceff3 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/rifle/pickup1.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/rifle/pickup2.ogg b/Resources/Audio/White/Items/Weapon/rifle/pickup2.ogg new file mode 100644 index 0000000000..91774c9a00 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/rifle/pickup2.ogg differ diff --git a/Resources/Audio/White/Items/Weapon/rifle/pickup3.ogg b/Resources/Audio/White/Items/Weapon/rifle/pickup3.ogg new file mode 100644 index 0000000000..bc70d40f46 Binary files /dev/null and b/Resources/Audio/White/Items/Weapon/rifle/pickup3.ogg differ diff --git a/Resources/Audio/White/Magic/Recall/disappearance.ogg b/Resources/Audio/White/Magic/Recall/disappearance.ogg new file mode 100644 index 0000000000..c723ce6524 Binary files /dev/null and b/Resources/Audio/White/Magic/Recall/disappearance.ogg differ diff --git a/Resources/Audio/White/Magic/Recall/link.ogg b/Resources/Audio/White/Magic/Recall/link.ogg new file mode 100644 index 0000000000..9a051ac172 Binary files /dev/null and b/Resources/Audio/White/Magic/Recall/link.ogg differ diff --git a/Resources/Audio/White/Magic/Recall/recall.ogg b/Resources/Audio/White/Magic/Recall/recall.ogg new file mode 100644 index 0000000000..3ae42bfdb6 Binary files /dev/null and b/Resources/Audio/White/Magic/Recall/recall.ogg differ diff --git a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl b/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl index ed9994fe78..ebbfc750c6 100644 --- a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl +++ b/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 = Очередь создания \ No newline at end of file +lathe-menu-queue-title = Очередь создания diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index aac2803dd2..f785bd1822 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 50713409bd..6865ae513e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index 09cff8ee0e..08f7ae71e3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 48599c6055..728b99c15d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1315eb6de1..32957cb12c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index a607ccb06c..0e7189519c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index bd043c997d..d30f1d0a3f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 36f36a101a..fbd87ca72f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 790c27f414..ab7968570a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 25949f933a..efe39cfb8d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 6336098609..a25e75420b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/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 diff --git a/Resources/Prototypes/Magic/white.yml b/Resources/Prototypes/Magic/white.yml index a7111a8b68..d3a01429a5 100644 --- a/Resources/Prototypes/Magic/white.yml +++ b/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 diff --git a/Resources/Prototypes/_White/Sound/collections.yml b/Resources/Prototypes/_White/Sound/collections.yml new file mode 100644 index 0000000000..7811fd5072 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_White/Wizard/effects.yml b/Resources/Prototypes/_White/Wizard/effects.yml new file mode 100644 index 0000000000..2488acf9c3 --- /dev/null +++ b/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 diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml index 60ec791577..65f8c32856 100644 --- a/Resources/clientCommandPerms.yml +++ b/Resources/clientCommandPerms.yml @@ -84,3 +84,7 @@ - uploadfile - loadprototype - uploadfolder + +- Flags: ADMIN + Commands: + - fuckrules