From e1ff79b4b118b35467aa267aac22875ac036756b Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 13 Dec 2023 21:33:31 +0000 Subject: [PATCH] let cyberpen edit stamped papers (#22457) * let cyberpen edit stamped papers * desc * little more desc --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Server/Paper/PaperSystem.cs | 4 +++- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 1 + Resources/Prototypes/tags.yml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs index 5e1a076af3..304507bdeb 100644 --- a/Content.Server/Paper/PaperSystem.cs +++ b/Content.Server/Paper/PaperSystem.cs @@ -100,7 +100,9 @@ namespace Content.Server.Paper private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUsingEvent args) { - if (_tagSystem.HasTag(args.Used, "Write") && paperComp.StampedBy.Count == 0) + // only allow editing if there are no stamps or when using a cyberpen + var editable = paperComp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps"); + if (_tagSystem.HasTag(args.Used, "Write") && editable) { var writeEvent = new PaperWriteEvent(uid, args.User); RaiseLocalEvent(args.Used, ref writeEvent); diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index eed0d64bd1..55bcb94c57 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -267,7 +267,7 @@ uplink-clothing-outer-hardsuit-juggernaut-desc = Hyper resilient armor made of m # Misc uplink-cyberpen-name = Cybersun Pen -uplink-cyberpen-desc = Cybersun's legal department pen. Smells vaguely of hard-light and war profiteering. +uplink-cyberpen-desc = Cybersun's legal department pen, invaluable for forging documents and escaping prisons. Smells vaguely of hard-light and war profiteering. uplink-decoy-disk-name = Decoy Nuclear Disk uplink-decoy-disk-desc = A piece of plastic with a lenticular printing, made to look like a nuclear auth disk. diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index bade790a9c..85c3d67467 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -259,6 +259,7 @@ - type: Tag tags: - Write + - WriteIgnoreStamps - Pickaxe - type: Sprite sprite: Objects/Misc/bureaucracy.rsi diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 420249319b..7793d47d37 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1110,6 +1110,9 @@ - type: Tag id: Write +- type: Tag + id: WriteIgnoreStamps + - type: Tag id: RifleStock -- 2.51.2