forked from Sector-Umbra/Sector-Umbra
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Sector-Umbra#263 from Sector-Umbra/stable-merge
Stable Merge 01/05/2025
- Loading branch information
Showing
379 changed files
with
152,405 additions
and
116,570 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,5 +5,3 @@ | |
|
|
||
| # Anything workflow-related or related to github operations | ||
| .github @TsjipTsjip | ||
|
|
||
|
|
||
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
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 |
|---|---|---|
| @@ -1,48 +1,8 @@ | ||
| using Content.Shared.PDA; | ||
| using Content.Shared.Light; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client.PDA; | ||
|
|
||
| public sealed class PdaSystem : SharedPdaSystem | ||
| { | ||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<PdaComponent, AppearanceChangeEvent>(OnAppearanceChange); | ||
| } | ||
|
|
||
| private void OnAppearanceChange(EntityUid uid, PdaComponent component, ref AppearanceChangeEvent args) | ||
| { | ||
| if (args.Sprite == null) | ||
| return; | ||
|
|
||
| if (Appearance.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component)) | ||
| args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn); | ||
|
|
||
| if (Appearance.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component)) | ||
| args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted); | ||
| } | ||
|
|
||
| protected override void OnComponentInit(EntityUid uid, PdaComponent component, ComponentInit args) | ||
| { | ||
| base.OnComponentInit(uid, component, args); | ||
|
|
||
| if (!TryComp<SpriteComponent>(uid, out var sprite)) | ||
| return; | ||
|
|
||
| if (component.State != null) | ||
| sprite.LayerSetState(PdaVisualLayers.Base, component.State); | ||
|
|
||
| sprite.LayerSetVisible(PdaVisualLayers.Flashlight, component.FlashlightOn); | ||
| sprite.LayerSetVisible(PdaVisualLayers.IdLight, component.IdSlot.StartingItem != null); | ||
| } | ||
|
|
||
| public enum PdaVisualLayers : byte | ||
| { | ||
| Base, | ||
| Flashlight, | ||
| IdLight | ||
| } | ||
| } |
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,30 @@ | ||
| using Content.Shared.Light; | ||
| using Content.Shared.PDA; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client.PDA; | ||
|
|
||
| public sealed class PdaVisualizerSystem : VisualizerSystem<PdaVisualsComponent> | ||
| { | ||
| protected override void OnAppearanceChange(EntityUid uid, PdaVisualsComponent comp, ref AppearanceChangeEvent args) | ||
| { | ||
| if (args.Sprite == null) | ||
| return; | ||
|
|
||
| if (AppearanceSystem.TryGetData<string>(uid, PdaVisuals.PdaType, out var pdaType, args.Component)) | ||
| args.Sprite.LayerSetState(PdaVisualLayers.Base, pdaType); | ||
|
|
||
| if (AppearanceSystem.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component)) | ||
| args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn); | ||
|
|
||
| if (AppearanceSystem.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component)) | ||
| args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted); | ||
| } | ||
|
|
||
| public enum PdaVisualLayers : byte | ||
| { | ||
| Base, | ||
| Flashlight, | ||
| IdLight | ||
| } | ||
| } |
Oops, something went wrong.