-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into Home-Run-Bat
- Loading branch information
Showing
1,778 changed files
with
352,581 additions
and
280,097 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,8 @@ | ||
# Last match in file takes precedence. | ||
|
||
/Content.*/ @DebugOk | ||
/Content.*/SimpleStation14/ @DEATHB4DEFEAT | ||
|
||
/Resources/ @DebugOk | ||
/Resources/ConfigPresets/ @DebugOk | ||
/Resources/*.yml @DebugOk @Colin-Tel | ||
/Resources/*.yml @Colin-Tel | ||
/Resources/*/SimpleStation14/ @DEATHB4DEFEAT | ||
/Resources/Maps/ @IamVelcroboy | ||
/Resources/Prototypes/Maps/ @IamVelcroboy | ||
|
||
/Tools/ @DebugOk | ||
|
||
/* @DebugOk # Standalone files in root, shouldn't apply to subdirectories | ||
/.github/ @DebugOk # Workflows, codeowners, templates, etc |
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,15 @@ | ||
name: CRLF Check | ||
|
||
on: | ||
pull_request: | ||
types: [ opened, reopened, synchronize, ready_for_review ] | ||
|
||
jobs: | ||
build: | ||
name: CRLF Check | ||
if: github.event.pull_request.draft == false | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3.6.0 | ||
- name: Check for CRLF | ||
run: Tools/check_crlf.py |
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,4 +1,4 @@ | ||
name: Close PR's on master | ||
name: Close PRs on master | ||
|
||
on: | ||
pull_request_target: | ||
|
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,13 @@ | ||
name: "Labels: Untriaged" | ||
|
||
on: | ||
issues: | ||
types: [opened] | ||
|
||
jobs: | ||
add_label: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions-ecosystem/action-add-labels@v1 | ||
with: | ||
labels: "Status: Untriaged" |
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
6 changes: 6 additions & 0 deletions
6
Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.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,6 @@ | ||
<Control xmlns="https://spacestation14.io" Margin="0 0 0 8"> | ||
<BoxContainer Orientation="Vertical"> | ||
<RichTextLabel Name="Admin" Margin="0 0 0 4" /> | ||
<RichTextLabel Name="Message" Margin="2 0 0 0" /> | ||
</BoxContainer> | ||
</Control> |
23 changes: 23 additions & 0 deletions
23
Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.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,23 @@ | ||
using Content.Shared.Administration.Notes; | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.UserInterface; | ||
using Robust.Client.UserInterface.XAML; | ||
using Robust.Shared.Utility; | ||
|
||
namespace Content.Client.Administration.UI.AdminRemarks; | ||
|
||
[GenerateTypedNameReferences] | ||
public sealed partial class AdminMessagePopupMessage : Control | ||
{ | ||
public AdminMessagePopupMessage(AdminMessageEuiState.Message message) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString( | ||
"admin-notes-message-admin", | ||
("admin", message.AdminName), | ||
("date", message.AddedOn.ToLocalTime())))); | ||
|
||
Message.SetMessage(message.Text); | ||
} | ||
} |
42 changes: 28 additions & 14 deletions
42
Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.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,22 +1,36 @@ | ||
<ui:FancyWindow xmlns="https://spacestation14.io" | ||
xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls" | ||
VerticalExpand="True" HorizontalExpand="True" | ||
Title="{Loc admin-notes-message-window-title}" | ||
MinSize="600 170"> | ||
<PanelContainer VerticalExpand="True" HorizontalExpand="True" StyleClasses="BackgroundDark"> | ||
<ScrollContainer HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True" Margin="4"> | ||
<BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Bottom"> | ||
<Label Name="AdminLabel" Text="Loading..." /> | ||
<RichTextLabel Name="MessageLabel" /> | ||
<Control xmlns="https://spacestation14.io" | ||
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"> | ||
<PanelContainer MouseFilter="Stop"> | ||
<PanelContainer.PanelOverride> | ||
<!-- semi-transparent background --> | ||
<gfx:StyleBoxFlat BackgroundColor="#000000AA" /> | ||
</PanelContainer.PanelOverride> | ||
|
||
<Control HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="600"> | ||
<PanelContainer StyleClasses="AngleRect" /> | ||
|
||
<BoxContainer Orientation="Vertical" Margin="4"> | ||
<RichTextLabel Name="Description" /> | ||
|
||
<!-- Contains actual messages --> | ||
<ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True" MaxHeight="400"> | ||
<BoxContainer Orientation="Vertical" Name="MessageContainer" Margin="0 2 0 0" /> | ||
</ScrollContainer> | ||
|
||
<Label Name="WaitLabel" /> | ||
<BoxContainer Orientation="Horizontal"> | ||
<Button Name="DismissButton" | ||
Text="{Loc 'admin-notes-message-dismiss'}" /> | ||
Text="{Loc 'admin-notes-message-dismiss'}" | ||
Disabled="True" | ||
HorizontalExpand="True" | ||
StyleClasses="OpenRight" /> | ||
<Button Name="AcceptButton" | ||
Text="{Loc 'admin-notes-message-accept'}" | ||
Disabled="True" /> | ||
Disabled="True" | ||
HorizontalExpand="True" | ||
StyleClasses="OpenLeft" /> | ||
</BoxContainer> | ||
</BoxContainer> | ||
</ScrollContainer> | ||
</Control> | ||
</PanelContainer> | ||
</ui:FancyWindow> | ||
</Control> |
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
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
Oops, something went wrong.