-
Notifications
You must be signed in to change notification settings - Fork 32
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 'origin/master' into armbands-1
- Loading branch information
Showing
1,275 changed files
with
1,144,598 additions
and
508,724 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,3 +1,2 @@ | ||
# Last match in file takes precedence. | ||
|
||
# TODO | ||
**/_LostParadise @Flybik @Evgencheg | ||
* @BL02DL |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
name: RSI Validator Secrets | ||
|
||
on: | ||
push: | ||
branches: [ master, staging, trying ] | ||
paths: | ||
- '**.rsi/**' | ||
|
||
jobs: | ||
validate_rsis: | ||
name: Validate RSIs | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise' | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Download parts | ||
run: | | ||
git clone ${{ secrets.HUB_SEC_TOKEN }} | ||
mv Secrets/_PrivateResources/_Private Resources/Prototypes/ | ||
mv Secrets/_PrivateResources/PERSONAL Resources/Textures/ | ||
mv Secrets/_PrivateShared Content.Shared/_PrivateShared | ||
mv Secrets/_PrivateServer Content.Server/_PrivateServer | ||
mv Secrets/_PrivateClient Content.Client/_PrivateClient | ||
- name: Setup Submodule | ||
run: git submodule update --init | ||
- name: Pull engine updates | ||
uses: space-wizards/[email protected] | ||
- name: Install Python dependencies | ||
run: | | ||
pip3 install --ignore-installed --user pillow jsonschema | ||
- name: Validate RSIs | ||
run: | | ||
python3 RobustToolbox/Schemas/validate_rsis.py Resources/ |
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 |
---|---|---|
|
@@ -2,13 +2,15 @@ name: Update Contrib and Patreons in credits | |
|
||
on: | ||
workflow_dispatch: | ||
schedule: | ||
- cron: 0 0 * * 0 | ||
|
||
jobs: | ||
get_credits: | ||
runs-on: ubuntu-latest | ||
# Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo | ||
# Do this in dump_github_contributors.ps1 too into your own repo | ||
if: github.repository == 'Simple-Station/Einstein-Engines' | ||
if: github.repository == 'Lost-Paradise-Project/Lost-Paradise' | ||
|
||
steps: | ||
- uses: actions/[email protected] | ||
|
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,91 @@ | ||
name: Update Wiki | ||
|
||
on: | ||
workflow_dispatch: | ||
push: | ||
branches: [ master, jsondump ] | ||
paths: | ||
- '.github/workflows/update-wiki.yml' | ||
- 'Content.Shared/Chemistry/**.cs' | ||
- 'Content.Server/Chemistry/**.cs' | ||
- 'Content.Server/GuideGenerator/**.cs' | ||
- 'Content.Server/Corvax/GuideGenerator/**.cs' | ||
- 'Resources/Prototypes/*/Reagents/**.yml' | ||
- 'Resources/Prototypes/*/Chemistry/**.yml' | ||
- 'Resources/Prototypes/*/Recipes/Reactions/**.yml' | ||
- 'RobustToolbox/' | ||
|
||
jobs: | ||
update-wiki: | ||
name: Build and Publish JSON blobs to wiki | ||
if: github.repository == 'Lost-Paradise-Project/Lost-Paradise' | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout Master | ||
uses: actions/[email protected] | ||
|
||
- name: Setup Submodule | ||
run: | | ||
git submodule update --init --recursive | ||
- name: Pull Engine Updates | ||
uses: space-wizards/[email protected] | ||
|
||
- name: Update Engine Submodules | ||
run: | | ||
cd RobustToolbox/ | ||
git submodule update --init --recursive | ||
- name: Setup .NET Core | ||
uses: actions/[email protected] | ||
|
||
- name: Install Dependencies | ||
run: dotnet restore | ||
|
||
- name: Build Project | ||
run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m | ||
|
||
- name: Generate JSON blobs for prototypes | ||
run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json | ||
continue-on-error: true | ||
|
||
- name: Upload chem_prototypes.json to wiki | ||
uses: jtmullen/[email protected] | ||
with: | ||
wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json | ||
edit_summary: Update chem_prototypes.json via GitHub Actions | ||
page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json" | ||
api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php | ||
username: ${{ secrets.WIKI_BOT_USER }} | ||
password: ${{ secrets.WIKI_BOT_PASS }} | ||
|
||
- name: Upload react_prototypes.json to wiki | ||
uses: jtmullen/[email protected] | ||
with: | ||
wiki_text_file: ./bin/Content.Server/data/react_prototypes.json | ||
edit_summary: Update react_prototypes.json via GitHub Actions | ||
page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json" | ||
api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php | ||
username: ${{ secrets.WIKI_BOT_USER }} | ||
password: ${{ secrets.WIKI_BOT_PASS }} | ||
|
||
- name: Upload entity_prototypes.json to wiki | ||
uses: jtmullen/[email protected] | ||
with: | ||
wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json | ||
edit_summary: Update entity_prototypes.json via GitHub Actions | ||
page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json" | ||
api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php | ||
username: ${{ secrets.WIKI_BOT_USER }} | ||
password: ${{ secrets.WIKI_BOT_PASS }} | ||
|
||
- name: Upload mealrecipes_prototypes.json to wiki | ||
uses: jtmullen/[email protected] | ||
with: | ||
wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json | ||
edit_summary: Update mealrecipes_prototypes.json via GitHub Actions | ||
page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json" | ||
api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php | ||
username: ${{ secrets.WIKI_BOT_USER }} | ||
password: ${{ secrets.WIKI_BOT_PASS }} |
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 |
---|---|---|
|
@@ -2,7 +2,9 @@ name: RSI Validator | |
|
||
on: | ||
push: | ||
branches: [ staging, trying ] | ||
branches: [ master, staging, trying ] | ||
paths: | ||
- '**.rsi/**' | ||
merge_group: | ||
pull_request: | ||
paths: | ||
|
@@ -11,7 +13,7 @@ on: | |
jobs: | ||
validate_rsis: | ||
name: Validate RSIs | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Setup Submodule | ||
|
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,28 @@ | ||
using Content.Client.UserInterface.Fragments; | ||
using Content.Shared.CartridgeLoader.Cartridges; | ||
using Robust.Client.UserInterface; | ||
|
||
namespace Content.Client.CartridgeLoader.Cartridges; | ||
|
||
public sealed partial class MailMetricUi : UIFragment | ||
{ | ||
private MailMetricUiFragment? _fragment; | ||
|
||
public override Control GetUIFragmentRoot() | ||
{ | ||
return _fragment!; | ||
} | ||
|
||
public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner) | ||
{ | ||
_fragment = new MailMetricUiFragment(); | ||
} | ||
|
||
public override void UpdateState(BoundUserInterfaceState state) | ||
{ | ||
if (state is MailMetricUiState cast) | ||
{ | ||
_fragment?.UpdateState(cast); | ||
} | ||
} | ||
} |
183 changes: 183 additions & 0 deletions
183
Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.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,183 @@ | ||
<cartridges:MailMetricUiFragment | ||
xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges" | ||
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls" | ||
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" | ||
xmlns="https://spacestation14.io" | ||
Margin="5" | ||
VerticalExpand="True" | ||
Orientation="Vertical"> | ||
<PanelContainer StyleClasses="BackgroundDark"></PanelContainer> | ||
<controls:StripeBack Name="MailMetricHeaderContainer"> | ||
<PanelContainer> | ||
<Label Name="MailMetricHeader" | ||
Align="Center" | ||
Text="{Loc 'mail-metrics-header'}" /> | ||
</PanelContainer> | ||
</controls:StripeBack> | ||
<BoxContainer | ||
Orientation="Vertical" | ||
HorizontalExpand="True" | ||
Margin="20 0"> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="TitleEmpty1" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" /> | ||
<Label Name="MailCountLabel" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
StyleClasses="monospace" | ||
Align="Center" | ||
Text="{Loc 'mail-metrics-count-header'}" /> | ||
<Label Name="SpesosLabel" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Align="Center" | ||
StyleClasses="monospace" | ||
Text="{Loc 'mail-metrics-money-header'}" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="OpenedLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-opened'}" /> | ||
<Label Name="OpenedMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
<Label Name="OpenedMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="ExpiredLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-expired'}" /> | ||
<Label Name="ExpiredMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
<Label Name="ExpiredMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="TamperedLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-tampered'}" /> | ||
<Label Name="TamperedMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
<Label Name="TamperedMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="DamagedLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-damaged'}" /> | ||
<Label Name="DamagedMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
<Label Name="DamagedMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
StyleClasses="monospace" | ||
Align="Right" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="UnopenedLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-unopened'}" /> | ||
<Label Name="UnopenedMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
StyleClasses="monospace" | ||
Align="Right" | ||
ClipText="True" /> | ||
<Label Name="UnopenedMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
<BoxContainer Orientation="Horizontal" | ||
HorizontalExpand="True" | ||
SeparationOverride="2"> | ||
<Label Name="TotalMailLabel" | ||
SizeFlagsStretchRatio="2" | ||
HorizontalExpand="True" | ||
ClipText="True" | ||
Text="{Loc 'mail-metrics-total'}" /> | ||
<Label Name="TotalMailCount" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
<Label Name="TotalMailSpesos" | ||
SizeFlagsStretchRatio="1" | ||
HorizontalExpand="True" | ||
Align="Right" | ||
StyleClasses="monospace" | ||
ClipText="True" /> | ||
</BoxContainer> | ||
</BoxContainer> | ||
<BoxContainer | ||
Orientation="Vertical" | ||
HorizontalExpand="True" | ||
Margin="10"> | ||
<Label | ||
Name="SuccessRateCounts" | ||
Align="Center" | ||
StyleClasses="LabelBig" /> | ||
<Label | ||
Name="SuccessRatePercent" | ||
Align="Center" | ||
StyleClasses="LabelBig" /> | ||
</BoxContainer> | ||
</cartridges:MailMetricUiFragment> |
Oops, something went wrong.