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

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">