From 73712b4e39392ab94cb1b28710049090ba3565a8 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Mon, 17 Sep 2018 12:36:09 +0200
Subject: [PATCH] Update submodule.

Guns work again.
---
 .../Ranged/Hitscan/HitscanWeaponComponent.cs  |  34 +-
 .../Ranged/Projectile/ProjectileWeapon.cs     |   1 +
 Resources/Groups/groups.yml                   |   2 +
 Resources/Maps/stationstation.yml             | 358 +++++++++---------
 Resources/Prototypes/Entities/Projectiles.yml |   2 +-
 engine                                        |   2 +-
 6 files changed, 201 insertions(+), 198 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
index 91ffb661fe..ddbb8f4a2d 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
+++ b/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 angle = new Angle(clicklocation.Position - userposition);
+            var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously
+            var angle = new Angle(clicklocation.Position - userPosition);
 
-            var ray = new Ray(userposition, angle.ToVec());
-            var raycastresults = IoCManager.Resolve<ICollisionManager>().IntersectRay(ray, 20, Owner.GetComponent<ITransformComponent>().GetMapTransform().Owner);
+            var ray = new Ray(userPosition, angle.ToVec());
+            var rayCastResults = IoCManager.Resolve<ICollisionManager>().IntersectRay(ray, MaxLength,
+                Owner.Transform.GetMapTransform().Owner);
 
-            Hit(raycastresults);
-            AfterEffects(user, raycastresults, angle);
+            Hit(rayCastResults);
+            AfterEffects(user, rayCastResults, angle);
         }
 
         protected virtual void Hit(RayCastResults ray)
@@ -44,17 +44,17 @@ 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;
-
-            EffectSystemMessage message = new EffectSystemMessage
+            var dist = ray.DidHitObject ? ray.Distance : MaxLength;
+            var offset = angle.ToVec() * dist / 2;
+            var message = new EffectSystemMessage
             {
-                EffectSprite = spritename,
+                EffectSprite = SpriteName,
                 Born = time,
                 DeathTime = time + TimeSpan.FromSeconds(1),
-                Size = new Vector2(ray.Distance, 1f),
-                Coordinates = user.GetComponent<ITransformComponent>().LocalPosition.Translated(offset),
+                Size = new Vector2(dist, 1f),
+                Coordinates = user.Transform.LocalPosition.Translated(offset),
                 //Rotated from east facing
-                Rotation = (float)angle.Theta,
+                Rotation = (float) angle.Theta,
                 ColorDelta = new Vector4(0, 0, 0, -1500f),
                 Color = new Vector4(255, 255, 255, 750),
                 Shaded = false
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs
index f2a7b1ba07..9d0e9a5439 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs
+++ b/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;
 
diff --git a/Resources/Groups/groups.yml b/Resources/Groups/groups.yml
index 197fd56acc..105a543872 100644
--- a/Resources/Groups/groups.yml
+++ b/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
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 5636dcd2e9..1b5b84284b 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -26,733 +26,733 @@ entities:
   components:
   - grid: 0
     pos: 4.5,-3.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-0.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-4
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-3
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-2
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-1
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,0
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,1
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-9
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-9
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,1
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,0
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-1
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-2
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-3
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-4
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: DoorContent
   components:
   - grid: 0
     pos: -5.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -4,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -4,-5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -4,-4
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -3,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -2,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -1,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 0,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,0.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: -2.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: DoorContent
   components:
   - grid: 0
     pos: 4.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 1,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 2,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 3,-6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 3,-5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 3,-4
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: -0.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: 1.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: LaserItem
   components:
   - grid: 0
     pos: -3.015625,-3.890625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: LaserItem
   components:
   - grid: 0
     pos: -2.015625,-3.859375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: GUNITEM
   components:
   - grid: 0
     pos: -2.890625,-4.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: GUNITEM
   components:
   - grid: 0
     pos: -1.984375,-4.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: medkit_r
   components:
   - grid: 0
     pos: -0.859375,-3.921875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: medkit_r
   components:
   - grid: 0
     pos: -0.921875,-4.640625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: MopItem
   components:
   - grid: 0
     pos: 0.015625,-3.921875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: FlashlightLantern
   components:
   - grid: 0
     pos: 0.046875,-4.609375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: IDCardStandard
   components:
   - grid: 0
     pos: 0.890625,-3.921875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: RadioHeadsetEars
   components:
   - grid: 0
     pos: 0.984375,-4.640625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BackpackClothing
   components:
   - grid: 0
     pos: 1.890625,-3.796875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: JanitorUniform
   components:
   - grid: 0
     pos: 2.109375,-4.546875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: ShoesItem
   components:
   - grid: 0
     pos: 1.546875,-4.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: 1.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-5.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-2.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-6.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: WirelessMachine
   components:
   - grid: 0
     pos: 3,-3
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -6,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -5,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -4,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -3,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -2,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -1,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 0,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 1,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 2,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 3,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 4,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 5,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,8
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: -2.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: table
   components:
   - grid: 0
     pos: -0.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-8.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: YellowGloves
   components:
   - grid: 0
     pos: -3.015625,-6.796875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: MesonGlasses
   components:
   - grid: 0
     pos: -3.046875,-7.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: UtilityBeltClothing
   components:
   - grid: 0
     pos: -2.109375,-6.765625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: GasMaskClothing
   components:
   - grid: 0
     pos: -2.234375,-7.390625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BlueToolboxItem
   components:
   - grid: 0
     pos: -1.109375,-6.796875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: YellowToolboxItem
   components:
   - grid: 0
     pos: -1.078125,-7.578125
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wirecutter
   components:
   - grid: 0
     pos: -0.234375,-6.640625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Welder
   components:
   - grid: 0
     pos: -0.234375,-7.515625
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Screwdriver
   components:
   - grid: 0
     pos: 0.703125,-6.609375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Crowbar
   components:
   - grid: 0
     pos: 0.578125,-7.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Multitool
   components:
   - grid: 0
     pos: 1.515625,-6.921875
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wrench
   components:
   - grid: 0
     pos: 1.421875,-7.484375
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-10
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-11
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-12
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-13
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-10
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-11
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-12
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-13
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -7,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -6,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -5,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -4,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -3,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -2,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: -1,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 0,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 1,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 2,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 3,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 4,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 5,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: wall
   components:
   - grid: 0
     pos: 6,-14
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: SMES
   components:
   - grid: 0
     pos: -2.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: SMES
   components:
   - grid: 0
     pos: 1.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
   - charge: 438.3279
     type: PowerStorage
@@ -760,199 +760,199 @@ entities:
   components:
   - grid: 0
     pos: -2.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BlueWire
   components:
   - grid: 0
     pos: -1.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BlueWire
   components:
   - grid: 0
     pos: -0.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BlueWire
   components:
   - grid: 0
     pos: 0.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: BlueWire
   components:
   - grid: 0
     pos: 1.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Generator
   components:
   - grid: 0
     pos: -0.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -3.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -4.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-11.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-10.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-9.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-8.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-6.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-5.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-3.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-2.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,-0.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,0.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 2.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 3.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-11.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-10.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,-9.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: -4,-7
-    rot: 1.570796
+    rot: 1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: 3,-7
-    rot: 1.570796
+    rot: 1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: 3,-13
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: -4,-13
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: APC
   components:
   - grid: 0
     pos: -4,-7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
   - load: 50
     type: PowerProvider
@@ -960,7 +960,7 @@ entities:
   components:
   - grid: 0
     pos: 3,-7
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
   - load: 50
     type: PowerProvider
@@ -968,13 +968,13 @@ entities:
   components:
   - grid: 0
     pos: -4.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 3.5,-7.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
@@ -985,13 +985,13 @@ entities:
   components:
   - grid: 0
     pos: 5,-2
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: 2,-4
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
@@ -1022,25 +1022,25 @@ entities:
   components:
   - grid: 0
     pos: -10.5,1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: -10.5,4.5
-    rot: 1.570796
+    rot: 1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: 9.5,4.5
-    rot: 1.570796
+    rot: 1.570796 rad
     type: Transform
 - type: poweredlight
   components:
   - grid: 0
     pos: 9.5,1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: poweredlight
   components:
@@ -1051,61 +1051,61 @@ entities:
   components:
   - grid: 0
     pos: 5,6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,5.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,3.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: -5.5,2.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,5.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,3.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,4.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: APC
   components:
   - grid: 0
     pos: -6,6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
   - load: 150
     type: PowerProvider
@@ -1113,7 +1113,7 @@ entities:
   components:
   - grid: 0
     pos: 5,6
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
   - load: 150
     type: PowerProvider
@@ -1121,24 +1121,24 @@ entities:
   components:
   - grid: 0
     pos: 4.5,1.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: Wire
   components:
   - grid: 0
     pos: 4.5,2.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: WiredMachine
   components:
   - grid: 0
     pos: -5.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 - type: WiredMachine
   components:
   - grid: 0
     pos: 4.5,-12.5
-    rot: -1.570796
+    rot: -1.570796 rad
     type: Transform
 ...
diff --git a/Resources/Prototypes/Entities/Projectiles.yml b/Resources/Prototypes/Entities/Projectiles.yml
index ee83937150..0141ccfa46 100644
--- a/Resources/Prototypes/Entities/Projectiles.yml
+++ b/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
diff --git a/engine b/engine
index 796626b7d8..e1d1a8ea9d 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 796626b7d8de5e5d2fc63f5253b74241ea30b230
+Subproject commit e1d1a8ea9d056bd2432d89b8e15d1ff963485131