MergeConflict

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));

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; }
 }

Resources/Changelog/Changelog.yml

@@ -5135,3 +5135,17 @@ 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'
+- 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'

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -309,16 +309,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

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

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
@@ -130,12 +128,10 @@
     prototypes:
     - WeaponCaseWeaponSubMachineGunVector45Expedition #CorvaxFrontier
     - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier
-    - WeaponCaseShort
-    - WeaponCaseLong
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootMeleeT2
-    chance: 0.8
+    chance: 0.7
     offset: 0.0
     rarePrototypes:
     - WeaponCaseShort
@@ -164,7 +160,7 @@
     prototypes:
     - SpawnDungeonLootMeleeT1
     - SpawnDungeonLootMeleeT2
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
@@ -187,12 +183,10 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShort
-    - WeaponCaseLong
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootMeleeT3
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - WeaponCaseShort

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

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:

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

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