* Wires!

* Use state instead of messages

* cleanup

* Update submodule

* actually fix conflict

* Maybe fix conflicts?

* Localized strings, removed hardcoded sprite path

* cleanup

* More localization and sounds
This commit is contained in:
DamianX
2019-09-01 22:15:34 +02:00
committed by Pieter-Jan Briers
parent 70e3cffa90
commit 264a63b7f6
11 changed files with 524 additions and 4 deletions

View File

@@ -8,6 +8,7 @@ using Content.Client.Interfaces.Chat;
using Content.Client.Interfaces.Parallax;
using Content.Client.Parallax;
using Content.Client.UserInterface;
using Content.Shared.GameObjects.Components;
using Content.Shared.GameObjects.Components.Chemistry;
using Content.Shared.GameObjects.Components.Markers;
using Content.Shared.GameObjects.Components.Research;
@@ -110,6 +111,7 @@ namespace Content.Client
factory.Register<SolutionComponent>();
factory.Register<SharedVendingMachineComponent>();
factory.Register<SharedWiresComponent>();
prototypes.RegisterIgnore("material");