Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into upupup

Browse Source 
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json
This commit is contained in:
Remuchi
2024-02-06 14:37:38 +07:00
parent 73400c205e 4041cd1616
commit b1b0d1285b
743 changed files with 932 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Client/Doors/AirlockSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Client.Wires.Visualizers;
using Content.Shared.Doors;
using Content.Shared.Doors.Components;
using Content.Shared.Doors.Systems;
using Content.Shared.Prying.Components;
@@ -25,6 +26,16 @@ public sealed class AirlockSystem : SharedAirlockSystem
args.Cancelled = true;
}
protected override void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
{
base.OnBeforeDoorClosed(uid, airlock, args);
if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights)
{
args.Cancel();
}
}
private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
{
// Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash.
@@ -34,9 +45,11 @@ public sealed class AirlockSystem : SharedAirlockSystem
if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting.
{
door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.OpenSpriteState));
door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_open_unlit"));
door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.OpenBoltedSpriteState));
door.OpenSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.OpenEmergencySpriteState));
door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.ClosedSpriteState));
door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_unlit"));
door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.ClosedBoltedSpriteState));
door.ClosedSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.ClosedEmergencySpriteState));
}
((Animation) door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
@@ -98,7 +111,7 @@ public sealed class AirlockSystem : SharedAirlockSystem
{
boltedVisible =
_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component)
&& lights && state is DoorState.Closed or DoorState.Welded;
&& lights && state is DoorState.Closed or DoorState.Welded or DoorState.Open;
emergencyLightsVisible =
_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.EmergencyLights, out var eaLights,
@@ -123,7 +136,6 @@ public sealed class AirlockSystem : SharedAirlockSystem
args.Sprite.LayerSetVisible(
DoorVisualLayers.BaseEmergencyAccess,
emergencyLightsVisible
&& state != DoorState.Open
&& state != DoorState.Opening
&& state != DoorState.Closing
&& !boltedVisible

2
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -58,7 +58,7 @@
<Control VerticalExpand="True" />
<RichTextLabel Name="LabelName" Access="Public" HorizontalAlignment="Left"
VerticalAlignment="Center" Margin="0 0 0 350" />
VerticalAlignment="Center" Margin="0 0 0 380" />
<!-- Ohio Container -->
<PanelContainer HorizontalAlignment="Left" Name="Center" VerticalAlignment="Center">