Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/space-wizards/space-station-14

Browse Source
This commit is contained in:
ShadowCommander
2019-08-16 15:46:06 -07:00
parent 7f5654bb06 534af65f7c
commit 1c81f6097f
423 changed files with 3133 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.Input;
@@ -66,7 +65,7 @@ namespace Content.Client.GameObjects.EntitySystems
_currentPopup = new Popup();
_currentPopup.UserInterfaceManager.StateRoot.AddChild(_currentPopup);
_currentPopup.OnPopupHide += _closeContextMenu;
var vBox = new VBoxContainer("ButtonBox");
var vBox = new VBoxContainer();
_currentPopup.AddChild(vBox);
vBox.AddChild(new Label {Text = "Waiting on Server..."});
@@ -94,7 +93,7 @@ namespace Content.Client.GameObjects.EntitySystems
_currentPopup = new Popup();
_currentPopup.OnPopupHide += _closeContextMenu;
var vBox = new VBoxContainer("ButtonBox");
var vBox = new VBoxContainer();
_currentPopup.AddChild(vBox);
foreach (var entity in entities)
{