From b978cdaa43f1680802b3fd76e562eeb21638df98 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Tue, 18 Jun 2024 20:52:29 +0200 Subject: [PATCH] Remove StampComponent from pens --- Content.Server/Paper/PaperSystem.cs | 4 ---- Content.Shared/Paper/StampComponent.cs | 15 --------------- .../Prototypes/Entities/Objects/Misc/paper.yml | 10 ---------- 3 files changed, 29 deletions(-) diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs index 30a8883ebeb..4020480fe2d 100644 --- a/Content.Server/Paper/PaperSystem.cs +++ b/Content.Server/Paper/PaperSystem.cs @@ -154,10 +154,6 @@ private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUs if (TryComp(args.Used, out var stampComp) && TryStamp(uid, GetStampInfo(stampComp), stampComp.StampState, paperComp)) { - if (stampComp.StampedPersonal) // Frontier - stampComp.StampedName = - Loc.GetString("stamp-component-signee-name", ("user", args.User)); // Frontier - // successfully stamped, play popup var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other", ("user", args.User), ("target", args.Target), ("stamp", args.Used)); diff --git a/Content.Shared/Paper/StampComponent.cs b/Content.Shared/Paper/StampComponent.cs index 54315a9a39c..f55d3458ebd 100644 --- a/Content.Shared/Paper/StampComponent.cs +++ b/Content.Shared/Paper/StampComponent.cs @@ -61,19 +61,4 @@ public sealed partial class StampComponent : Component [DataField("sound")] public SoundSpecifier? Sound = null; - /// - /// Frontier - The stamp using the person name on it - /// - [DataField("stampedPersonal")] - public bool StampedPersonal = false; - - [DataField("stampedBorderless")] - public bool StampedBorderless = false; - - [ViewVariables] - public EntityUid? StampedIdUser = null; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("nameSetUser")] - public bool NameSetUser { get; set; } } diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 18a73ff1d84..ff552d7a58e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -307,16 +307,6 @@ - type: PhysicalComposition materialComposition: Steel: 25 - - type: Stamp - stampedColor: "#000001" - stampState: "paper_stamp-generic" - stampedPersonal: true - stampedBorderless: true - sound: - path: /Audio/_NF/Items/Pen/pen_sign.ogg - params: - volume: -2 - maxDistance: 5 - type: entity parent: Pen