Merge remote-tracking branch 'upstream/master' into upstream-sync

# Conflicts: # Resources/Prototypes/Datasets/tips.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/manifest.yml
space-syndicate · Sep 28, 2023 · 64f1e79 · 64f1e79
2 parents 84dbb75 + 78091fb
commit 64f1e79
Show file tree

Hide file tree

Showing 131 changed files with 1,597 additions and 8,073 deletions.
diff --git a/Content.Client/Armor/ArmorSystem.cs b/Content.Client/Armor/ArmorSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Armor;
+
+namespace Content.Client.Armor;
+
+/// <inheritdoc/>
+public sealed class ArmorSystem : SharedArmorSystem
+{
+
+}
diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs
@@ -1,6 +1,7 @@
 using Content.Client.Wires.Visualizers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.Prying.Components;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 
@@ -15,6 +16,13 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
+        SubscribeLocalEvent<AirlockComponent, BeforePryEvent>(OnAirlockPryAttempt);
+    }
+
+    private void OnAirlockPryAttempt(EntityUid uid, AirlockComponent component, ref BeforePryEvent args)
+    {
+        // TODO: Temporary until airlocks predicted.
+        args.Cancelled = true;
     }
 
     private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)

diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
@@ -25,8 +25,10 @@
                                                VerticalAlignment="Center"/>
                             </BoxContainer>
                             <BoxContainer Orientation="Vertical"  VerticalAlignment="Center">
-                                <TextureRect TexturePath="/Textures/Interface/Misc/beakerlarge.png"/>
-                                <Label Text="{Loc 'guidebook-reagent-recipes-mix'}"
+                                <TextureRect TexturePath="/Textures/Interface/Misc/beakerlarge.png"
+                                             HorizontalAlignment="Center"/>
+                                <Label Name="MixLabel"
+                                       Text="{Loc 'guidebook-reagent-recipes-mix'}"
                                        HorizontalAlignment="Center"/>
                             </BoxContainer>
                             <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalAlignment="Center">

diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs
@@ -116,6 +116,12 @@ private void GenerateControl(ReagentPrototype reagent)
             reactantMsg.Pop();
             ReactantsLabel.SetMessage(reactantMsg);
 
+            if (reactionPrototype.MinimumTemperature > 0.0f)
+            {
+                MixLabel.Text = Loc.GetString("guidebook-reagent-recipes-mix-and-heat",
+                    ("temperature", reactionPrototype.MinimumTemperature));
+            }
+
             var productMsg = new FormattedMessage();
             var productCount = reactionPrototype.Products.Count;
             var u = 0;

diff --git a/Content.Client/Guidebook/Controls/GuidebookControl.xaml b/Content.Client/Guidebook/Controls/GuidebookControl.xaml
diff --git a/Content.Client/Guidebook/Controls/GuidebookControl.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookControl.xaml.cs
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -2,8 +2,34 @@
                 xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:controls1="clr-namespace:Content.Client.Guidebook.Controls"
+                SetSize="750 700"
+                MinSize="100 200"
                 Resizable="True"
                 Title="{Loc 'guidebook-window-title'}">
-    <controls1:GuidebookControl Name="Guidebook" Access="Public"/>
+    <SplitContainer Orientation="Horizontal" HorizontalExpand="True" Name="Split">
+        <!-- Guide select -->
+        <BoxContainer Orientation="Horizontal" Name="TreeBox">
+            <fancyTree:FancyTree Name="Tree" VerticalExpand="True" HorizontalExpand="True" Access="Public"/>
+            <cc:VSeparator StyleClasses="LowDivider" Margin="0 -2"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer Name="SearchContainer" Visible="False" HorizontalExpand="True">
+                <LineEdit
+                    Name="SearchBar"
+                    PlaceHolder="{Loc 'guidebook-filter-placeholder-text'}"
+                    HorizontalExpand="True"
+                    Margin="0 5 10 5">                
+                </LineEdit>
+            </BoxContainer>
+            <ScrollContainer Name="Scroll" HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
+                <Control>
+                    <BoxContainer Orientation="Vertical" Name="EntryContainer" Margin="5 5 5 5" Visible="False"/>
+                    <BoxContainer Orientation="Vertical" Name="Placeholder" Margin="5 5 5 5">
+                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text'}"/>
+                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text-2'}"/>
+                    </BoxContainer>
+                </Control>
+            </ScrollContainer>
+        </BoxContainer>
+    </SplitContainer>
 </controls:FancyWindow>