Add protected stamps and a weaker cyberpen (#2698)

new-frontiers-14 · Jan 16, 2025 · 5ca4890 · 5ca4890
1 parent 8b707fd
commit 5ca4890
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 8 deletions.
diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs
@@ -12,7 +12,8 @@
 using Content.Shared.Timing; // Frontier
 using Content.Shared.Access.Systems; // Frontier
 using Content.Shared.Verbs; // Frontier
-using Content.Shared.Ghost; // Frontier
+using Content.Shared.Ghost;
+using Content.Shared.Mobs; // Frontier
 
 namespace Content.Shared.Paper;
 
@@ -134,7 +135,8 @@ private void OnExamined(Entity<PaperComponent> entity, ref ExaminedEvent args)
     private void OnInteractUsing(Entity<PaperComponent> entity, ref InteractUsingEvent args)
     {
         // only allow editing if there are no stamps or when using a cyberpen
-        var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps");
+        var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps")
+                       || _tagSystem.HasTag(args.Used, "NFWriteIgnoreUnprotectedStamps") && !_tagSystem.HasTag(entity, "NFPaperStampProtected"); // Frontier: protected stamps
         if (_tagSystem.HasTag(args.Used, "Write") && editable)
         {
             if (entity.Comp.EditingDisabled)
@@ -184,9 +186,15 @@ private void OnInteractUsing(Entity<PaperComponent> entity, ref InteractUsingEve
 
                 _audio.PlayPredicted(stampComp.Sound, entity, args.User);
 
-                UpdateUserInterface(entity);
+                // Frontier: stamp delay and protection
+                DelayStamp(args.Used);
+
+                // Note: mode is not changed here, anyone with an open paper may still save changes.
+                if (stampComp.Protected)
+                    _tagSystem.AddTag(entity, "NFPaperStampProtected");
+                // End Frontier
 
-                DelayStamp(args.Used); // Frontier: prevent stamp spam
+                UpdateUserInterface(entity);
             } // Frontier: added an indent level
         }
     }

diff --git a/Content.Shared/Paper/StampComponent.cs b/Content.Shared/Paper/StampComponent.cs
@@ -64,11 +64,18 @@ public sealed partial class StampComponent : Component
     [DataField("sound")]
     public SoundSpecifier? Sound = null;
 
-    // Frontier: allow reapplying stamps
+    // Frontier: allow reapplying stamps, protected stamps
     /// <summary>
     /// Whether or not a stamp can be reapplied
     /// </summary>
     [DataField("reapply")]
     public bool Reapply { get; set; } = false;
-    // End Frontier: allow reapplying stamps
+
+    /// <summary>
+    /// When true, stamped papers are marked as protected
+    /// </summary>
+
+    [DataField]
+    public bool Protected = false;
+    // End Frontier
 }
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -69,7 +69,7 @@
 
 - type: entity
   id: BaseAdvancedPen
-  parent: [PenEmbeddable, BaseC3SyndicateContraband] # Frontier: add BaseC3SyndicateContraband
+  parent: PenEmbeddable
   abstract: true
   components:
   - type: Tag
@@ -93,7 +93,8 @@
 
 - type: entity
   name: Cybersun pen
-  parent: [BaseAdvancedPen, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  # parent: [BaseAdvancedPen, BaseSyndicateContraband] # Frontier
+  parent: [NFBaseUnprotectedAdvancedPen, BaseC3SyndicateContraband] # Frontier
   id: CyberPen
   description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -64,6 +64,7 @@
     stampedName: stamp-component-stamped-name-centcom
     stampedColor: "#006600"
     stampState: "paper_stamp-centcom"
+    protected: True # Frontier
   - type: Sprite
     state: stamp-centcom
 

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/pen.yml
@@ -10,3 +10,15 @@
   - type: Item
     sprite: _NF/Objects/Misc/pens.rsi
     heldPrefix: pen_pal
+
+- type: entity
+  id: NFBaseUnprotectedAdvancedPen
+  parent: BaseAdvancedPen
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - Write
+    - NFWriteIgnoreUnprotectedStamps # Weaker version of WriteIgnoreStamps
+    - Pickaxe
+    - Pen
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/rubber_stamp.yml
@@ -7,6 +7,7 @@
     stampedName: stamp-component-stamped-name-sr
     stampedColor: "#6ec0ea"
     stampState: "paper_stamp-hop"
+    protected: True
   - type: Sprite
     state: stamp-hop
 
@@ -34,6 +35,7 @@
     stampedName: stamp-component-stamped-name-hos
     stampedColor: "#4c653a"
     stampState: "paper_stamp-nf-sheriff"
+    protected: True
   - type: Sprite
     sprite: _NF/Objects/Misc/stamps.rsi
     state: stamp-sheriff

diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
@@ -153,3 +153,9 @@
 
 - type: Tag
   id: NFFoamRPG
+
+- type: Tag
+  id: NFWriteIgnoreUnprotectedStamps
+
+- type: Tag
+  id: NFPaperStampProtected