Update submodule.

Guns work again.

Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs

@@ -1,7 +1,5 @@
-using SS14.Server.GameObjects;
+using SS14.Server.GameObjects.EntitySystems;
-using SS14.Server.GameObjects.EntitySystems;
 using SS14.Shared.Audio;
-using SS14.Shared.GameObjects;
 using SS14.Shared.GameObjects.EntitySystemMessages;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.GameObjects.Components;
@@ -17,20 +15,22 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
 {
     public class HitscanWeaponComponent : RangedWeaponComponent
     {
+        private const float MaxLength = 20;
         public override string Name => "HitscanWeapon";
 
-        string spritename = "Objects/laser.png";
+        private const string SpriteName = "Objects/laser.png";
 
         protected override void Fire(IEntity user, GridLocalCoordinates clicklocation)
         {
-            var userposition = user.GetComponent<ITransformComponent>().WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously
+            var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously
-            var angle = new Angle(clicklocation.Position - userposition);
+            var angle = new Angle(clicklocation.Position - userPosition);
 
-            var ray = new Ray(userposition, angle.ToVec());
+            var ray = new Ray(userPosition, angle.ToVec());
-            var raycastresults = IoCManager.Resolve<ICollisionManager>().IntersectRay(ray, 20, Owner.GetComponent<ITransformComponent>().GetMapTransform().Owner);
+            var rayCastResults = IoCManager.Resolve<ICollisionManager>().IntersectRay(ray, MaxLength,
+                Owner.Transform.GetMapTransform().Owner);
 
-            Hit(raycastresults);
+            Hit(rayCastResults);
-            AfterEffects(user, raycastresults, angle);
+            AfterEffects(user, rayCastResults, angle);
         }
 
         protected virtual void Hit(RayCastResults ray)
@@ -44,15 +44,15 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
         protected virtual void AfterEffects(IEntity user, RayCastResults ray, Angle angle)
         {
             var time = IoCManager.Resolve<IGameTiming>().CurTime;
-            var offset = angle.ToVec() * ray.Distance / 2;
+            var dist = ray.DidHitObject ? ray.Distance : MaxLength;
-
+            var offset = angle.ToVec() * dist / 2;
-            EffectSystemMessage message = new EffectSystemMessage
+            var message = new EffectSystemMessage
             {
-                EffectSprite = spritename,
+                EffectSprite = SpriteName,
                 Born = time,
                 DeathTime = time + TimeSpan.FromSeconds(1),
-                Size = new Vector2(ray.Distance, 1f),
+                Size = new Vector2(dist, 1f),
-                Coordinates = user.GetComponent<ITransformComponent>().LocalPosition.Translated(offset),
+                Coordinates = user.Transform.LocalPosition.Translated(offset),
                 //Rotated from east facing
                 Rotation = (float) angle.Theta,
                 ColorDelta = new Vector4(0, 0, 0, -1500f),

Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs

@@ -5,6 +5,7 @@ using SS14.Server.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.GameObjects.Components;
 using SS14.Shared.IoC;
+using SS14.Shared.Log;
 using SS14.Shared.Map;
 using SS14.Shared.Maths;
 

Resources/Groups/groups.yml

@@ -21,6 +21,7 @@
   - whisper
   - me
   - ooc
+  - showtime
 
 - Index: 100
   Name: Administrator
@@ -32,4 +33,5 @@
   - whisper
   - me
   - ooc
+  - showtime
   CanViewVar: true

Resources/Prototypes/Entities/Projectiles.yml

@@ -6,7 +6,7 @@
   - type: Sprite
     directional: false
     texture: Objects/projectilebullet.png
-    rotation: 180
+    #rotation: -180
 
   - type: Icon
     texture: Objects/projectilebullet.png