From 864c12bac2c0a385ff80dc1ade2ceeb34bc5ab3a Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Sat, 4 Jan 2025 08:26:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=83=D0=BF=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Construction/FlatpackSystem.cs | 3 ++- Content.Server/Lathe/LatheSystem.cs | 7 ++----- .../_Sunrise/DontSellingGrid/DontSellingGridSystems.cs | 2 +- Content.Shared/Construction/SharedFlatpackSystem.cs | 2 ++ .../_Sunrise/Economy}/DontSellComponent.cs | 2 +- Resources/Changelog/ChangelogSunrise.yml | 8 ++++++++ 6 files changed, 16 insertions(+), 8 deletions(-) rename {Content.Server/_Sunrise/DontSellingGrid => Content.Shared/_Sunrise/Economy}/DontSellComponent.cs (69%) diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs index 11303e7f2ee..d7b3f334952 100644 --- a/Content.Server/Construction/FlatpackSystem.cs +++ b/Content.Server/Construction/FlatpackSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Audio; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; +using Content.Shared._Sunrise.Economy; using Content.Shared.Construction; using Content.Shared.Construction.Components; using Content.Shared.Containers.ItemSlots; @@ -102,6 +102,7 @@ private void FinishPacking(Entity ent, bool interrupte return; var flatpack = Spawn(comp.BaseFlatpackPrototype, Transform(ent).Coordinates); + EnsureComp(flatpack); // Sunrise-Edit SetupFlatpack(flatpack, proto, board); Del(board); } diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 4f817daf778..78d513c2e82 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -1,15 +1,14 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; -using Content.Server._Sunrise.DontSellingGrid; using Content.Server.Administration.Logs; using Content.Server.Atmos.EntitySystems; using Content.Server.Fluids.EntitySystems; using Content.Server.Lathe.Components; using Content.Server.Materials; using Content.Server.Popups; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Stack; +using Content.Shared._Sunrise.Economy; using Content.Shared.Atmos; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; @@ -17,7 +16,6 @@ using Content.Shared.UserInterface; using Content.Shared.Database; using Content.Shared.Emag.Components; -using Content.Shared.Examine; using Content.Shared.Lathe; using Content.Shared.Materials; using Content.Shared.Power; @@ -230,8 +228,7 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro if (comp.CurrentRecipe.Result is { } resultProto) { var result = Spawn(resultProto, Transform(uid).Coordinates); - // Sunrise-Edit - EnsureComp(result); + EnsureComp(result); // Sunrise-Edit _stack.TryMergeToContacts(result); } diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs index 9b5ae567b99..379fd1990af 100644 --- a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs +++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs @@ -1,7 +1,7 @@ using Content.Server.Cargo.Components; using Content.Server.Cargo.Systems; -using Content.Server.GameTicking; using Content.Server.Station.Events; +using Content.Shared._Sunrise.Economy; using Content.Shared.GameTicking; using Robust.Shared.Containers; diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs index a83948b1674..f3358031d23 100644 --- a/Content.Shared/Construction/SharedFlatpackSystem.cs +++ b/Content.Shared/Construction/SharedFlatpackSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared._Sunrise.Economy; using Content.Shared.Construction.Components; using Content.Shared.Administration.Logs; using Content.Shared.Containers.ItemSlots; @@ -93,6 +94,7 @@ private void OnFlatpackInteractUsing(Entity ent, ref Interact if (_net.IsServer) { var spawn = Spawn(comp.Entity, _map.GridTileToLocal(grid, gridComp, buildPos)); + EnsureComp(spawn); // Sunrise-Edit _adminLogger.Add(LogType.Construction, LogImpact.Low, $"{ToPrettyString(args.User):player} unpacked {ToPrettyString(spawn):entity} at {xform.Coordinates} from {ToPrettyString(uid):entity}"); diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs b/Content.Shared/_Sunrise/Economy/DontSellComponent.cs similarity index 69% rename from Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs rename to Content.Shared/_Sunrise/Economy/DontSellComponent.cs index 6ee893a2478..7684106af5a 100644 --- a/Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs +++ b/Content.Shared/_Sunrise/Economy/DontSellComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server._Sunrise.DontSellingGrid; +namespace Content.Shared._Sunrise.Economy; /// /// diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 2b303439f27..0912e8af479 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9566,3 +9566,11 @@ type: Add id: 667 time: '2025-01-04T04:05:23.286347+00:00' +- author: VigersRay + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0430\u0431\u0443\ + \u0437 \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0438 \u0443\u043F\u0430\ + \u043A\u043E\u0432\u0449\u0438\u043A\u043E\u043C." + type: Fix + id: 668 + time: '2025-01-04T05:25:54.588559+00:00'