From 2eb30c9ba95208b0a1ea1601879d6005b0101129 Mon Sep 17 00:00:00 2001 From: clusterfack Date: Fri, 2 Feb 2018 19:33:50 -0600 Subject: [PATCH] Update submodule (#28) * Update submodule * Fix disco ball --- .gitmodules | 2 +- Content.Client/Prototypes/DiscoBall.cs | 5 ++--- engine | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index fbe168edb7..cd4c53c00f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "engine"] path = engine url = https://github.com/space-wizards/space-station-14.git - branch = 3ccb252a968e1ded9310bdf9c1805d3364b81adb \ No newline at end of file + branch = 0a231f0217a7b9f9ce7093bdd091ce3e3de1b69d \ No newline at end of file diff --git a/Content.Client/Prototypes/DiscoBall.cs b/Content.Client/Prototypes/DiscoBall.cs index 0916851a87..b184437c3f 100644 --- a/Content.Client/Prototypes/DiscoBall.cs +++ b/Content.Client/Prototypes/DiscoBall.cs @@ -1,7 +1,6 @@ -using OpenTK; -using OpenTK.Graphics; -using SS14.Client.GameObjects; +using SS14.Client.GameObjects; using SS14.Shared.GameObjects; +using SS14.Shared.Maths; namespace Content.Client.Prototypes { diff --git a/engine b/engine index 1487b2cdad..0a231f0217 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 1487b2cdadd9a3094ca30a21beb0f8db069a3f1c +Subproject commit 0a231f0217a7b9f9ce7093bdd091ce3e3de1b69d