Skip to content

Commit

Permalink
Reset update (#171)
Browse files Browse the repository at this point in the history 
* feat: special stats, basic handling with cloth, chems.

* Special character creation, tweaks

* update fixes

* typo

* polishing

* fixes

* update

* icons, lobby screen, music
  • Loading branch information
@SpaceCowboyServer
SpaceCowboyServer authored Apr 15, 2024
1 parent f498b95 commit bb791c8
Show file tree
Hide file tree
Showing 142 changed files with 9,365 additions and 2,132 deletions.
6 changes: 3 additions & 3 deletions Content.Client/Arcade/BlockGameMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ private Control SetupGameGrid(Texture panelTex)
var back = new StyleBoxTexture
{
Texture = panelTex,
Modulate = Color.FromHex("#4a4a51"),
Modulate = Color.FromHex("#475247"),
};
back.SetPatchMargin(StyleBox.Margin.All, 10);

Expand All @@ -391,7 +391,7 @@ private Control SetupNextBox(Texture panelTex)
var previewBack = new StyleBoxTexture
{
Texture = panelTex,
Modulate = Color.FromHex("#4a4a51")
Modulate = Color.FromHex("#475247")
};
previewBack.SetPatchMargin(StyleBox.Margin.All, 10);

Expand Down Expand Up @@ -429,7 +429,7 @@ private Control SetupHoldBox(Texture panelTex)
var previewBack = new StyleBoxTexture
{
Texture = panelTex,
Modulate = Color.FromHex("#4a4a51")
Modulate = Color.FromHex("#475247")
};
previewBack.SetPatchMargin(StyleBox.Margin.All, 10);

Expand Down
6 changes: 3 additions & 3 deletions Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<!-- Vent devices -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer>
Expand All @@ -53,7 +53,7 @@
<!-- Scrubber devices -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer>
Expand All @@ -63,7 +63,7 @@
<!-- Sensors -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer>
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Cargo/UI/CargoBountyMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
HorizontalExpand="True">
<PanelContainer VerticalExpand="True" HorizontalExpand="True" Margin="10">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<ScrollContainer HScrollEnabled="False"
HorizontalExpand="True"
Expand Down
8 changes: 4 additions & 4 deletions Content.Client/Chemistry/UI/ChemMasterWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer HorizontalExpand="True" MinSize="0 200">
Expand All @@ -40,7 +40,7 @@
<!-- Buffer info -->
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer HorizontalExpand="True" MinSize="0 200">
Expand All @@ -62,7 +62,7 @@

<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<ScrollContainer HorizontalExpand="True" MinSize="0 200">
Expand All @@ -87,7 +87,7 @@
<!-- Wrap the packaging info-->
<PanelContainer>
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>

<!-- Packaging Info -->
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
SizeFlagsStretchRatio="6"
MinSize="0 150">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1b1b1e" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<BoxContainer Name="ContainerInfo"
Orientation="Vertical"
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Configurable/UI/ConfigurationMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public ConfigurationMenu(ConfigurationBoundUserInterface owner)
{
VerticalExpand = true,
HorizontalExpand = true,
ModulateSelfOverride = Color.FromHex("#202025")
ModulateSelfOverride = Color.FromHex("#282828")
};

outerColumn.AddChild(_column);
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PanelContainer VerticalExpand="True"
HorizontalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" VerticalAlignment="Center">
<RichTextLabel Name="CostLabel" HorizontalAlignment="Center" VerticalAlignment="Center"/>
Expand All @@ -35,7 +35,7 @@
HorizontalExpand="True"
RectClipContent="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<ui:MaterialStorageControl Name="MaterialStorageControl"/>
</PanelContainer>
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
if (_menu == null) return;

//Set the cook time info label
var cookTime = cState.ActiveButtonIndex == 0
var cookTime = cState.ActiveButtonIndex == 0
? Loc.GetString("microwave-menu-instant-button")
: cState.CurrentCookTime.ToString();

Expand Down Expand Up @@ -134,7 +134,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
}
else
{
_menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") };
_menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#282828") };
}
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Kitchen/UI/MicrowaveMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
MinSize="300 128"
Margin="5 5">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<ItemList
Name="IngredientsList"
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Lathe/UI/LatheMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
SizeFlagsStretchRatio="4">
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<ScrollContainer VerticalExpand="True" HScrollEnabled="False">
<BoxContainer
Expand Down
10 changes: 5 additions & 5 deletions Content.Client/Lathe/UI/RecipeTooltip.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
MaxWidth="400">
<PanelContainer>
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat
BorderThickness="2"
BorderColor="#464966"
BackgroundColor="#25252A"
<gfx:StyleBoxFlat
BorderThickness="2"
BorderColor="#666646"
BackgroundColor="#1f1f1f"
/>
</PanelContainer.PanelOverride>
<BoxContainer
<BoxContainer
Orientation="Vertical"
RectClipContent="True"
Margin="4">
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Lobby/LobbyState.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected override void Startup()

_characterSetup.SaveButton.OnPressed += _ =>
{
_characterSetup.Save();
// _characterSetup.Save(); //Nuclear14 workaround to prevent saving using this button, as I can't make it disable dependent on Special points
_lobby.CharacterPreview.UpdateUI();
};

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PanelContainer StyleClasses="BackgroundOpenLeft"/>
<PanelContainer>
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BorderColor="#25252A" BorderThickness="0 0 0 3"/>
<graphics:StyleBoxFlat BorderColor="#1f1f1f" BorderThickness="0 0 0 3"/>
</PanelContainer.PanelOverride>
</PanelContainer>
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
Expand All @@ -25,7 +25,7 @@
<Control Name="TextEditPanel" VerticalExpand="True" Margin="11 0 11 0">
<PanelContainer>
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#202023" BorderThickness="1" BorderColor="#3B3E56"/>
<graphics:StyleBoxFlat BackgroundColor="#1f1f1f" BorderThickness="1" BorderColor="#3B3E56"/>
</PanelContainer.PanelOverride>
</PanelContainer>
<TextEdit Name="ContentField" Margin="0 1" Access="Public"/>
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Control VerticalExpand="True" HorizontalExpand="True" Margin="10 10 10 0">
<PanelContainer Name="MainPanel" HorizontalExpand="False" VerticalExpand="True">
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#202023" />
<graphics:StyleBoxFlat BackgroundColor="#1f1f1f" />
</PanelContainer.PanelOverride>
</PanelContainer>
<ScrollContainer Name="ArticleListScrollbar" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="True">
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Mech/Ui/MechMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<BoxContainer VerticalExpand="True" Margin="10 0 10 10" Orientation="Vertical">
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#282828" />
</PanelContainer.PanelOverride>
<ScrollContainer
HScrollEnabled="False"
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Content.Client.NetworkConfigurator;
[GenerateTypedNameReferences]
public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
{
private const string PanelBgColor = "#202023";
private const string PanelBgColor = "#1f1f1f";

private readonly LinksRender _links;

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/PDA/PdaMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<pda:PdaNavigationButton Name="SettingsButton" MinWidth="100" LabelText="{Loc 'comp-pda-io-settings-button'}"/>

<pda:PdaNavigationButton Name="ProgramTitle" Access="Public" BorderThickness="0 0 0 2" CurrentTabBorderThickness="2 0 0 2"
ActiveBgColor="#202023" Visible="False"/>
ActiveBgColor="#1f1f1f" Visible="False"/>

<pda:PdaNavigationButton HorizontalExpand="True"/>

Expand Down
6 changes: 3 additions & 3 deletions Content.Client/PDA/PdaNavigationButton.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ public sealed partial class PdaNavigationButton : ContainerButton

private readonly StyleBoxFlat _styleBox = new()
{
BackgroundColor = Color.FromHex("#202023"),
BackgroundColor = Color.FromHex("#1f1f1f"),
BorderColor = Color.FromHex("#5a5a5a"),
BorderThickness = new Thickness(0, 0, 0, 2)
};

public string InactiveBgColor { get; set; } = "#202023";
public string ActiveBgColor { get; set; } = "#25252a";
public string InactiveBgColor { get; set; } = "#1f1f1f";
public string ActiveBgColor { get; set; } = "#282828";
public string InactiveFgColor { get; set; } = "#5a5a5a";
public string ActiveFgColor { get; set; } = "#FFFFFF";

Expand Down
6 changes: 3 additions & 3 deletions Content.Client/PDA/PdaProgramItem.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ namespace Content.Client.PDA;
public sealed partial class PdaProgramItem : ContainerButton
{
public const string StylePropertyBgColor = "backgroundColor";
public const string NormalBgColor = "#313138";
public const string HoverColor = "#3E6C45";
public const string NormalBgColor = "#282828";
public const string HoverColor = "#f2f282";

private readonly StyleBoxFlat _styleBox = new()
{
BackgroundColor = Color.FromHex("#25252a"),
BackgroundColor = Color.FromHex("#1f1f1f"),
};

public Color BackgroundColor
Expand Down
6 changes: 3 additions & 3 deletions Content.Client/PDA/PdaSettingsButton.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ public sealed partial class PdaSettingsButton : ContainerButton
public const string StylePropertyFgColor = "foregroundColor";
public const string StylePropertyBgColor = "backgroundColor";
public const string NormalBgColor = "#313138";
public const string HoverColor = "#3E6C45";
public const string PressedColor = "#3E6C45";
public const string HoverColor = "#f2f282";
public const string PressedColor = "#3e6c3e";
public const string DisabledFgColor = "#5a5a5a";
public const string EnabledFgColor = "#FFFFFF";

private readonly StyleBoxFlat _styleBox = new()
{
BackgroundColor = Color.FromHex("#25252a")
BackgroundColor = Color.FromHex("#1f1f1f")
};

public string? Text
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owne
var back = new StyleBoxTexture
{
Texture = panelTex,
Modulate = Color.FromHex("#25252A"),
Modulate = Color.FromHex("#1f1f1f"),
};
back.SetPatchMargin(StyleBox.Margin.All, 10);

var back2 = new StyleBoxTexture(back)
{
Modulate = Color.FromHex("#202023")
Modulate = Color.FromHex("#1f1f1f")
};

AddChild(new PanelContainer
Expand Down
8 changes: 8 additions & 0 deletions Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,14 @@
<humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
</ScrollContainer>
</BoxContainer>
<BoxContainer Orientation="Vertical">
<!-- Specials -->
<Label Name="SpecialPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
<ProgressBar Name="SpecialPointsBar" MaxValue="1" Value="1" MinHeight="20" MaxHeight="30" Margin="0 5 0 5" />
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="CSpecialList" Orientation="Vertical" />
</ScrollContainer>
</BoxContainer>
</TabContainer>
</BoxContainer>
<!-- Right side -->
Expand Down
Loading

0 comments on commit bb791c8

Please sign in to comment.