diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index a423d04b11..f4bc675860 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -56,6 +56,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EntryPoint.cs" />
+    <Compile Include="Prototypes\DiscoBall.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -98,4 +99,4 @@
     <ContentAssemblies Include="$(OutputPath)Content.Client.pdb" Condition="'$(Configuration)' == 'Debug'" />
     <ContentAssemblies Include="$(OutputPath)Content.Shared.pdb" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Content.Client/Prototypes/DiscoBall.cs b/Content.Client/Prototypes/DiscoBall.cs
new file mode 100644
index 0000000000..0916851a87
--- /dev/null
+++ b/Content.Client/Prototypes/DiscoBall.cs
@@ -0,0 +1,36 @@
+using OpenTK;
+using OpenTK.Graphics;
+using SS14.Client.GameObjects;
+using SS14.Shared.GameObjects;
+
+namespace Content.Client.Prototypes
+{
+    public class DiscoBall : Entity
+    {
+        private PointLightComponent LightComponent;
+        private float Hue;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            LightComponent = GetComponent<PointLightComponent>();
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+            LightComponent = null;
+        }
+
+        public override void Update(float frameTime)
+        {
+            Hue += frameTime / 10;
+            if (Hue > 1)
+            {
+                Hue -= 1;
+            }
+
+            LightComponent.Color = Color4.FromHsl(new Vector4(Hue, 1, 0.5f, 0.5f));
+        }
+    }
+}
diff --git a/Resources/Prototypes/discoball.yml b/Resources/Prototypes/discoball.yml
new file mode 100644
index 0000000000..541c2061c2
--- /dev/null
+++ b/Resources/Prototypes/discoball.yml
@@ -0,0 +1,14 @@
+- type: entity
+  name: Disco Ball
+  id: discoball
+  class: Content.Client.Prototypes.DiscoBall
+  components:
+  - type: Transform
+  - type: Sprite
+    sprites:
+    - wall_light
+
+  - type: Icon
+    icon: wall_light
+
+  - type: PointLight