From bf22b1b408f147df6dbf80537fd7cbdb80b12a29 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:40:00 +0200
Subject: [PATCH 1/7] Remove StampComponent from pens (#1540)

---
 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<StampComponent>(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;
 
-    /// <summary>
-    /// Frontier - The stamp using the person name on it
-    /// </summary>
-    [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

From c82ca2ea106bc565fb6221a2f0053ce602b03abd Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Wed, 19 Jun 2024 07:40:25 +0000
Subject: [PATCH 2/7] Automatic Changelog (#1540)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 693e6782744..803e4c0cdfd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5135,3 +5135,11 @@ Entries:
         searchlight.
   id: 5046
   time: '2024-06-18T01:10:11.0000000+00:00'
+- author: TsjipTsjip
+  changes:
+    - type: Fix
+      message: >-
+        Left clicking a signed/stamped paper won't add a bogus signature onto it
+        anymore.
+  id: 5047
+  time: '2024-06-19T07:40:00.0000000+00:00'

From 3481d198dfdc02b6101aaf3eb13d769e867e6be7 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:49:51 +0300
Subject: [PATCH 3/7] Dungeon Weapon Spawner Rebalance (#1543)

* Dungeon Weapon Spawner Rebalance

* lower chances on weap cases
---
 .../Random/dungeon_items_mercenary.yml        | 14 +++------
 .../Spawners/Random/dungeon_items_weapons.yml | 30 +++++++++----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index 7380774ccc0..17358578172 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -96,12 +96,10 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShort
-    - WeaponCaseLong
     - SpawnDungeonLootGunT1
     - SpawnDungeonLootGunT1
     - SpawnDungeonLootMeleeT1
-    chance: 0.8
+    chance: 0.5
     offset: 0.0
     rarePrototypes:
     - WeaponCaseShort
@@ -128,12 +126,10 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShort
-    - WeaponCaseLong
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootMeleeT2
-    chance: 0.8
+    chance: 0.7
     offset: 0.0
     rarePrototypes:
     - WeaponCaseShort
@@ -162,7 +158,7 @@
     prototypes:
     - SpawnDungeonLootMeleeT1
     - SpawnDungeonLootMeleeT2
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
@@ -185,12 +181,10 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShort
-    - WeaponCaseLong
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootMeleeT3
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - WeaponCaseShort
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 1af5bb1a8d4..4ebd4e4bb11 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -62,7 +62,7 @@
     - WhiteCane
     - CombatKnife
     - SurvivalKnife
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT2
@@ -93,7 +93,7 @@
     - WeaponCaseLongShotgunDoubleBarreledExpedition
     - WeaponCaseShortSawnExpedition
     - WeaponCaseLongMosinExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT2
@@ -118,7 +118,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortFireBomb
-    chance: 0.95
+    chance: 0.3
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootExplosivesT2
@@ -150,7 +150,7 @@
     - KukriKnife
     - Stunbaton
     - ThrowingKnife
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
@@ -181,7 +181,7 @@
     - WeaponCaseLongKammererExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT3
@@ -206,7 +206,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortPipeBomb
-    chance: 0.95
+    chance: 0.4
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootExplosivesT3
@@ -236,7 +236,7 @@
     - Claymore
     - Truncheon
     - WeaponCaseShortEnergyDaggerExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT4
@@ -265,7 +265,7 @@
     - WeaponCaseLongLecterExpedition
     - WeaponCaseLongLaserCarbineExpedition
     - WeaponCaseLongHristovExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT4
@@ -290,7 +290,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortSeismicCharge
-    chance: 0.95
+    chance: 0.5
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootExplosivesT4
@@ -320,7 +320,7 @@
     - SecBreachingHammer
     - WeaponCaseShortEnergySwordExpedition
     - WeaponCaseShortEnergyCutlassExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT5
@@ -350,7 +350,7 @@
     - WeaponCaseLongAkExpedition
     - WeaponCaseShortSvalinnExpedition
     - WeaponCaseShortAdvancedLaserExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT5
@@ -375,7 +375,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortExGrenade
-    chance: 0.95
+    chance: 0.4
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootExplosivesT5
@@ -401,7 +401,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortEnergySwordDoubleExpedition
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
 
 - type: entity
@@ -427,7 +427,7 @@
     - WeaponCaseLongLauncherRocketExpedition
     - WeaponCaseLongLauncherChinaLake
     - WeaponCaseLongLightMachineGunL6
-    chance: 0.95
+    chance: 1.0
     offset: 0.0
 
 - type: entity
@@ -449,5 +449,5 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseShortC4
-    chance: 0.95
+    chance: 0.3
     offset: 0.0

From 4805fdbe4a37e83a752e9dbb2fad33cb931e99b0 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Wed, 19 Jun 2024 18:37:56 +0200
Subject: [PATCH 4/7] Add missing suffixes. (#1544)

---
 .../_NF/Entities/Structures/Doors/Airlocks/access.yml          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
index bf4127a2323..ac4053b1ccd 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
@@ -47,6 +47,7 @@
 - type: entity
   parent: [ AirlockEngineering, AirlockFrontierCommandLocked]
   id: AirlockFrontierCommandEngineeringLocked
+  suffix: Frontier Command, Locked
   components:
   - type: ContainerFill
     containers:
@@ -209,6 +210,7 @@
 - type: entity
   parent: [ AirlockEngineeringGlass, AirlockFrontierCommandGlassLocked]
   id: AirlockFrontierCommandEngineeringGlassLocked
+  suffix: Frontier Command, Locked
   components:
   - type: ContainerFill
     containers:
@@ -217,6 +219,7 @@
 - type: entity
   parent: [ AirlockAtmosphericsGlass, AirlockFrontierCommandGlassLocked]
   id: AirlockFrontierCommandAtmosphericsGlassLocked
+  suffix: Frontier Command, Locked
   components:
   - type: ContainerFill
     containers:

From 3ee2dbf2cf6a0d34c4b3fb185cdd48d8cc9721f9 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Wed, 19 Jun 2024 21:45:27 +0300
Subject: [PATCH 5/7] IFF Strobe Buff (#1542)

---
 .../mercenary_iff.rsi/equipped-NECK-on.png    | Bin 5896 -> 7196 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-on.png b/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-on.png
index 12f7cd6ebc395b940fbaaa60fd09ab7101f06060..a030c05a365900ed45bac8ad38770f58aadf6758 100644
GIT binary patch
delta 3064
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
GLSTX#@}oNd

delta 1913
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
z000000002k$7aB000000+)~K$0{{R3000000002+A6<W4e*gdgy39<P@8S0R00000
z000000002&=7)gI0000000000000000PxxczgRYHAl`|H00000NkvXXu0mjfD3fpD


From a758a2e341be326cbdbfe05a113d5e2ed0dc6e33 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Wed, 19 Jun 2024 18:45:55 +0000
Subject: [PATCH 6/7] Automatic Changelog (#1542)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 803e4c0cdfd..475f6a46950 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5143,3 +5143,9 @@ Entries:
         anymore.
   id: 5047
   time: '2024-06-19T07:40:00.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: IFF strobes now come with more powerful LEDs.
+  id: 5048
+  time: '2024-06-19T18:45:27.0000000+00:00'

From 4f7cc5bb4470e6f872fc794eb96621da7b0a45eb Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 20 Jun 2024 05:03:18 -0400
Subject: [PATCH 7/7] Loadouts: fix empty SR messenger bag (#1545)

* Loadouts: fix empty SR messenger bag

* SR loadout: use green messenger bag variant
---
 .../_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml | 2 +-
 .../Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml      | 8 ++++----
 .../Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml
index c6055a3a717..14c65e69a99 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml
@@ -136,7 +136,7 @@
 
 - type: entity
   noSpawn: true
-  parent: [ClothingBackpackMessenger, ClothingBackpackSrFilled]
+  parent: [ClothingBackpackMessengerSr, ClothingBackpackSrFilled]
   id: ClothingBackpackMessengerSrFilled
 
 - type: entity
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
index f9e540f439b..f6cbdb42101 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
@@ -29,14 +29,14 @@
     back: ClothingBackpackSatchelSrFilled
 
 - type: loadout
-  id: StationRepClothingBackpackMessengerSr
-  equipment: StationRepClothingBackpackMessengerSr
+  id: StationRepClothingBackpackMessengerSrFilled
+  equipment: StationRepClothingBackpackMessengerSrFilled
   price: 0
 
 - type: startingGear
-  id: StationRepClothingBackpackMessengerSr
+  id: StationRepClothingBackpackMessengerSrFilled
   equipment:
-    back: ClothingBackpackMessengerSr
+    back: ClothingBackpackMessengerSrFilled
 
 - type: loadout
   id: StationRepClothingBackpackIanFilled
diff --git a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
index 15ea524039d..7f08d0ffd51 100644
--- a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
@@ -13,7 +13,7 @@
   - StationRepClothingBackpackSrFilled
   - StationRepClothingBackpackDuffelSrFilled
   - StationRepClothingBackpackSatchelSrFilled
-  - StationRepClothingBackpackMessengerSr
+  - StationRepClothingBackpackMessengerSrFilled
   - StationRepClothingBackpackIanFilled #We put the ian bag here so its not default, we also let SR pick a bag out of drip concerns.
   
 - type: loadoutGroup