forked from space-wizards/space-station-14
-
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 branch 'arumoon-server' into toy-energy-weapon-update
- Loading branch information
Showing
1,281 changed files
with
118,007 additions
and
30,292 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 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
4 changes: 2 additions & 2 deletions
4
Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.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,9 +1,9 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" | ||
| xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls" | ||
| Title="{Loc Teleport}" MinSize="425 230"> | ||
| Title="{Loc admin-ui-teleport}" MinSize="425 230"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <cc:PlayerListControl Name="PlayerList" /> | ||
| <Button Name="SubmitButton" Text="{Loc Teleport}" /> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-teleport}" /> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
18 changes: 9 additions & 9 deletions
18
Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.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,33 +1,33 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" Title="{Loc Load Blueprint}"> | ||
| xmlns="https://spacestation14.io" Title="{Loc admin-ui-blueprint-load}"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Map}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-blueprint-map}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="MapOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Path}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-blueprint-path}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <LineEdit Name="MapPath" MinSize="200 0" HorizontalExpand="True" Text="/Maps/" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc X}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-blueprint-x}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="XCoordinate" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Y}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-blueprint-y}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="YCoordinate" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Rotation}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-blueprint-rotation}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="RotationSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <Button Name="SubmitButton" Text="{Loc Load Blueprint}" /> | ||
| <Button Name="TeleportButton" Text="{Loc Teleport to}" /> | ||
| <Button Name="ResetButton" Text="{Loc Reset to default}"></Button> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-blueprint-load}" /> | ||
| <Button Name="TeleportButton" Text="{Loc admin-ui-blueprint-teleport}" /> | ||
| <Button Name="ResetButton" Text="{Loc admin-ui-blueprint-reset}"></Button> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
6 changes: 3 additions & 3 deletions
6
Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.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,11 +1,11 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" Title="{Loc Add Atmos}"> | ||
| xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Grid}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <Button Name="SubmitButton" Text="{Loc Add Atmos}" /> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add}" /> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
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
14 changes: 7 additions & 7 deletions
14
Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.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,31 +1,31 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" Title="{Loc Add Gas}"> | ||
| xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add-gas}"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Grid}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc TileX}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc TileY}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Gas}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Amount}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <Button Name="SubmitButton" Text="{Loc Add Gas}" /> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add-gas}" /> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
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
10 changes: 5 additions & 5 deletions
10
Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.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,21 +1,21 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" Title="{Loc Fill Gas}"> | ||
| xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-fill-gas}"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Grid}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Gas}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Amount}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <Button Name="SubmitButton" Text="{Loc Fill Gas}" /> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-fill-gas}" /> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
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
12 changes: 6 additions & 6 deletions
12
Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.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,26 +1,26 @@ | ||
| <DefaultWindow | ||
| xmlns="https://spacestation14.io" Title="{Loc Set Temperature}"> | ||
| xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-set-temperature}"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Grid}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc TileX}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc TileY}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal"> | ||
| <Label Text="{Loc Temperature}" MinSize="100 0" /> | ||
| <Label Text="{Loc admin-ui-atmos-temperature}" MinSize="100 0" /> | ||
| <Control MinSize="50 0" /> | ||
| <SpinBox Name="TemperatureSpin" MinSize="100 0" HorizontalExpand="True" /> | ||
| </BoxContainer> | ||
| <Button Name="SubmitButton" Text="{Loc Set Temperature}" /> | ||
| <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-set-temperature}" /> | ||
| </BoxContainer> | ||
| </DefaultWindow> |
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.