-
Notifications
You must be signed in to change notification settings - Fork 616
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 10-22-fix-hidden-desc
- Loading branch information
Showing
355 changed files
with
141,687 additions
and
175,686 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<BoxContainer xmlns="https://spacestation14.io" | ||
Orientation="Vertical" | ||
Margin="8 0 8 0"> | ||
<BoxContainer Name="Buttons" | ||
Orientation="Vertical" | ||
SeparationOverride="5"> | ||
<!-- Buttons are added here by code --> | ||
</BoxContainer> | ||
</BoxContainer> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
<BoxContainer xmlns="https://spacestation14.io" | ||
Orientation="Horizontal"> | ||
Orientation="Horizontal" | ||
HorizontalAlignment="Stretch"> | ||
<Button Name="RequestButton" | ||
Access="Public" | ||
Text="{Loc 'ghost-roles-window-request-role-button'}" | ||
StyleClasses="OpenRight" | ||
HorizontalAlignment="Left" | ||
SetWidth="300"/> | ||
HorizontalExpand="True" | ||
SizeFlagsStretchRatio="3"/> | ||
<Button Name="FollowButton" | ||
Access="Public" | ||
Text="{Loc 'ghost-roles-window-follow-role-button'}" | ||
StyleClasses="OpenLeft" | ||
HorizontalAlignment="Right" | ||
SetWidth="150"/> | ||
HorizontalExpand="True"/> | ||
</BoxContainer> |
8 changes: 8 additions & 0 deletions
8
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<BoxContainer xmlns="https://spacestation14.io" | ||
Orientation="Vertical"> | ||
<Label Name="Title" | ||
StyleClasses="LabelKeyText"/> | ||
<PanelContainer StyleClasses="HighDivider" /> | ||
<RichTextLabel Name="Description" | ||
Margin="0 4"/> | ||
</BoxContainer> |
18 changes: 18 additions & 0 deletions
18
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.UserInterface.Controls; | ||
using Robust.Client.UserInterface.XAML; | ||
|
||
namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles | ||
{ | ||
[GenerateTypedNameReferences] | ||
public sealed partial class GhostRoleInfoBox : BoxContainer | ||
{ | ||
public GhostRoleInfoBox(string name, string description) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
Title.Text = name; | ||
Description.SetMessage(description); | ||
} | ||
} | ||
} |
16 changes: 0 additions & 16 deletions
16
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.