diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 19c65e36ac..59d37c9658 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -63,8 +63,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -107,4 +107,4 @@ - + \ No newline at end of file diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index d966235416..d851fab8dd 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -37,7 +37,7 @@ namespace Content.Client.UserInterface base.Initialize(); var _resMgr = IoCManager.Resolve(); - var handsBoxTexture = _resMgr.GetResource("Textures/UserInterface/handsbox.png"); + var handsBoxTexture = _resMgr.GetResource("/Textures/UserInterface/handsbox.png"); handBox = new StyleBoxTexture() { Texture = handsBoxTexture, diff --git a/Content.Client/app.config b/Content.Client/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Client/app.config +++ b/Content.Client/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Client/packages.config b/Content.Client/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Client/packages.config +++ b/Content.Client/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index b6f61fe713..400a41d82d 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -59,8 +59,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -135,4 +135,4 @@ - + \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 199e08793c..0a78c59c7b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -1,5 +1,6 @@ using SS14.Server.GameObjects; using SS14.Server.GameObjects.EntitySystems; +using SS14.Shared.Audio; using SS14.Shared.GameObjects; using SS14.Shared.GameObjects.EntitySystemMessages; using SS14.Shared.Interfaces.GameObjects; @@ -57,7 +58,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan Color = new Vector4(255, 255, 255, 750), Shaded = false }; - IoCManager.Resolve().GetEntitySystem().CreateParticle(message); + var mgr = IoCManager.Resolve(); + mgr.GetEntitySystem().CreateParticle(message); + mgr.GetEntitySystem().Play("/Audio/laser.ogg", Owner, AudioParams.Default.WithVolume(-5)); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs index 7482a2015f..84e758b31c 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs @@ -1,5 +1,6 @@ using Content.Server.GameObjects.Components.Projectiles; using SS14.Server.GameObjects; +using SS14.Server.GameObjects.EntitySystems; using SS14.Server.Interfaces.GameObjects; using SS14.Shared.Interfaces.GameObjects; using SS14.Shared.IoC; @@ -23,7 +24,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile var theta = angle.Theta; - //Spawn the projectileprototype IEntity projectile = IoCManager.Resolve().ForceSpawnEntityAt(_ProjectilePrototype, userposition); @@ -35,6 +35,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile //Rotate the bullets sprite to the correct direction, from north facing I guess projectile.GetComponent().LocalRotation = angle.Theta; + + // Sound! + IoCManager.Resolve().GetEntitySystem().Play("/Audio/gunshot_c20.ogg"); } } } diff --git a/Content.Server/app.config b/Content.Server/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Server/app.config +++ b/Content.Server/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Server/packages.config b/Content.Server/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Server/packages.config +++ b/Content.Server/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index c538cc8029..24981255e4 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -58,8 +58,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -97,4 +97,4 @@ - + \ No newline at end of file diff --git a/Content.Shared/app.config b/Content.Shared/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Shared/app.config +++ b/Content.Shared/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Shared/packages.config b/Content.Shared/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Shared/packages.config +++ b/Content.Shared/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Resources/Audio/gunshot_c20.ogg b/Resources/Audio/gunshot_c20.ogg new file mode 100644 index 0000000000..e3b9b87c8b Binary files /dev/null and b/Resources/Audio/gunshot_c20.ogg differ diff --git a/Resources/Audio/laser.ogg b/Resources/Audio/laser.ogg new file mode 100644 index 0000000000..4e566c1cf5 Binary files /dev/null and b/Resources/Audio/laser.ogg differ diff --git a/engine b/engine index fc890e5824..2ae343ba58 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit fc890e5824e9e33cda5e38eebc2a06e6d9ac94b6 +Subproject commit 2ae343ba587fe2e7af485e6b91b0dc2ba1ef5860