-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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 ed-11-09-2024-station-gates
- Loading branch information
Showing
312 changed files
with
147,339 additions
and
23,745 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
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 |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ jobs: | |
| { | ||
| "0": "XS", | ||
| "10": "S", | ||
| "30": "M", | ||
| "100": "L", | ||
| "1000": "XL" | ||
| "100": "M", | ||
| "1000": "L", | ||
| "5000": "XL" | ||
| } | ||
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
63 changes: 54 additions & 9 deletions
63
Content.Client/Communications/UI/CommunicationsConsoleMenu.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,17 +1,62 @@ | ||
| <controls:FancyWindow xmlns="https://spacestation14.io" | ||
| xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" | ||
| Title="{Loc 'comms-console-menu-title'}" | ||
| MinSize="400 225"> | ||
| <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="5"> | ||
| <TextEdit Name="MessageInput" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 0 5" MinHeight="100" /> | ||
| <Button Name="AnnounceButton" Text="{Loc 'comms-console-menu-announcement-button'}" ToolTip="{Loc 'comms-console-menu-announcement-button-tooltip'}" StyleClasses="OpenLeft" Access="Public" /> | ||
| <Button Name="BroadcastButton" Text="{Loc 'comms-console-menu-broadcast-button'}" ToolTip="{Loc 'comms-console-menu-broadcast-button-tooltip'}" StyleClasses="OpenLeft" Access="Public" /> | ||
| MinSize="400 300"> | ||
|
|
||
| <OptionButton Name="AlertLevelButton" ToolTip="{Loc 'comms-console-menu-alert-level-button-tooltip'}" StyleClasses="OpenRight" Access="Public" /> | ||
| <!-- Main Container --> | ||
| <BoxContainer Orientation="Vertical" | ||
| HorizontalExpand="False" | ||
| VerticalExpand="True" | ||
| Margin="6 6 6 5"> | ||
|
|
||
| <Control MinSize="10 10" /> | ||
| <TextEdit Name="MessageInput" | ||
| VerticalExpand="True" | ||
| HorizontalExpand="True" | ||
| VerticalAlignment="Stretch" | ||
| HorizontalAlignment="Stretch" | ||
| MinHeight="100"/> | ||
|
|
||
| <RichTextLabel Name="CountdownLabel" VerticalExpand="True" /> | ||
| <Button Name="EmergencyShuttleButton" Text="Placeholder Text" ToolTip="{Loc 'comms-console-menu-emergency-shuttle-button-tooltip'}" Access="Public" /> | ||
| <!-- ButtonsPart --> | ||
| <BoxContainer Orientation="Vertical" | ||
| VerticalAlignment="Bottom" | ||
| SeparationOverride="4"> | ||
|
|
||
| <!-- AnnouncePart --> | ||
| <BoxContainer Orientation="Vertical" | ||
| Margin="0 2"> | ||
|
|
||
| <Button Name="AnnounceButton" | ||
| Access="Public" | ||
| Text="{Loc 'comms-console-menu-announcement-button'}" | ||
| ToolTip="{Loc 'comms-console-menu-announcement-button-tooltip'}" | ||
| StyleClasses="OpenLeft" | ||
| Margin="0 0 1 0" | ||
| Disabled="True"/> | ||
|
|
||
| <Button Name="BroadcastButton" | ||
| Access="Public" | ||
| Text="{Loc 'comms-console-menu-broadcast-button'}" | ||
| ToolTip="{Loc 'comms-console-menu-broadcast-button-tooltip'}" | ||
| StyleClasses="OpenBoth"/> | ||
|
|
||
| <OptionButton Name="AlertLevelButton" | ||
| Access="Public" | ||
| ToolTip="{Loc 'comms-console-menu-alert-level-button-tooltip'}" | ||
| StyleClasses="OpenRight"/> | ||
|
|
||
| </BoxContainer> | ||
|
|
||
| <!-- EmergencyPart --> | ||
| <BoxContainer Orientation="Vertical" | ||
| SeparationOverride="6"> | ||
|
|
||
| <RichTextLabel Name="CountdownLabel"/> | ||
|
|
||
| <Button Name="EmergencyShuttleButton" | ||
| Access="Public" | ||
| Text="Placeholder Text" | ||
| ToolTip="{Loc 'comms-console-menu-emergency-shuttle-button-tooltip'}"/> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </controls:FancyWindow> |
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,101 @@ | ||
| using Content.Shared.Holopad; | ||
| using Content.Shared.Silicons.StationAi; | ||
| using Robust.Client.Graphics; | ||
| using Robust.Client.UserInterface; | ||
| using Robust.Shared.Player; | ||
| using System.Numerics; | ||
|
|
||
| namespace Content.Client.Holopad; | ||
|
|
||
| public sealed class HolopadBoundUserInterface : BoundUserInterface | ||
| { | ||
| [Dependency] private readonly ISharedPlayerManager _playerManager = default!; | ||
| [Dependency] private readonly IClyde _displayManager = default!; | ||
|
|
||
| [ViewVariables] | ||
| private HolopadWindow? _window; | ||
|
|
||
| public HolopadBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) | ||
| { | ||
| IoCManager.InjectDependencies(this); | ||
| } | ||
|
|
||
| protected override void Open() | ||
| { | ||
| base.Open(); | ||
|
|
||
| _window = this.CreateWindow<HolopadWindow>(); | ||
| _window.Title = Loc.GetString("holopad-window-title", ("title", EntMan.GetComponent<MetaDataComponent>(Owner).EntityName)); | ||
|
|
||
| if (this.UiKey is not HolopadUiKey) | ||
| { | ||
| Close(); | ||
| return; | ||
| } | ||
|
|
||
| var uiKey = (HolopadUiKey)this.UiKey; | ||
|
|
||
| // AIs will see a different holopad interface to crew when interacting with them in the world | ||
| if (uiKey == HolopadUiKey.InteractionWindow && EntMan.HasComponent<StationAiHeldComponent>(_playerManager.LocalEntity)) | ||
| uiKey = HolopadUiKey.InteractionWindowForAi; | ||
|
|
||
| _window.SetState(Owner, uiKey); | ||
| _window.UpdateState(new Dictionary<NetEntity, string>()); | ||
|
|
||
| // Set message actions | ||
| _window.SendHolopadStartNewCallMessageAction += SendHolopadStartNewCallMessage; | ||
| _window.SendHolopadAnswerCallMessageAction += SendHolopadAnswerCallMessage; | ||
| _window.SendHolopadEndCallMessageAction += SendHolopadEndCallMessage; | ||
| _window.SendHolopadStartBroadcastMessageAction += SendHolopadStartBroadcastMessage; | ||
| _window.SendHolopadActivateProjectorMessageAction += SendHolopadActivateProjectorMessage; | ||
| _window.SendHolopadRequestStationAiMessageAction += SendHolopadRequestStationAiMessage; | ||
|
|
||
| // If this call is addressed to an AI, open the window in the bottom right hand corner of the screen | ||
| if (uiKey == HolopadUiKey.AiRequestWindow) | ||
| _window.OpenCenteredAt(new Vector2(1f, 1f)); | ||
|
|
||
| // Otherwise offset to the left so the holopad can still be seen | ||
| else | ||
| _window.OpenCenteredAt(new Vector2(0.3333f, 0.50f)); | ||
| } | ||
|
|
||
| protected override void UpdateState(BoundUserInterfaceState state) | ||
| { | ||
| base.UpdateState(state); | ||
|
|
||
| var castState = (HolopadBoundInterfaceState)state; | ||
| EntMan.TryGetComponent<TransformComponent>(Owner, out var xform); | ||
|
|
||
| _window?.UpdateState(castState.Holopads); | ||
| } | ||
|
|
||
| public void SendHolopadStartNewCallMessage(NetEntity receiver) | ||
| { | ||
| SendMessage(new HolopadStartNewCallMessage(receiver)); | ||
| } | ||
|
|
||
| public void SendHolopadAnswerCallMessage() | ||
| { | ||
| SendMessage(new HolopadAnswerCallMessage()); | ||
| } | ||
|
|
||
| public void SendHolopadEndCallMessage() | ||
| { | ||
| SendMessage(new HolopadEndCallMessage()); | ||
| } | ||
|
|
||
| public void SendHolopadStartBroadcastMessage() | ||
| { | ||
| SendMessage(new HolopadStartBroadcastMessage()); | ||
| } | ||
|
|
||
| public void SendHolopadActivateProjectorMessage() | ||
| { | ||
| SendMessage(new HolopadActivateProjectorMessage()); | ||
| } | ||
|
|
||
| public void SendHolopadRequestStationAiMessage() | ||
| { | ||
| SendMessage(new HolopadStationAiRequestMessage()); | ||
| } | ||
| } |
Oops, something went wrong.