-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 Schrodinger71 - tweak: Upstream 27.06.24, подтянуты коммиты с корвакса. --------- Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Alex Evgrashin <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]> Co-authored-by: Doomsdrayk <[email protected]> Co-authored-by: AJCM <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: Partmedia <[email protected]> Co-authored-by: ArkiveDev <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: MetalSage <[email protected]> Co-authored-by: MetalSage <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: marbow <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: Vasilis <[email protected]> Co-authored-by: Floofi <[email protected]> Co-authored-by: Cojoke <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: WarMechanic <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: Brandon Hu <[email protected]> Co-authored-by: eoineoineoin <[email protected]> Co-authored-by: Eoin Mcloughlin <[email protected]> Co-authored-by: mhamster <[email protected]> Co-authored-by: DrEnzyme <[email protected]> Co-authored-by: MureixloI <[email protected]> Co-authored-by: Chief-Engineer <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: deathride58 <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Elysium206 <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Snicket <[email protected]> Co-authored-by: Джексон Миссиссиппи <[email protected]> Co-authored-by: DieselMohawk <[email protected]> Co-authored-by: VeritableCalamity <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: plykiya <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Morb <[email protected]> Co-authored-by: poeMota <[email protected]> Co-authored-by: poeMota <[email protected]> Co-authored-by: KonstantinAngelov <[email protected]> Co-authored-by: Morbo <[email protected]>
- Loading branch information
51 people
authored
Jun 27, 2024
1 parent
68438fa
commit ef0a1bf
Showing
294 changed files
with
13,280 additions
and
6,550 deletions.
There are no files selected for viewing
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
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
Empty file.
17 changes: 11 additions & 6 deletions
17
...ent.Client/DebugMon/DebugMonitorSystem.cs → ...nt.Client/DebugMon/DebugMonitorManager.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 |
|---|---|---|
| @@ -1,23 +1,28 @@ | ||
| using Content.Client.Administration.Managers; | ||
| using Content.Client.Administration.Managers; | ||
| using Content.Shared.CCVar; | ||
| using Robust.Client; | ||
| using Robust.Client.UserInterface; | ||
| using Robust.Shared.Configuration; | ||
|
|
||
|
|
||
| namespace Content.Client.DebugMon; | ||
|
|
||
| /// <summary> | ||
| /// This handles preventing certain debug monitors from appearing. | ||
| /// This handles preventing certain debug monitors from being usable by non-admins. | ||
| /// </summary> | ||
| public sealed class DebugMonitorSystem : EntitySystem | ||
| internal sealed class DebugMonitorManager | ||
| { | ||
| [Dependency] private readonly IConfigurationManager _cfg = default!; | ||
| [Dependency] private readonly IClientAdminManager _admin = default!; | ||
| [Dependency] private readonly IUserInterfaceManager _userInterface = default!; | ||
| [Dependency] private readonly IBaseClient _baseClient = default!; | ||
|
|
||
| public override void FrameUpdate(float frameTime) | ||
| public void FrameUpdate() | ||
| { | ||
| if (!_admin.IsActive() && _cfg.GetCVar(CCVars.DebugCoordinatesAdminOnly)) | ||
| if (_baseClient.RunLevel == ClientRunLevel.InGame | ||
| && !_admin.IsActive() | ||
| && _cfg.GetCVar(CCVars.DebugCoordinatesAdminOnly)) | ||
| { | ||
| _userInterface.DebugMonitors.SetMonitor(DebugMonitor.Coords, false); | ||
| } | ||
| } | ||
| } |
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.