diff --git a/Content.Server/Tabletop/TabletopSystem.Map.cs b/Content.Server/Tabletop/TabletopSystem.Map.cs index 362fbc5550..33f0b40d1b 100644 --- a/Content.Server/Tabletop/TabletopSystem.Map.cs +++ b/Content.Server/Tabletop/TabletopSystem.Map.cs @@ -1,5 +1,6 @@ using System.Numerics; using Content.Shared.GameTicking; +using Content.Shared.Shuttles.Components; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -53,6 +54,8 @@ namespace Content.Server.Tabletop var mapUid = _mapManager.GetMapEntityId(TabletopMap); var mapComp = EntityManager.GetComponent(mapUid); + _metaData.SetEntityName(mapUid, Loc.GetString("tabletop-chess-dimension")); + AddComp(mapUid); // Lighting is always disabled in tabletop world. mapComp.LightingEnabled = false; diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs index c2bb8426fc..9409ff0af6 100644 --- a/Content.Server/Tabletop/TabletopSystem.Session.cs +++ b/Content.Server/Tabletop/TabletopSystem.Session.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Server.Shuttles.Components; using Content.Server.Tabletop.Components; using Content.Shared.Tabletop.Events; using Robust.Shared.Player; @@ -31,6 +32,12 @@ namespace Content.Server.Tabletop // Since this is the first time opening this session, set up the game tabletop.Setup.SetupTabletop(session, EntityManager); + var randomEntity = session.Entities.FirstOrNull(); + if (randomEntity != null) + { + AddComp(randomEntity.Value); + } + Log.Info($"Created tabletop session number {tabletop} at position {session.Position}."); return session; diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs index 4376ec4bc6..7c8ee652d8 100644 --- a/Content.Server/Tabletop/TabletopSystem.cs +++ b/Content.Server/Tabletop/TabletopSystem.cs @@ -23,6 +23,7 @@ namespace Content.Server.Tabletop [Dependency] private readonly EyeSystem _eye = default!; [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Resources/Locale/en-US/tabletop/tabletop.ftl b/Resources/Locale/en-US/tabletop/tabletop.ftl index b2bacd1649..848eaedda7 100644 --- a/Resources/Locale/en-US/tabletop/tabletop.ftl +++ b/Resources/Locale/en-US/tabletop/tabletop.ftl @@ -20,3 +20,6 @@ tabletop-checkers-board-name = Checkers ## Battlemap tabletop-battlemap-board-name = Battlemap + +## The Chess Dimension +tabletop-chess-dimension = The Chess Dimension