diff --git a/Content.Client/Armor/ArmorSystem.cs b/Content.Client/Armor/ArmorSystem.cs new file mode 100644 index 00000000000..a4116d2f7a3 --- /dev/null +++ b/Content.Client/Armor/ArmorSystem.cs @@ -0,0 +1,9 @@ +using Content.Shared.Armor; + +namespace Content.Client.Armor; + +/// +public sealed class ArmorSystem : SharedArmorSystem +{ + +} diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs index 18b9eae5f34..cc68d090394 100644 --- 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(OnComponentStartup); SubscribeLocalEvent(OnAppearanceChange); + SubscribeLocalEvent(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 index e8a36d57f48..f83eb8c2407 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml +++ b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml @@ -25,8 +25,10 @@ VerticalAlignment="Center"/> - - diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs index 309fee3baf3..5c2caf2230f 100644 --- 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 deleted file mode 100644 index 110cf4ea85c..00000000000 --- a/Content.Client/Guidebook/Controls/GuidebookControl.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - -