diff --git a/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs b/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs index 9796331a86..7ccb7a50cb 100644 --- a/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs +++ b/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs @@ -1,10 +1,9 @@ +using System.Numerics; using System.Text; -using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.RichText; using Robust.Shared.Collections; -using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Client.White.UserInterface.Controls; @@ -51,7 +50,7 @@ internal struct ChatRichTextEntry if (node.Name == null) continue; - if (!_tagManager.TryGetMarkupTag(node.Name, out var tag) || !tag.TryGetControl(node, out var control)) + if (!_tagManager.TryGetMarkupTag(node.Name, null, out var tag) || !tag.TryGetControl(node, out var control)) continue; parent.Children.Add(control); @@ -251,7 +250,7 @@ internal struct ChatRichTextEntry return node.Value.StringValue ?? ""; //Skip the node if there is no markup tag for it. - if (!_tagManager.TryGetMarkupTag(node.Name, out var tag)) + if (!_tagManager.TryGetMarkupTag(node.Name, null, out var tag)) return ""; if (!node.Closing) diff --git a/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs b/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs index 64f3f92b1e..6a40ae4f31 100644 --- a/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs +++ b/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs @@ -1,4 +1,5 @@ using System.Diagnostics.Contracts; +using System.Numerics; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.RichText; @@ -44,7 +45,7 @@ public class ChatRichTextLabel : Control var font = _getFont(); _entry.Update(font, availableSize.X * UIScale, UIScale); - return (_entry.Width / UIScale, _entry.Height / UIScale); + return new Vector2(_entry.Width / UIScale, _entry.Height / UIScale); } protected override void Draw(DrawingHandleScreen handle) diff --git a/Content.Server/Worldgen/Components/BlueprintPlacerComponent.cs b/Content.Server/Worldgen/Components/BlueprintPlacerComponent.cs index 608a4225fe..2ce799cda6 100644 --- a/Content.Server/Worldgen/Components/BlueprintPlacerComponent.cs +++ b/Content.Server/Worldgen/Components/BlueprintPlacerComponent.cs @@ -6,7 +6,7 @@ using Robust.Shared.Utility; namespace Content.Server.Worldgen.Components; [RegisterComponent] -public sealed class BlueprintPlacerComponent : Component +public sealed partial class BlueprintPlacerComponent : Component { [DataField("blueprint", required: true, customTypeSerializer: typeof(ResPathSerializer))] public ResPath Blueprint = default!; @@ -15,7 +15,7 @@ public sealed class BlueprintPlacerComponent : Component /// The components that get added to the target grid. /// [DataField("components", required: true)] - public ComponentRegistry Components { get; } = default!; + public ComponentRegistry Components { get; set; } = default!; //TODO: Get someone to make this a method on componentregistry that does it Correctly. /// diff --git a/Content.Server/Worldgen/StructurePlacementComponent.cs b/Content.Server/Worldgen/StructurePlacementComponent.cs index 9cc71ec8b3..a7b059eafc 100644 --- a/Content.Server/Worldgen/StructurePlacementComponent.cs +++ b/Content.Server/Worldgen/StructurePlacementComponent.cs @@ -2,7 +2,7 @@ namespace Content.Server.Worldgen; [RegisterComponent] -public sealed class StructurePlacementComponent : Component +public sealed partial class StructurePlacementComponent : Component { /// /// The structures to place into the world. @@ -21,7 +21,7 @@ public sealed class StructurePlacementComponent : Component /// A single structure's placement config. /// [DataDefinition] -public sealed class StructureConfig +public sealed partial class StructureConfig { /// /// The entity to spawn into the world. diff --git a/Content.Server/Worldgen/Systems/StructurePlacementSystem.cs b/Content.Server/Worldgen/Systems/StructurePlacementSystem.cs index 15a4cf030b..eb728c25e9 100644 --- a/Content.Server/Worldgen/Systems/StructurePlacementSystem.cs +++ b/Content.Server/Worldgen/Systems/StructurePlacementSystem.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Numerics; using Content.Server.Administration.Logs; using Content.Server.Worldgen.Components; using Content.Server.Worldgen.Tools; diff --git a/Resources/Locale/ru-RU/white/something.ftl b/Resources/Locale/ru-RU/white/something.ftl index f69178c67f..8d750fd21f 100644 --- a/Resources/Locale/ru-RU/white/something.ftl +++ b/Resources/Locale/ru-RU/white/something.ftl @@ -1,6 +1,6 @@ reflect-shot = Отразил! carry-verb = Тащить на руках -chat-manager-entity-say-god-wrap-message = { $entityName } командует, "[color={ $color }]{ $message }[/color]" +chat-manager-entity-say-god-wrap-message = [BubbleHeader][bold]{$entityName}[/bold][/BubbleHeader] командует, "[BubbleContent][color={ $color }][bold]{$message}[/bold][/color][/BubbleContent]" eorstats-bloodlost-total = { $bloodLost } единиц крови было потеряно в этом раунде! eorstats-cuffedtime-hasusername = { $username } под именем { $name } провел(а) { $timeCuffedMinutes } минут в наручниках в этом раунде! Что он натворил? eorstats-cuffedtime-hasnousername = { $name } провел(а) { $timeCuffedMinutes } минут в наручниках в этом раунде! Что он натворил? diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml index df4f208da0..439e5ca9b0 100644 --- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml @@ -154,8 +154,6 @@ entries: FloorAsteroidCoarseSand0: - id: AsteroidRockMining - - type: GCAbleObject - queue: SpaceDebris - type: IFF flags: HideLabel color: "#d67e27" diff --git a/Resources/Prototypes/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/Entities/World/Debris/wrecks.yml index 32770a7492..a69fd4fbd6 100644 --- a/Resources/Prototypes/Entities/World/Debris/wrecks.yml +++ b/Resources/Prototypes/Entities/World/Debris/wrecks.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseScrapDebris parent: BaseDebris name: Scrap Debris @@ -133,8 +133,6 @@ prob: 0.03 - id: SalvageMobSpawner prob: 0.7 - - type: GCAbleObject - queue: SpaceDebris - type: IFF flags: HideLabel color: "#88b0d1"