kill me

This reverts commit 1ce0349aeb.

Content.Server/StationRecords/Systems/StationRecordsSystem.cs

@@ -45,7 +45,7 @@ public sealed class StationRecordsSystem : SharedStationRecordsSystem
     [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier
     [Dependency] private readonly ForensicsSystem _forensics = default!; // Frontier
 
-    static readonly ProtoId<JobPrototype>[] FakeJobIds = ["Contractor", "Pilot", "Mercenary"]; // Frontier
+    static readonly ProtoId<JobPrototype>[] FakeJobIds = ["Contractor", "Mercenary"]; // Frontier, Mono, nuked Pilot fake id
 
     public override void Initialize()
     {

Content.Server/_Mono/Detection/ThermalSignatureSystem.cs

@@ -9,7 +9,6 @@ using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
-using System;
 
 namespace Content.Server._Mono.Detection;
 
@@ -21,18 +20,22 @@ public sealed class ThermalSignatureSystem : EntitySystem
     [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private float _updateInterval = 0.5f;
-    private float _updateAccumulator = 0f;
-    private EntityQuery<MapGridComponent> _gridQuery;
+    private const float UpdateIntervalSeconds = 1f;
+    private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(UpdateIntervalSeconds);
+    private TimeSpan _nextUpdateTime;
+
+    private const float HeatChangeThreshold = 1.02f;
+
     private EntityQuery<ThermalSignatureComponent> _sigQuery;
     private EntityQuery<GunComponent> _gunQuery;
-
-    private Dictionary<EntityUid, ThermalSignatureComponent> _gridCompMap = new();
+    private EntityQuery<MapGridComponent> _mapGridQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<GridInitializeEvent>(OnGridInitialized);
+
         // some of this could also be handled in shared but there's no point since PVS is a thing
         SubscribeLocalEvent<MachineThermalSignatureComponent, GetThermalSignatureEvent>(OnMachineGetSignature);
         SubscribeLocalEvent<PassiveThermalSignatureComponent, GetThermalSignatureEvent>(OnPassiveGetSignature);
@@ -42,9 +45,14 @@ public sealed class ThermalSignatureSystem : EntitySystem
         SubscribeLocalEvent<ThrusterComponent, GetThermalSignatureEvent>(OnThrusterGetSignature);
         SubscribeLocalEvent<FTLDriveComponent, GetThermalSignatureEvent>(OnFTLGetSignature);
 
-        _gridQuery = GetEntityQuery<MapGridComponent>();
         _sigQuery = GetEntityQuery<ThermalSignatureComponent>();
         _gunQuery = GetEntityQuery<GunComponent>();
+        _mapGridQuery = GetEntityQuery<MapGridComponent>();
+    }
+
+    private void OnGridInitialized(GridInitializeEvent args)
+    {
+        EnsureComp<ThermalSignatureComponent>(args.EntityUid);
     }
 
     private void OnGunShot(Entity<ThermalSignatureComponent> ent, ref GunShotEvent args)
@@ -87,48 +95,45 @@ public sealed class ThermalSignatureSystem : EntitySystem
 
     public override void Update(float frameTime)
     {
-        _updateAccumulator += frameTime;
-        if (_updateAccumulator < _updateInterval)
+        if (_timing.CurTime < _nextUpdateTime)
             return;
-        _updateAccumulator -= _updateInterval;
 
-        var interval = _updateInterval;
+        _nextUpdateTime = _timing.CurTime + UpdateInterval;
 
-        _gridCompMap.Clear();
-
-        var gridQuery = EntityQueryEnumerator<MapGridComponent>();
-        while (gridQuery.MoveNext(out var uid, out _))
+        var gridQuery = EntityQueryEnumerator<MapGridComponent, ThermalSignatureComponent>();
+        while (gridQuery.MoveNext(out _, out _, out var gridSigComp))
         {
-            if (!_sigQuery.TryComp(uid, out var sigComp))
-                sigComp = EnsureComp<ThermalSignatureComponent>(uid);
-
-            sigComp.TotalHeat = 0f;
-            _gridCompMap.Add(uid, sigComp);
+            gridSigComp.TotalHeat = 0f;
         }
 
         var query = EntityQueryEnumerator<ThermalSignatureComponent>();
         while (query.MoveNext(out var uid, out var sigComp))
         {
-            var ev = new GetThermalSignatureEvent(interval);
+            var ev = new GetThermalSignatureEvent();
             RaiseLocalEvent(uid, ref ev);
-            sigComp.StoredHeat += ev.Signature * interval;
-            sigComp.StoredHeat *= MathF.Pow(sigComp.HeatDissipation, interval);
-            if (_gridCompMap.ContainsKey(uid))
+
+            sigComp.StoredHeat += ev.Signature * UpdateIntervalSeconds;
+            sigComp.StoredHeat *= MathF.Pow(sigComp.HeatDissipation, UpdateIntervalSeconds);
+
+            if (_mapGridQuery.HasComp(uid))
             {
                 sigComp.TotalHeat += sigComp.StoredHeat;
+
+                // don't sync it if it didn't change heat much since last time, we don't need to sync 500 cold asteroids every system update
+                if (sigComp.TotalHeat <= sigComp.LastUpdateHeat * HeatChangeThreshold
+                    && sigComp.TotalHeat >= sigComp.LastUpdateHeat / HeatChangeThreshold)
+                    continue;
+
+                sigComp.LastUpdateHeat = sigComp.TotalHeat;
+                Dirty(uid, sigComp);
             }
             else
             {
                 var xform = Transform(uid);
                 sigComp.TotalHeat = sigComp.StoredHeat;
-                if (xform.GridUid != null && _gridCompMap.TryGetValue(xform.GridUid.Value, out var gridSig))
+                if (xform.GridUid != null && _sigQuery.TryGetComponent(xform.GridUid.Value, out var gridSig))
                     gridSig.TotalHeat += sigComp.StoredHeat;
             }
         }
-
-        foreach (var (uid, sigComp) in _gridCompMap)
-        {
-            Dirty(uid, sigComp); // sync to client
-        }
     }
 }

Content.Server/_Mono/Radar/RadarBlipSystem.cs

@@ -107,7 +107,8 @@ public sealed partial class RadarBlipSystem : EntitySystem
             if (blipGrid != null)
             {
                 var gridXform = Transform(blipGrid.Value);
-                blipVelocity -= _physics.GetLinearVelocity(blipGrid.Value, coord.Position);
+                if (TryComp<PhysicsComponent>(blipGrid.Value, out var gridBody)) // prevent log spam
+                    blipVelocity -= _physics.GetLinearVelocity(blipGrid.Value, coord.Position, gridBody);
                 // it's local-frame velocity so rotate it too
                 blipVelocity = (-gridXform.LocalRotation).RotateVec(blipVelocity);
                 // and also offset the rotation

Content.Server/_Mono/VendingMachine/VendingMachinePurchaseSystem.cs

@@ -38,7 +38,6 @@ public sealed class VendingMachinePurchaseSystem : EntitySystem
         var purchaseComponent = AddComp<VendingMachinePurchaseComponent>(purchasedEntity);
         purchaseComponent.PurchaseGrid = vendingTransform.GridUid.Value;
         purchaseComponent.OriginalPurchasePrice = purchasePrice;
-        purchaseComponent.VendingMachine = vendingMachine;
 
         Dirty(purchasedEntity, purchaseComponent);
     }

Content.Server/_NF/CryoSleep/CryoSleepSystem.cs

@@ -422,6 +422,8 @@ public sealed partial class CryoSleepSystem : SharedCryoSleepSystem
             // Check if job is one of the pirate jobs
             isPirate = jobTitle.Equals(Loc.GetString("job-name-pirate"), StringComparison.OrdinalIgnoreCase) ||
                        jobTitle.Equals(Loc.GetString("job-name-pirate-captain"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-denasvar"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-infiltrator"), StringComparison.OrdinalIgnoreCase) ||
                        jobTitle.Equals(Loc.GetString("job-name-pirate-first-mate"), StringComparison.OrdinalIgnoreCase);
         }
 
@@ -432,12 +434,9 @@ public sealed partial class CryoSleepSystem : SharedCryoSleepSystem
             isTSF = jobTitle.Equals(Loc.GetString("job-name-bailiff"), StringComparison.OrdinalIgnoreCase) ||
                     jobTitle.Equals(Loc.GetString("job-name-brigmedic"), StringComparison.OrdinalIgnoreCase) ||
                     jobTitle.Equals(Loc.GetString("job-name-cadet-nf"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-senior-officer"), StringComparison.OrdinalIgnoreCase) ||
                     jobTitle.Equals(Loc.GetString("job-name-deputy"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-nf-detective"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-sheriff"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-stc"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-sr"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-pal"), StringComparison.OrdinalIgnoreCase);
+                    jobTitle.Equals(Loc.GetString("job-name-sheriff"), StringComparison.OrdinalIgnoreCase);
         }
 
         // Send radio message on appropriate channel

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -47,7 +47,7 @@ public sealed partial class IdCardConsoleComponent : Component
     {
         "Armory",
         //"Atmospherics",
-        "Bailiff", // Frontier
+        "TsfCaptain", // Frontier
         //"Bar",
         "Brig",
         "Detective",
@@ -77,7 +77,7 @@ public sealed partial class IdCardConsoleComponent : Component
         //"ResearchDirector",
         //"Salvage",
         "Security",
-        "Sergeant", // Frontier
+        "TsfFTL", // Frontier
         "Service",
         "StationTrafficController", // Frontier
         //"USSP", // Mono

Content.Shared/_Mono/Detection/ThermalSignatureComponent.cs

@@ -9,6 +9,9 @@ namespace Content.Shared._Mono.Detection;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ThermalSignatureComponent : Component
 {
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float LastUpdateHeat = 0f;
+
     [DataField]
     public float StoredHeat = 0f;
 

Content.Shared/_Mono/VendingMachine/VendingMachinePurchaseComponent.cs

@@ -22,11 +22,4 @@ public sealed partial class VendingMachinePurchaseComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public double OriginalPurchasePrice;
-
-    /// <summary>
-    /// The entity ID of the vending machine this was purchased from.
-    /// Stored for reference and potential future features.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid VendingMachine;
 }

Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs

@@ -73,7 +73,7 @@ public sealed partial class VesselPrototype : IPrototype, IInheritingPrototype
     public List<VesselEngine> Engines = new();
 
     /// <summary>
-    ///     The access required to buy the product. (e.g. Command, Mail, Bailiff, etc.)
+    ///     The access required to buy the product. (e.g. Command, Mail, Tsf Captain, etc.)
     /// </summary>
     [DataField]
     public string Access = string.Empty;

Resources/Changelog/Monolith.yml

@@ -14775,7 +14775,7 @@ Entries:
     - type: Add
       message: >-
         The DIS Pluto MK. II has pierced it's way on the hull market. A
-        replacement of the honorable Pluto. 
+        replacement of the honorable Pluto.
     - type: Remove
       message: >-
         DIS Pluto hulls are no longer available on the hull market. We will miss
@@ -14885,7 +14885,7 @@ Entries:
     - type: Tweak
       message: >-
         Spasaka sabotage kit has gotten equipment changes to help with boarding
-        as well as receiving the RX-01 suit. 
+        as well as receiving the RX-01 suit.
   id: 1651
   time: '2025-12-13T08:10:05.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/2782
@@ -15226,7 +15226,7 @@ Entries:
     - type: Tweak
       message: >-
         Bluespace crates occur more frequently. By extension there will be fewer
-        solar flares. 
+        solar flares.
     - type: Tweak
       message: >-
         Increased the number of smuggling hints sent out to ships. Happy
@@ -15789,7 +15789,7 @@ Entries:
     - type: Add
       message: >-
         A new challanger! BT-Y Hazel enters the PDV Roster as a small-strafer in
-        place of the Vega featuring a 3 barreled 220m Battery! 
+        place of the Vega featuring a 3 barreled 220m Battery!
     - type: Remove
       message: PDV Vega is now gone, o7.
   id: 1752
@@ -15815,7 +15815,7 @@ Entries:
         The Europa is now a beefy capital ship with medical and cloning
         capabilities. She is now restricted to two vessels active at a time, as
         well as costing 240k. These changes come with the benefit of a heavy
-        upgrade. Glory to Phaethon. 
+        upgrade. Glory to Phaethon.
   id: 1754
   time: '2026-01-05T16:53:42.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/2929
@@ -16677,7 +16677,7 @@ Entries:
     - type: Tweak
       message: >-
         Advanced chemicals now have 0.15u metabolism rate. Pyrazine healing was
-        buffed to 2. 
+        buffed to 2.
     - type: Tweak
       message: Overseer's heavy maul sprite received changes.
   id: 1847
@@ -16904,7 +16904,7 @@ Entries:
     - type: Tweak
       message: >-
         Horizon Energy has begun sale of modernized versions of the Windreign to
-        the Colossus Sector. 
+        the Colossus Sector.
   id: 1871
   time: '2026-02-01T19:28:28.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/3141
@@ -17076,7 +17076,7 @@ Entries:
       message: >-
         the local syndicate outpost has finally invested in some automated
         defenses. woe be the raider who tries to illegally park their ship right
-        in front of the outpost. 
+        in front of the outpost.
   id: 1887
   time: '2026-02-11T01:31:25.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/3044
@@ -17408,7 +17408,7 @@ Entries:
     - type: Tweak
       message: >-
         Mech Fuel Cell now costs Fissile Uranium (1) and Diamond (1) among other
-        cost changes, but auto-regens to full within 4 minutes. 
+        cost changes, but auto-regens to full within 4 minutes.
     - type: Tweak
       message: >-
         Balance pass on Armored Frame (S2/S4 mech) weapons - RAC-6 spreads
@@ -18895,7 +18895,7 @@ Entries:
     - type: Tweak
       message: >-
         The DIS Femur has seen a light rework, see PR for more details. Report
-        feedback & issues to me on discord (@unicornonlsd) 
+        feedback & issues to me on discord (@unicornonlsd)
   id: 2085
   time: '2026-03-26T05:55:13.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/3560
@@ -19158,3 +19158,17 @@ Entries:
   id: 2112
   time: '2026-03-30T16:56:00.0000000+00:00'
   url: https://github.com/Monolith-Station/Monolith/pull/3643
+- author: Redrover1760
+  changes:
+    - type: Tweak
+      message: Biomass spread rate, health, and slowdown reduced.
+  id: 2113
+  time: '2026-04-01T16:22:03.0000000+00:00'
+  url: https://github.com/Monolith-Station/Monolith/pull/3635
+- author: UnicornOnLSD
+  changes:
+    - type: Add
+      message: Management has sent an ore box to the DIS Rig after customer complaints.
+  id: 2114
+  time: '2026-04-01T22:08:49.0000000+00:00'
+  url: https://github.com/Monolith-Station/Monolith/pull/3672

Resources/Locale/en-US/_Mono/job/job-names.ftl

@@ -14,6 +14,55 @@ job-name-md-medic = Emergency Responder
 # MARK: TSF
 job-name-tsf-engineer = TSFMC Engineer
 job-name-tsf-borg = TSFMC Cyborg
+job-name-bailiff = TSFMC Captain
+job-name-brigmedic = TSFMC Corpsman
+job-name-cadet-nf = TSFMC Private
+job-name-deputy = TSFMC Marine
 
 # MARK: PDV
 job-name-pdv-borg = PDV Cyborg
+job-name-pdv-infiltrator = PDV Spasaka
+job-name-pirate = PDV Rahkshan
+job-name-pirate-captain = PDV Grand Vizier
+job-name-pirate-first-mate = PDV Asvaran
+job-name-pdv-denasvar = PDV Denasvar
+
+# Frontier
+
+job-name-contractor = Spacer
+
+job-name-ertmailcarrier = ERT Mail Carrier
+job-name-mercenary = Mercenary
+
+job-name-security-guard = Judge
+job-name-sheriff = TSFMC Colonel
+job-name-stc = Station Traffic Controller
+job-name-sr = Overseer
+job-name-pal = Public Affairs Liaison
+job-name-doc = Director of Care
+
+# Job titles
+job-title-ert-mail-carrier = ERT Mail Carrier
+
+# Role timers - Make these alphabetical or I cut you
+JobERTMailCarrier = ERT Mail Carrier
+JobMercenary = Mercenary
+JobPilot = Pilot
+JobPDVInfiltrator = PDV Spasaka
+JobPirate = PDV Rakhshan
+JobPirateCaptain = PDV Grand Vizier
+JobPirateFirstMate = PDV Asvaran
+JobPirateBoatswain = PDV Denasvar
+JobSecurityGuard = Judge
+JobSTC = Station Traffic Controller
+
+# Upstream Removed
+job-name-senior-engineer = Senior Engineer
+job-name-senior-researcher = Senior Researcher
+job-name-senior-physician = Senior Physician
+job-name-senior-officer = TSFMC Fireteam Leader
+
+JobSeniorEngineer = Senior Engineer
+JobSeniorOfficer = TSFMC Fireteam Leader
+JobSeniorPhysician = Senior Physician
+JobSeniorResearcher = Senior Researcher

Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl

@@ -9,3 +9,10 @@ id-card-access-level-pdv-vizier = PDV Grand Vizier
 id-card-access-level-pdv-command = PDV Command
 
 id-card-access-level-tsf-engineer = TSF Engineering
+id-card-access-level-frontier = TSF
+id-card-access-level-mail = Mail
+id-card-access-level-mercenary = Mercenary
+id-card-access-level-stc = Station Traffic Controller
+id-card-access-level-tsf-ftl = TSFMC Fireteam Leader
+id-card-access-level-tsf-captain = TSFMC Command
+id-card-access-level-pirate = PDV

Resources/Locale/en-US/_NF/job/job-names.ftl

@@ -1,47 +0,0 @@
-# Frontier
-job-name-bailiff = TSFMC Captain
-job-name-brigmedic = TSFMC Corpsman
-job-name-cadet-nf = TSFMC Private
-job-name-contractor = Spacer
-job-name-deputy = TSFMC Marine
-job-name-nf-detective = Detective
-job-name-ertmailcarrier = ERT Mail Carrier
-job-name-mercenary = Mercenary
-job-name-pilot = Pilot
-job-name-pdv-infiltrator = PDV Spasaka
-job-name-pirate = PDV Rahkshan
-job-name-pirate-captain = PDV Grand Vizier
-job-name-pirate-first-mate = PDV Asvaran
-job-name-pdv-denasvar = PDV Denasvar
-job-name-security-guard = Judge
-job-name-sheriff = TSFMC Colonel
-job-name-stc = Station Traffic Controller
-job-name-sr = Overseer
-job-name-pal = Public Affairs Liaison
-job-name-doc = Director of Care
-
-# Job titles
-job-title-ert-mail-carrier = ERT Mail Carrier
-
-# Role timers - Make these alphabetical or I cut you
-JobERTMailCarrier = ERT Mail Carrier
-JobMercenary = Mercenary
-JobPilot = Pilot
-JobPDVInfiltrator = PDV Spasaka
-JobPirate = PDV Rakhshan
-JobPirateCaptain = PDV Grand Vizier
-JobPirateFirstMate = PDV Asvaran
-JobPirateBoatswain = PDV Denasvar
-JobSecurityGuard = Judge
-JobSTC = Station Traffic Controller
-
-# Upstream Removed
-job-name-senior-engineer = Senior Engineer
-job-name-senior-researcher = Senior Researcher
-job-name-senior-physician = Senior Physician
-job-name-senior-officer = TSFMC Fireteam Leader
-
-JobSeniorEngineer = Senior Engineer
-JobSeniorOfficer = TSFMC Fireteam Leader
-JobSeniorPhysician = Senior Physician
-JobSeniorResearcher = Senior Researcher

Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl

@@ -1,8 +0,0 @@
-id-card-access-level-frontier = TSF
-id-card-access-level-pilot = Pilot
-id-card-access-level-mail = Mail
-id-card-access-level-mercenary = Mercenary
-id-card-access-level-stc = Station Traffic Controller
-id-card-access-level-sergeant = TSFMC Fireteam Leader
-id-card-access-level-bailiff = TSFMC Command
-id-card-access-level-pirate = PDV

Resources/Maps/_Mono/Outpost/colonial.yml

@@ -29485,28 +29485,6 @@ entities:
     - type: Transform
       pos: -12.5,22.5
       parent: 2
-- proto: SpawnPointPilot
-  entities:
-  - uid: 4021
-    components:
-    - type: Transform
-      pos: -26.5,17.5
-      parent: 2
-  - uid: 4022
-    components:
-    - type: Transform
-      pos: 1.5,17.5
-      parent: 2
-  - uid: 4023
-    components:
-    - type: Transform
-      pos: -15.5,6.5
-      parent: 2
-  - uid: 4024
-    components:
-    - type: Transform
-      pos: -9.5,6.5
-      parent: 2
 - proto: SpawnPointSecurityGuard
   entities:
   - uid: 4025

Resources/Maps/_Mono/Outpost/colossus_central.yml

@@ -62179,48 +62179,6 @@ entities:
     - type: Transform
       pos: -12.5,55.5
       parent: 2
-- proto: SpawnPointPilot
-  entities:
-  - uid: 8363
-    components:
-    - type: Transform
-      pos: 23.5,42.5
-      parent: 2
-  - uid: 8364
-    components:
-    - type: Transform
-      pos: 23.5,46.5
-      parent: 2
-  - uid: 8365
-    components:
-    - type: Transform
-      pos: 25.5,46.5
-      parent: 2
-  - uid: 8366
-    components:
-    - type: Transform
-      pos: 25.5,42.5
-      parent: 2
-  - uid: 8367
-    components:
-    - type: Transform
-      pos: 27.5,42.5
-      parent: 2
-  - uid: 8368
-    components:
-    - type: Transform
-      pos: 29.5,42.5
-      parent: 2
-  - uid: 8369
-    components:
-    - type: Transform
-      pos: 29.5,46.5
-      parent: 2
-  - uid: 8370
-    components:
-    - type: Transform
-      pos: 27.5,46.5
-      parent: 2
 - proto: SpawnPointSecurityGuard
   entities:
   - uid: 8371

Resources/Maps/_Mono/POI/camelot.yml

@@ -58283,38 +58283,6 @@ entities:
     - type: Transform
       pos: -11.5,5.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 8609
-    components:
-    - type: Transform
-      pos: -8.5,5.5
-      parent: 1
-  - uid: 8610
-    components:
-    - type: Transform
-      pos: -8.5,4.5
-      parent: 1
-  - uid: 8611
-    components:
-    - type: Transform
-      pos: -8.5,3.5
-      parent: 1
-  - uid: 8612
-    components:
-    - type: Transform
-      pos: -11.5,3.5
-      parent: 1
-  - uid: 8613
-    components:
-    - type: Transform
-      pos: -11.5,4.5
-      parent: 1
-  - uid: 8614
-    components:
-    - type: Transform
-      pos: -11.5,5.5
-      parent: 1
 - proto: SpearBone
   entities:
   - uid: 8624

Resources/Maps/_Mono/POI/tsfmchalcyon.yml

@@ -46067,33 +46067,6 @@ entities:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
-- proto: NFSpawnPointDetective
-  entities:
-  - uid: 6993
-    components:
-    - type: Transform
-      pos: 15.5,6.5
-      parent: 1
-  - uid: 6994
-    components:
-    - type: Transform
-      pos: 18.5,14.5
-      parent: 1
-  - uid: 6995
-    components:
-    - type: Transform
-      pos: 22.5,14.5
-      parent: 1
-  - uid: 6996
-    components:
-    - type: Transform
-      pos: 24.5,14.5
-      parent: 1
-  - uid: 6997
-    components:
-    - type: Transform
-      pos: 17.5,5.5
-      parent: 1
 - proto: NFVendingMachineCartNfsd
   entities:
   - uid: 6998

Resources/Maps/_Mono/Shuttles/Expedition/comet.yml

@@ -8286,23 +8286,6 @@ entities:
     - type: Transform
       pos: 16.5,14.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 1079
-    components:
-    - type: Transform
-      pos: 15.5,13.5
-      parent: 1
-  - uid: 1080
-    components:
-    - type: Transform
-      pos: 15.5,14.5
-      parent: 1
-  - uid: 1081
-    components:
-    - type: Transform
-      pos: 16.5,14.5
-      parent: 1
 - proto: SubstationBasic
   entities:
   - uid: 1358

Resources/Maps/_Mono/Shuttles/Expedition/flashpoint.yml

@@ -11535,21 +11535,6 @@ entities:
     - type: Transform
       pos: 16.5,-17.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 1491
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 1
-- proto: StairStageDark
-  entities:
-  - uid: 1492
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-6.5
-      parent: 1
 - proto: StoolBar
   entities:
   - uid: 1493

Resources/Maps/_Mono/Shuttles/arribane.yml

@@ -6562,7 +6562,7 @@ entities:
     - type: Transform
       pos: -5.5,2.5
       parent: 1
-- proto: PirateClothingUniformJumpskirtAtmos
+- proto: ClothingUniformJumpskirtAtmos
   entities:
   - uid: 625
     components:
@@ -6571,7 +6571,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: PirateClothingUniformJumpsuitAtmos
+- proto: ClothingUniformJumpsuitAtmos
   entities:
   - uid: 626
     components:
@@ -6580,7 +6580,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: PirateClothingUniformJumpsuitAtmosCasual
+- proto: ClothingUniformJumpsuitAtmosCasual
   entities:
   - uid: 627
     components:

Resources/Maps/_Mono/Shuttles/bratan.yml

@@ -62,7 +62,7 @@ entities:
       name: grid
     - type: Transform
       pos: -1.53125,0.203125
-      
+
     - type: MapGrid
       chunks:
         0,0:
@@ -11030,7 +11030,7 @@ entities:
       pos: 18.5,5.5
       parent: 1
     - type: DeviceNetwork
-     
+
       deviceLists:
       - 11
     - type: AtmosPipeColor
@@ -11089,7 +11089,7 @@ entities:
       pos: 18.5,4.5
       parent: 1
     - type: DeviceNetwork
-      
+
       deviceLists:
       - 11
     - type: AtmosPipeColor
@@ -12334,11 +12334,11 @@ entities:
         Emergency Generator Terminal
 
 
-        Anchor a generator on this terminal in order to supplement the power grid in case of catastrophic damage to the AME/Solar Panels. 
+        Anchor a generator on this terminal in order to supplement the power grid in case of catastrophic damage to the AME/Solar Panels.
 
 
         (GENERATOR NOT INCLUDED)
-- proto: PirateClothingUniformJumpskirtPrivateSec
+- proto: ClothingUniformJumpskirtPrivateSec
   entities:
   - uid: 1159
     components:
@@ -12347,7 +12347,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: PirateClothingUniformJumpsuitPrivateSec
+- proto: ClothingUniformJumpsuitPrivateSec
   entities:
   - uid: 65
     components:

Resources/Maps/_Mono/Shuttles/spyglass.yml

@@ -3044,18 +3044,6 @@ entities:
     - type: Transform
       pos: 1.5,8.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 352
-    components:
-    - type: Transform
-      pos: 1.5,8.5
-      parent: 1
-  - uid: 358
-    components:
-    - type: Transform
-      pos: -2.5,8.5
-      parent: 1
 - proto: StairStageWhite
   entities:
   - uid: 359

Resources/Maps/_Mono/Test/dev_map.yml

@@ -7888,13 +7888,6 @@ entities:
     - type: Transform
       pos: -4.5,2.5
       parent: 2
-- proto: SpawnPointPilot
-  entities:
-  - uid: 1141
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 2
 - proto: SpawnPointPirate
   entities:
   - uid: 1142
@@ -7930,13 +7923,6 @@ entities:
     - type: Transform
       pos: -4.5,2.5
       parent: 2
-- proto: SpawnPointPublicAffairsLiaison
-  entities:
-  - uid: 1147
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 2
 - proto: SpawnPointSecurityGuard
   entities:
   - uid: 1148

Resources/Maps/_NF/Outpost/frontier.yml

@@ -32044,58 +32044,6 @@ entities:
     - type: Transform
       pos: -0.5,2.5
       parent: 2173
-- proto: SpawnPointPilot
-  entities:
-  - uid: 2231
-    components:
-    - type: Transform
-      pos: 9.5,28.5
-      parent: 2173
-  - uid: 2343
-    components:
-    - type: Transform
-      pos: 24.5,26.5
-      parent: 2173
-  - uid: 2405
-    components:
-    - type: Transform
-      pos: -1.5,22.5
-      parent: 2173
-  - uid: 2411
-    components:
-    - type: Transform
-      pos: 44.5,26.5
-      parent: 2173
-  - uid: 4487
-    components:
-    - type: Transform
-      pos: 20.5,4.5
-      parent: 2173
-  - uid: 4488
-    components:
-    - type: Transform
-      pos: 38.5,1.5
-      parent: 2173
-  - uid: 6166
-    components:
-    - type: Transform
-      pos: 9.5,1.5
-      parent: 2173
-  - uid: 6167
-    components:
-    - type: Transform
-      pos: -10.5,1.5
-      parent: 2173
-  - uid: 6168
-    components:
-    - type: Transform
-      pos: -21.5,4.5
-      parent: 2173
-  - uid: 6169
-    components:
-    - type: Transform
-      pos: -39.5,1.5
-      parent: 2173
 - proto: SpawnPointSecurityGuard
   entities:
   - uid: 4817

Resources/Maps/_NF/POI/lodge.yml

@@ -16299,98 +16299,6 @@ entities:
     - type: Transform
       pos: -7.5,9.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 2199
-    components:
-    - type: Transform
-      pos: 16.5,2.5
-      parent: 1
-  - uid: 2200
-    components:
-    - type: Transform
-      pos: -16.5,2.5
-      parent: 1
-  - uid: 2201
-    components:
-    - type: Transform
-      pos: -15.5,2.5
-      parent: 1
-  - uid: 2202
-    components:
-    - type: Transform
-      pos: -7.5,3.5
-      parent: 1
-  - uid: 2203
-    components:
-    - type: Transform
-      pos: 15.5,2.5
-      parent: 1
-  - uid: 2204
-    components:
-    - type: Transform
-      pos: -14.5,2.5
-      parent: 1
-  - uid: 2205
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 1
-  - uid: 2206
-    components:
-    - type: Transform
-      pos: 17.5,2.5
-      parent: 1
-  - uid: 2207
-    components:
-    - type: Transform
-      pos: -6.5,3.5
-      parent: 1
-  - uid: 2208
-    components:
-    - type: Transform
-      pos: 9.5,3.5
-      parent: 1
-  - uid: 2209
-    components:
-    - type: Transform
-      pos: 8.5,3.5
-      parent: 1
-  - uid: 2210
-    components:
-    - type: Transform
-      pos: -8.5,3.5
-      parent: 1
-  - uid: 2211
-    components:
-    - type: Transform
-      pos: -6.5,10.5
-      parent: 1
-  - uid: 2212
-    components:
-    - type: Transform
-      pos: -3.5,9.5
-      parent: 1
-  - uid: 2213
-    components:
-    - type: Transform
-      pos: -1.5,8.5
-      parent: 1
-  - uid: 2214
-    components:
-    - type: Transform
-      pos: 0.5,8.5
-      parent: 1
-  - uid: 2215
-    components:
-    - type: Transform
-      pos: 1.5,8.5
-      parent: 1
-  - uid: 2216
-    components:
-    - type: Transform
-      pos: 2.5,8.5
-      parent: 1
 - proto: StairDark
   entities:
   - uid: 2217

Resources/Maps/_NF/POI/medical.yml

@@ -27667,53 +27667,6 @@ entities:
     - type: Transform
       pos: -15.5,1.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 3531
-    components:
-    - type: Transform
-      pos: -7.5,2.5
-      parent: 1
-  - uid: 3532
-    components:
-    - type: Transform
-      pos: -7.5,1.5
-      parent: 1
-  - uid: 3533
-    components:
-    - type: Transform
-      pos: -6.5,2.5
-      parent: 1
-  - uid: 3534
-    components:
-    - type: Transform
-      pos: -6.5,3.5
-      parent: 1
-  - uid: 3535
-    components:
-    - type: Transform
-      pos: -5.5,2.5
-      parent: 1
-  - uid: 3536
-    components:
-    - type: Transform
-      pos: -6.5,1.5
-      parent: 1
-  - uid: 3537
-    components:
-    - type: Transform
-      pos: -7.5,3.5
-      parent: 1
-  - uid: 3538
-    components:
-    - type: Transform
-      pos: -5.5,1.5
-      parent: 1
-  - uid: 3539
-    components:
-    - type: Transform
-      pos: -5.5,3.5
-      parent: 1
 - proto: SpawnVehicleWheelchair
   entities:
   - uid: 3540

Resources/Maps/_NF/Test/dev_map.yml

@@ -5753,13 +5753,6 @@ entities:
     - type: Transform
       pos: -16.5,-6.5
       parent: 179
-- proto: NFSpawnPointDetective
-  entities:
-  - uid: 1487
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 179
 - proto: NFSpawnPointJanitor
   entities:
   - uid: 1488
@@ -7190,13 +7183,6 @@ entities:
     - type: Transform
       pos: -3.5,4.5
       parent: 179
-- proto: SpawnPointPilot
-  entities:
-  - uid: 1463
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 179
 - proto: SpawnPointPirate
   entities:
   - uid: 1466
@@ -7232,13 +7218,6 @@ entities:
     - type: Transform
       pos: -3.5,2.5
       parent: 179
-- proto: SpawnPointPublicAffairsLiaison
-  entities:
-  - uid: 1489
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 179
 - proto: SpawnPointSecurityGuard
   entities:
   - uid: 1457

Resources/Prototypes/Access/misc.yml

@@ -26,8 +26,7 @@
   - Research
   - Service
   - StationTrafficController # Frontier
-  - Sergeant # Frontier
-  - Bailiff # Frontier
+  - TsfCaptain # Frontier
   - Maintenance
   - External
   - Janitor
@@ -38,7 +37,6 @@
   - Chapel
   - Hydroponics
   - Atmospherics
-  - Pilot # Mono
 #  - Pirate # Mono
 
 # Mono start
@@ -77,6 +75,5 @@
   - Chapel
   - Hydroponics
   - Atmospherics
-  - Pilot
 
 # Mono end

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -39,7 +39,7 @@
     - NuclearOperative
     - SyndicateAgent
     - CentralCommand
-    - Pirate # Frontier
+    - PDVBase # Frontier
   - type: UserInterface
     interfaces:
       enum.SolarControlConsoleUiKey.Key:

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

@@ -862,7 +862,7 @@
     - NuclearOperative
     - SyndicateAgent
     - Wizard
-    - Pirate # Mono
+    - PDVBase # Mono
     - TsfmcEngineering # Mono
     - GrandVizier
     - PDVCommand # Mono

Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml

@@ -118,7 +118,7 @@
     - Maintenance
     - Medical
     - Mercenary # Frontier
-    - Pirate # Frontier
+    - PDVBase # Mono
     - Quartermaster
     - Research
     - ResearchDirector

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -32,7 +32,6 @@
   # - ServiceWorker # Frontier
   - Contractor # Frontier
   - Mercenary # Frontier
-  - Pilot # Frontier
   - Borg # Frontier
 
 - type: department
@@ -117,7 +116,6 @@
   - PrisonGuard ##nyano
   - Brigmedic # Frontier
 #  - SecurityGuard # Frontier
-  - NFDetective # Frontier
   - Cadet # Frontier
   - Deputy # Frontier
   - Bailiff # Frontier

Resources/Prototypes/_Mono/Accents/word_replacements.yml

@@ -777,164 +777,3 @@
     accent-streetpunk-replaced-341: accent-streetpunk-replacement-341
     accent-streetpunk-replaced-342: accent-streetpunk-replacement-342
     accent-streetpunk-replaced-343: accent-streetpunk-replacement-343
-
-- type: accent
-  id: caveman
-  wordReplacements:
-    accent-caveman-replaced-0: accent-caveman-replacement-0
-    accent-caveman-replaced-1: accent-caveman-replacement-1
-    accent-caveman-replaced-2: accent-caveman-replacement-2
-    accent-caveman-replaced-3: accent-caveman-replacement-3
-    accent-caveman-replaced-4: accent-caveman-replacement-4
-    accent-caveman-replaced-5: accent-caveman-replacement-5
-    accent-caveman-replaced-6: accent-caveman-replacement-6
-    accent-caveman-replaced-7: accent-caveman-replacement-7
-    accent-caveman-replaced-8: accent-caveman-replacement-8
-    accent-caveman-replaced-9: accent-caveman-replacement-9
-    accent-caveman-replaced-10: accent-caveman-replacement-10
-    accent-caveman-replaced-11: accent-caveman-replacement-11
-    accent-caveman-replaced-12: accent-caveman-replacement-12
-    accent-caveman-replaced-13: accent-caveman-replacement-13
-    accent-caveman-replaced-14: accent-caveman-replacement-14
-    accent-caveman-replaced-15: accent-caveman-replacement-15
-    accent-caveman-replaced-16: accent-caveman-replacement-16
-    accent-caveman-replaced-17: accent-caveman-replacement-17
-    accent-caveman-replaced-18: accent-caveman-replacement-18
-    accent-caveman-replaced-19: accent-caveman-replacement-19
-    accent-caveman-replaced-20: accent-caveman-replacement-20
-    accent-caveman-replaced-21: accent-caveman-replacement-21
-    accent-caveman-replaced-22: accent-caveman-replacement-22
-    accent-caveman-replaced-23: accent-caveman-replacement-23
-    accent-caveman-replaced-24: accent-caveman-replacement-24
-    accent-caveman-replaced-25: accent-caveman-replacement-25
-    accent-caveman-replaced-26: accent-caveman-replacement-26
-    accent-caveman-replaced-27: accent-caveman-replacement-27
-    accent-caveman-replaced-28: accent-caveman-replacement-28
-    accent-caveman-replaced-29: accent-caveman-replacement-29
-    accent-caveman-replaced-30: accent-caveman-replacement-30
-    accent-caveman-replaced-31: accent-caveman-replacement-31
-    accent-caveman-replaced-32: accent-caveman-replacement-32
-    accent-caveman-replaced-33: accent-caveman-replacement-33
-    accent-caveman-replaced-34: accent-caveman-replacement-34
-    accent-caveman-replaced-35: accent-caveman-replacement-35
-    accent-caveman-replaced-36: accent-caveman-replacement-36
-    accent-caveman-replaced-37: accent-caveman-replacement-37
-    accent-caveman-replaced-38: accent-caveman-replacement-38
-    accent-caveman-replaced-39: accent-caveman-replacement-39
-    accent-caveman-replaced-40: accent-caveman-replacement-40
-    accent-caveman-replaced-41: accent-caveman-replacement-41
-    accent-caveman-replaced-42: accent-caveman-replacement-42
-    accent-caveman-replaced-43: accent-caveman-replacement-43
-    accent-caveman-replaced-44: accent-caveman-replacement-44
-    accent-caveman-replaced-45: accent-caveman-replacement-45
-    accent-caveman-replaced-46: accent-caveman-replacement-46
-    accent-caveman-replaced-47: accent-caveman-replacement-47
-    accent-caveman-replaced-48: accent-caveman-replacement-48
-    accent-caveman-replaced-49: accent-caveman-replacement-49
-    accent-caveman-replaced-50: accent-caveman-replacement-50
-    accent-caveman-replaced-51: accent-caveman-replacement-51
-    accent-caveman-replaced-52: accent-caveman-replacement-52
-    accent-caveman-replaced-53: accent-caveman-replacement-53
-    accent-caveman-replaced-54: accent-caveman-replacement-54
-    accent-caveman-replaced-55: accent-caveman-replacement-55
-    accent-caveman-replaced-56: accent-caveman-replacement-56
-    accent-caveman-replaced-57: accent-caveman-replacement-57
-    accent-caveman-replaced-58: accent-caveman-replacement-58
-    accent-caveman-replaced-59: accent-caveman-replacement-59
-    accent-caveman-replaced-60: accent-caveman-replacement-60
-    accent-caveman-replaced-61: accent-caveman-replacement-61
-    accent-caveman-replaced-62: accent-caveman-replacement-62
-    accent-caveman-replaced-63: accent-caveman-replacement-63
-    accent-caveman-replaced-64: accent-caveman-replacement-64
-    accent-caveman-replaced-65: accent-caveman-replacement-65
-    accent-caveman-replaced-66: accent-caveman-replacement-66
-    accent-caveman-replaced-67: accent-caveman-replacement-67
-    accent-caveman-replaced-68: accent-caveman-replacement-68
-    accent-caveman-replaced-69: accent-caveman-replacement-69
-    accent-caveman-replaced-70: accent-caveman-replacement-70
-    accent-caveman-replaced-71: accent-caveman-replacement-71
-    accent-caveman-replaced-72: accent-caveman-replacement-72
-    accent-caveman-replaced-73: accent-caveman-replacement-73
-    accent-caveman-replaced-74: accent-caveman-replacement-74
-    accent-caveman-replaced-75: accent-caveman-replacement-75
-    accent-caveman-replaced-76: accent-caveman-replacement-76
-    accent-caveman-replaced-77: accent-caveman-replacement-77
-    accent-caveman-replaced-78: accent-caveman-replacement-78
-    accent-caveman-replaced-79: accent-caveman-replacement-79
-    accent-caveman-replaced-80: accent-caveman-replacement-80
-    accent-caveman-replaced-81: accent-caveman-replacement-81
-    accent-caveman-replaced-82: accent-caveman-replacement-82
-    accent-caveman-replaced-83: accent-caveman-replacement-83
-    accent-caveman-replaced-84: accent-caveman-replacement-84
-    accent-caveman-replaced-85: accent-caveman-replacement-85
-    accent-caveman-replaced-86: accent-caveman-replacement-86
-    accent-caveman-replaced-87: accent-caveman-replacement-87
-    accent-caveman-replaced-88: accent-caveman-replacement-88
-    accent-caveman-replaced-89: accent-caveman-replacement-89
-    accent-caveman-replaced-90: accent-caveman-replacement-90
-    accent-caveman-replaced-91: accent-caveman-replacement-91
-    accent-caveman-replaced-92: accent-caveman-replacement-92
-    accent-caveman-replaced-93: accent-caveman-replacement-93
-    accent-caveman-replaced-94: accent-caveman-replacement-94
-    accent-caveman-replaced-95: accent-caveman-replacement-95
-    accent-caveman-replaced-96: accent-caveman-replacement-96
-    accent-caveman-replaced-97: accent-caveman-replacement-97
-    accent-caveman-replaced-98: accent-caveman-replacement-98
-    accent-caveman-replaced-99: accent-caveman-replacement-99
-    accent-caveman-replaced-100: accent-caveman-replacement-100
-    accent-caveman-replaced-101: accent-caveman-replacement-101
-    accent-caveman-replaced-102: accent-caveman-replacement-102
-    accent-caveman-replaced-103: accent-caveman-replacement-103
-    accent-caveman-replaced-104: accent-caveman-replacement-104
-    accent-caveman-replaced-105: accent-caveman-replacement-105
-    accent-caveman-replaced-106: accent-caveman-replacement-106
-    accent-caveman-replaced-107: accent-caveman-replacement-107
-    accent-caveman-replaced-108: accent-caveman-replacement-108
-    accent-caveman-replaced-109: accent-caveman-replacement-109
-    accent-caveman-replaced-110: accent-caveman-replacement-110
-    accent-caveman-replaced-111: accent-caveman-replacement-111
-    accent-caveman-replaced-112: accent-caveman-replacement-112
-    accent-caveman-replaced-113: accent-caveman-replacement-113
-    accent-caveman-replaced-114: accent-caveman-replacement-114
-    accent-caveman-replaced-115: accent-caveman-replacement-115
-    accent-caveman-replaced-116: accent-caveman-replacement-116
-    accent-caveman-replaced-117: accent-caveman-replacement-117
-    accent-caveman-replaced-118: accent-caveman-replacement-118
-    accent-caveman-replaced-119: accent-caveman-replacement-119
-    accent-caveman-replaced-120: accent-caveman-replacement-120
-    accent-caveman-replaced-121: accent-caveman-replacement-121
-    accent-caveman-replaced-122: accent-caveman-replacement-122
-    accent-caveman-replaced-123: accent-caveman-replacement-123
-    accent-caveman-replaced-124: accent-caveman-replacement-124
-    accent-caveman-replaced-125: accent-caveman-replacement-125
-    accent-caveman-replaced-126: accent-caveman-replacement-126
-    accent-caveman-replaced-127: accent-caveman-replacement-127
-    accent-caveman-replaced-128: accent-caveman-replacement-128
-    accent-caveman-replaced-129: accent-caveman-replacement-129
-    accent-caveman-replaced-130: accent-caveman-replacement-130
-    accent-caveman-replaced-131: accent-caveman-replacement-131
-    accent-caveman-replaced-132: accent-caveman-replacement-132
-    accent-caveman-replaced-133: accent-caveman-replacement-133
-    accent-caveman-replaced-134: accent-caveman-replacement-134
-    accent-caveman-replaced-135: accent-caveman-replacement-135
-    accent-caveman-replaced-136: accent-caveman-replacement-136
-    accent-caveman-replaced-137: accent-caveman-replacement-137
-    accent-caveman-replaced-138: accent-caveman-replacement-138
-    # Forbidden words
-    accent-caveman-forbidden-0: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-1: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-2: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-3: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-4: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-5: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-6: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-7: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-8: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-9: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-10: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-11: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-12: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-13: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-14: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-15: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-16: accent-caveman-forbidden-empty

Resources/Prototypes/_Mono/Access/command.yml

@@ -0,0 +1,28 @@
+- type: accessLevel
+  id: Frontier
+  name: id-card-access-level-frontier
+
+- type: accessLevel
+  id: StationTrafficController
+  name: id-card-access-level-stc
+
+- type: accessGroup
+  id: GeneralAccess
+  tags:
+  - Maintenance
+  - External
+
+- type: accessGroup
+  id: GeneralCommandAccess
+  tags:
+  - Maintenance
+  - External
+  - Command
+
+- type: accessLevel
+  id: Mercenary
+  name: id-card-access-level-mercenary
+
+- type: accessLevel
+  id: Mail
+  name: id-card-access-level-mail

Resources/Prototypes/_Mono/Access/pdv.yml

@@ -5,3 +5,7 @@
 - type: accessLevel
   id: PDVCommand
   name: id-card-access-level-pdv-command
+
+- type: accessLevel
+  id: PDVBase
+  name: id-card-access-level-pdv-base

Resources/Prototypes/_Mono/Access/tsfmc.yml

@@ -11,3 +11,50 @@
   - Security
   - Mercenary # Frontier
   - Captain # Frontier
+
+- type: accessLevel
+  id: TsfFTL
+  name: id-card-access-level-tsf-ftl
+  
+- type: accessLevel
+  id: TsfCaptain
+  name: id-card-access-level-tsf-captain
+  
+- type: accessGroup
+  id: RecruitTsfAccess
+  tags:
+  - Maintenance
+  - External
+  - Security
+  - Brig
+  
+- type: accessGroup
+  id: GeneralTsfAccess
+  tags:
+  - Maintenance
+  - External
+  - Command
+  - Brig
+  - Security
+  - Mercenary # Frontier
+  - Captain # Frontier
+
+- type: accessGroup
+  id: GeneralTsfBrigAccess
+  tags:
+  - Maintenance
+  - External
+  - Brig
+  
+- type: accessGroup
+  id: GeneralTsfCorpsmanAccess
+  tags:
+  - Maintenance
+  - External
+  - Command
+  - Brig
+  - Security
+  - Mercenary # Frontier
+  - Captain # Frontier
+  - Chemistry
+  - Medical

Resources/Prototypes/_Mono/Access/ussp.yml

@@ -31,3 +31,4 @@
   tags:
   - USSP
   - Mercenary
+

Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/piratejumpsuits.yml

@@ -1,870 +0,0 @@
-- type: entity
-  id: SensorOff
-  abstract: true
-  components:
-  - type: SuitSensor
-    randomMode: false
-    mode: SensorOff
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMercenary , SensorOff ]
-  id: PirateClothingUniformJumpsuitMercenary
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtMercenary , SensorOff ]
-  id: PirateClothingUniformJumpskirtMercenary
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitPrivateSec , SensorOff ]
-  id: PirateClothingUniformJumpsuitPrivateSec
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPrivateSec , SensorOff ]
-  id: PirateClothingUniformJumpskirtPrivateSec
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckMercenary , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckMercenary
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryPilot , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryPilot
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitPilot , SensorOff ]
-  id: PirateClothingUniformJumpsuitPilot
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryContractor , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryContractor
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryContractorTac , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryContractorTac
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitAtmos , SensorOff ]
-  id: PirateClothingUniformJumpsuitAtmos
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtAtmos , SensorOff ]
-  id: PirateClothingUniformJumpskirtAtmos
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitBartender , SensorOff ]
-  id: PirateClothingUniformJumpsuitBartender
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBartender , SensorOff ]
-  id: PirateClothingUniformJumpskirtBartender
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCargo , SensorOff ]
-  id: PirateClothingUniformJumpsuitCargo
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCargo , SensorOff ]
-  id: PirateClothingUniformJumpskirtCargo
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitSalvageSpecialist , SensorOff ]
-  id: PirateClothingUniformJumpsuitSalvageSpecialist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChef , SensorOff ]
-  id: PirateClothingUniformJumpsuitChef
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtChef , SensorOff ]
-  id: PirateClothingUniformJumpskirtChef
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitEngineering , SensorOff ]
-  id: PirateClothingUniformJumpsuitEngineering
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtEngineering , SensorOff ]
-  id: PirateClothingUniformJumpskirtEngineering
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitHydroponics , SensorOff ]
-  id: PirateClothingUniformJumpsuitHydroponics
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtHydroponics , SensorOff ]
-  id: PirateClothingUniformJumpskirtHydroponics
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMedicalDoctor , SensorOff ]
-  id: PirateClothingUniformJumpsuitMedicalDoctor
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtMedicalDoctor , SensorOff ]
-  id: PirateClothingUniformJumpskirtMedicalDoctor
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitScientist , SensorOff ]
-  id: PirateClothingUniformJumpsuitScientist
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtScientist , SensorOff ]
-  id: PirateClothingUniformJumpskirtScientist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorGrey , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorGrey
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorGrey , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorGrey
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorWhite , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorWhite
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorWhite , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorWhite
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorBlack , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorBlack , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorBlue , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorYellow , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorYellow
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorYellow , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorYellow
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorGreen , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorGreen , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorOrange , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorOrange
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorOrange , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorOrange
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorRed , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorRed
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorRed , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorRed
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorPurple , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorPurple , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorPink , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorPink
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorPink , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorPink
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorDarkBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorDarkBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorDarkBlue , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorDarkBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorDarkGreen , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorDarkGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorDarkGreen , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorDarkGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitColorTeal , SensorOff ]
-  id: PirateClothingUniformJumpsuitColorTeal
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtColorTeal , SensorOff ]
-  id: PirateClothingUniformJumpskirtColorTeal
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitHawaiBlack , SensorOff ]
-  id: PirateClothingUniformJumpsuitHawaiBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitHawaiBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitHawaiBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitHawaiRed , SensorOff ]
-  id: PirateClothingUniformJumpsuitHawaiRed
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitHawaiYellow , SensorOff ]
-  id: PirateClothingUniformJumpsuitHawaiYellow
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitFlannel , SensorOff ]
-  id: PirateClothingUniformJumpsuitFlannel
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCasualBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitCasualBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCasualBlue , SensorOff ]
-  id: PirateClothingUniformJumpskirtCasualBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCasualPurple , SensorOff ]
-  id: PirateClothingUniformJumpsuitCasualPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCasualPurple , SensorOff ]
-  id: PirateClothingUniformJumpskirtCasualPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCasualRed , SensorOff ]
-  id: PirateClothingUniformJumpsuitCasualRed
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCasualRed , SensorOff ]
-  id: PirateClothingUniformJumpskirtCasualRed
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitBartenderPurple , SensorOff ]
-  id: PirateClothingUniformJumpsuitBartenderPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitEngineeringHazard , SensorOff ]
-  id: PirateClothingUniformJumpsuitEngineeringHazard
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitAtmosCasual , SensorOff ]
-  id: PirateClothingUniformJumpsuitAtmosCasual
-
-- type: entity
-  parent: [ ClothingUniformOveralls , SensorOff ]
-  id: PirateClothingUniformOveralls
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChaplain , SensorOff ]
-  id: PirateClothingUniformJumpsuitChaplain
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtChaplain , SensorOff ]
-  id: PirateClothingUniformJumpskirtChaplain
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCurator , SensorOff ]
-  id: PirateClothingUniformJumpsuitCurator
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCurator , SensorOff ]
-  id: PirateClothingUniformJumpskirtCurator
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLibrarian , SensorOff ]
-  id: PirateClothingUniformJumpsuitLibrarian
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLibrarian , SensorOff ]
-  id: PirateClothingUniformJumpskirtLibrarian
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitReporter , SensorOff ]
-  id: PirateClothingUniformJumpsuitReporter
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitBH , SensorOff ]
-  id: PirateClothingUniformJumpsuitBH
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBH , SensorOff ]
-  id: PirateClothingUniformJumpskirtBH
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitBHGrey , SensorOff ]
-  id: PirateClothingUniformJumpsuitBHGrey
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBHGrey , SensorOff ]
-  id: PirateClothingUniformJumpskirtBHGrey
-
-- type: entity
-  parent: [ UniformScrubsColorGreen , SensorOff ]
-  id: PirateUniformScrubsColorGreen
-
-- type: entity
-  parent: [ UniformScrubsColorBlue , SensorOff ]
-  id: PirateUniformScrubsColorBlue
-
-- type: entity
-  parent: [ UniformScrubsColorPurple , SensorOff ]
-  id: PirateUniformScrubsColorPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitParamedic , SensorOff ]
-  id: PirateClothingUniformJumpsuitParamedic
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtParamedic , SensorOff ]
-  id: PirateClothingUniformJumpskirtParamedic
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitVirology , SensorOff ]
-  id: PirateClothingUniformJumpsuitVirology
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtVirology , SensorOff ]
-  id: PirateClothingUniformJumpskirtVirology
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChemistry , SensorOff ]
-  id: PirateClothingUniformJumpsuitChemistry
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtChemistry , SensorOff ]
-  id: PirateClothingUniformJumpskirtChemistry
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitGenetics , SensorOff ]
-  id: PirateClothingUniformJumpsuitGenetics
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtGenetics , SensorOff ]
-  id: PirateClothingUniformJumpskirtGenetics
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitPsychologist , SensorOff ]
-  id: PirateClothingUniformJumpsuitPsychologist
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPsychologist , SensorOff ]
-  id: PirateClothingUniformJumpskirtPsychologist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitScientistFormal , SensorOff ]
-  id: PirateClothingUniformJumpsuitScientistFormal
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitRoboticist , SensorOff ]
-  id: PirateClothingUniformJumpsuitRoboticist
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtRoboticist , SensorOff ]
-  id: PirateClothingUniformJumpskirtRoboticist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLawyerBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitLawyerBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLawyerBlue , SensorOff ]
-  id: PirateClothingUniformJumpskirtLawyerBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLawyerPurple , SensorOff ]
-  id: PirateClothingUniformJumpsuitLawyerPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLawyerPurple , SensorOff ]
-  id: PirateClothingUniformJumpskirtLawyerPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLawyerRed , SensorOff ]
-  id: PirateClothingUniformJumpsuitLawyerRed
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLawyerRed , SensorOff ]
-  id: PirateClothingUniformJumpskirtLawyerRed
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLawyerBlack , SensorOff ]
-  id: PirateClothingUniformJumpsuitLawyerBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLawyerBlack , SensorOff ]
-  id: PirateClothingUniformJumpskirtLawyerBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitLawyerGood , SensorOff ]
-  id: PirateClothingUniformJumpsuitLawyerGood
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtLawyerGood , SensorOff ]
-  id: PirateClothingUniformJumpskirtLawyerGood
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBlackElegantDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtBlackElegantDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtRedElegantDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtRedElegantDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtGreenElegantDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtGreenElegantDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBlueElegantDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtBlueElegantDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPurpleElegantDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtPurpleElegantDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCyanStripedDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtCyanStripedDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtRedStripedDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtRedStripedDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtGreenStripedDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtGreenStripedDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPinkStripedDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtPinkStripedDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtOrangeStripedDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtOrangeStripedDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPurpleTurtleneckDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtPurpleTurtleneckDress
-- type: entity
-  parent: [ ClothingUniformJumpskirtRedTurtleneckDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtRedTurtleneckDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtGreenTurtleneckDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtGreenTurtleneckDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtBlueTurtleneckDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtBlueTurtleneckDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtYellowTurtleneckDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtYellowTurtleneckDress
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtYellowOldDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtYellowOldDress
-
-- type: entity
-  parent: [ ClothingUniformRandomPunkCroptop , SensorOff ]
-  id: PirateClothingUniformRandomPunkCroptop
-
-- type: entity
-  parent: [ ClothingUniformRandomPunkTanktop , SensorOff ]
-  id: PirateClothingUniformRandomPunkTanktop
-
-- type: entity
-  parent: [ ClothingUniformRandomArmlessNoSkirt , SensorOff ]
-  id: PirateClothingUniformRandomArmlessNoSkirt
-
-- type: entity
-  parent: [ ClothingUniformRandomPunkCroptopShorts , SensorOff ]
-  id: PirateClothingUniformRandomPunkCroptopShorts
-
-- type: entity
-  parent: [ ClothingUniformRandomPunkTanktopShorts , SensorOff ]
-  id: PirateClothingUniformRandomPunkTanktopShorts
-
-- type: entity
-  parent: [ ClothingUniformRandomArmless , SensorOff ]
-  id: PirateClothingUniformRandomArmless
-
-- type: entity
-  parent: [ ClothingUniformRandomStandard , SensorOff ]
-  id: PirateClothingUniformRandomStandard
-
-- type: entity
-  parent: [ ClothingUniformRandomShorts , SensorOff ]
-  id: PirateClothingUniformRandomShorts
-
-- type: entity
-  parent: [ ClothingUniformRandomShirt , SensorOff ]
-  id: PirateClothingUniformRandomShirt
-
-- type: entity
-  parent: [ ClothingSkirtUniformRandomArmless , SensorOff ]
-  id: PirateClothingSkirtUniformRandomArmless
-
-- type: entity
-  parent: [ ClothingSkirtUniformRandomStandard , SensorOff ]
-  id: PirateClothingSkirtUniformRandomStandard
-
-- type: entity
-  parent: [ ClothingSkirtUniformRandomBra , SensorOff ]
-  id: PirateClothingSkirtUniformRandomBra
-
-- type: entity
-  parent: [ ClothingSkirtUniformRandomShorts , SensorOff ]
-  id: PirateClothingSkirtUniformRandomShorts
-
-- type: entity
-  parent: [ ClothingSkirtUniformRandomShirt , SensorOff ]
-  id: PirateClothingSkirtUniformRandomShirt
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMonasticRobeDark , SensorOff ]
-  id: PirateClothingUniformJumpsuitMonasticRobeDark
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMonasticRobeLight , SensorOff ]
-  id: PirateClothingUniformJumpsuitMonasticRobeLight
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChaplainPilgrimVest , SensorOff ]
-  id: PirateClothingUniformJumpsuitChaplainPilgrimVest
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitQMTurtleneck , SensorOff ]
-  id: PirateClothingUniformJumpsuitQMTurtleneck
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtQMTurtleneck , SensorOff ]
-  id: PirateClothingUniformJumpskirtQMTurtleneck
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitSeniorPhysician , SensorOff ]
-  id: PirateClothingUniformJumpsuitSeniorPhysician
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtSeniorPhysician , SensorOff ]
-  id: PirateClothingUniformJumpskirtSeniorPhysician
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCMO , SensorOff ]
-  id: PirateClothingUniformJumpsuitCMO
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCMO , SensorOff ]
-  id: PirateClothingUniformJumpskirtCMO
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCMOTurtle , SensorOff ]
-  id: PirateClothingUniformJumpsuitCMOTurtle
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCMOTurtle , SensorOff ]
-  id: PirateClothingUniformJumpskirtCMOTurtle
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitSeniorResearcher , SensorOff ]
-  id: PirateClothingUniformJumpsuitSeniorResearcher
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtSeniorResearcher , SensorOff ]
-  id: PirateClothingUniformJumpskirtSeniorResearcher
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitResearchDirector , SensorOff ]
-  id: PirateClothingUniformJumpsuitResearchDirector
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtResearchDirector , SensorOff ]
-  id: PirateClothingUniformJumpskirtResearchDirector
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitSeniorEngineer , SensorOff ]
-  id: PirateClothingUniformJumpsuitSeniorEngineer
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtSeniorEngineer , SensorOff ]
-  id: PirateClothingUniformJumpskirtSeniorEngineer
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChiefEngineerNT , SensorOff ]
-  id: PirateClothingUniformJumpsuitChiefEngineerNT
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChiefEngineer , SensorOff ]
-  id: PirateClothingUniformJumpsuitChiefEngineer
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtChiefEngineer , SensorOff ]
-  id: PirateClothingUniformJumpskirtChiefEngineer
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitChiefEngineerTurtle , SensorOff ]
-  id: PirateClothingUniformJumpsuitChiefEngineerTurtle
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtChiefEngineerTurtle , SensorOff ]
-  id: PirateClothingUniformJumpskirtChiefEngineerTurtle
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitJester , SensorOff ]
-  id: PirateClothingUniformJumpsuitJester
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitJesterAlt , SensorOff ]
-  id: PirateClothingUniformJumpsuitJesterAlt
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitKilt , SensorOff ]
-  id: PirateClothingUniformJumpsuitKilt
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitDameDane , SensorOff ]
-  id: PirateClothingUniformJumpsuitDameDane
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitKimono , SensorOff ]
-  id: PirateClothingUniformJumpsuitKimono
-
-- type: entity
-  parent: [ ClothingKimonoPink , SensorOff ]
-  id: PirateClothingKimonoPink
-
-- type: entity
-  parent: [ ClothingKimonoBlue , SensorOff ]
-  id: PirateClothingKimonoBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitGladiator , SensorOff ]
-  id: PirateClothingUniformJumpsuitGladiator
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtPerformer , SensorOff ]
-  id: PirateClothingUniformJumpskirtPerformer
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtJanimaid , SensorOff ]
-  id: PirateClothingUniformJumpskirtJanimaid
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitSafari , SensorOff ]
-  id: PirateClothingUniformJumpsuitSafari
-
-- type: entity
-  parent: [ UniformShortsRed , SensorOff ]
-  id: PirateUniformShortsRed
-
-- type: entity
-  parent: [ UniformShortsRedWithTop , SensorOff ]
-  id: PirateUniformShortsRedWithTop
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitClown , SensorOff ]
-  id: PirateClothingUniformJumpsuitClown
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMime , SensorOff ]
-  id: PirateClothingUniformJumpsuitMime
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtMime , SensorOff ]
-  id: PirateClothingUniformJumpskirtMime
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitTshirtJeans , SensorOff ]
-  id: PirateClothingUniformJumpsuitTshirtJeans
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitTshirtJeansGray , SensorOff ]
-  id: PirateClothingUniformJumpsuitTshirtJeansGray
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitTshirtJeansPeach , SensorOff ]
-  id: PirateClothingUniformJumpsuitTshirtJeansPeach
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCaptain , SensorOff ]
-  id: PirateClothingUniformJumpsuitCaptain
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCaptain , SensorOff ]
-  id: PirateClothingUniformJumpskirtCaptain
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitCapFormal , SensorOff ]
-  id: PirateClothingUniformJumpsuitCapFormal
-
-- type: entity
-  parent: [ ClothingUniformJumpskirtCapFormalDress , SensorOff ]
-  id: PirateClothingUniformJumpskirtCapFormalDress
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryCaptain , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryCaptain
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryAtmospherics , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryAtmospherics
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryEngineering , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryEngineering
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryEngineeringChief , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryEngineeringChief
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitarySalvageSpecialist , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitarySalvageSpecialist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryCargo , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryCargo
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryQM , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryQM
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryParamedic , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryParamedic
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryMedicalDoctor , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryMedicalDoctor
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryChemistry , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryChemistry
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryVirology , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryVirology
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryGenetics , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryGenetics
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryCMO , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryCMO
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryScientist , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryScientist
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryResearchDirector , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryResearchDirector
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryService , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryService
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryHydroponics , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryHydroponics
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorGrey , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorGrey
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorBlack , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorBlack
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorDarkBlue , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorDarkBlue
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorTeal , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorTeal
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorGreen , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorDarkGreen , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorDarkGreen
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorOrange , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorOrange
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorPink , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorPink
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorRed , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorRed
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorYellow , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorYellow
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorPurple , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorPurple
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorLightBrown , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorLightBrown
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorBrown , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorBrown
-
-- type: entity
-  parent: [ ClothingUniformJumpsuitMilitaryColorMaroon , SensorOff ]
-  id: PirateClothingUniformJumpsuitMilitaryColorMaroon

Resources/Prototypes/_Mono/Entities/Markers/Spawners/Random/Salvage/spawners.yml

@@ -25,4 +25,25 @@
   components:
   - type: CountSpawner
     prototype: SheetPlastitanium1
-    maximumCount: 3
+    maximumCount: 3
+
+- type: entityTable
+  id: SalvageScrapSpawnerBrass
+  table: !type:GroupSelector
+    children:
+    # 70% chance of scrap of some kind
+    - !type:GroupSelector
+      children:
+      - !type:NestedSelector
+        tableId: SalvageScrapBrass
+
+- type: entity
+  parent: SalvageSpawnerScrapCommon
+  id: SalvageSpawnerScrapBrass75
+  suffix: Brass, 75%
+  components:
+  - type: EntityTableSpawner
+    offset: 0.4
+    table: !type:NestedSelector
+      tableId: SalvageScrapSpawnerBrass
+      prob: 0.75

Resources/Prototypes/_Mono/Entities/Markers/Spawners/Random/paintings.yml

@@ -38,3 +38,38 @@
   - type: Construction
     graph: RandomPainting
     node: randomPainting
+
+- type: entity
+  parent: RandomPainting
+  id: RandomPaintingHalloween
+  suffix: Halloween
+  components:
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+      - PaintingPersistenceOfMemory
+      - PaintingTheSonOfMan
+      - PaintingTheKiss
+      - PaintingTheScream
+      - PaintingTheGreatWave
+      - PaintingCafeTerraceAtNight
+      - PaintingNightHawks
+      - PaintingSkeletonCigarette
+      - PaintingPrayerHands
+      - PaintingOldGuitarist
+      - PaintingOlympia
+      - PaintingSaturn
+      - PaintingSleepingGypsy
+      - PaintingRedBlueYellow
+      - PaintingHelloWorld
+      - PaintingNightOfThePostGoblin
+      # Special halloween posters
+      - PaintingSpookyIan
+      - PaintingSpookyLady
+    chance: 1
+    rarePrototypes:
+      - PaintingSkeletonBoof
+      - PaintingEmpty
+      - PaintingMoony
+      - PaintingAmogusTriptych
+    rareChance: 0.01

Resources/Prototypes/_Mono/Entities/Markers/pacified_zone.yml

@@ -17,7 +17,6 @@
       - Brigmedic
       - Cadet
       - Deputy
-      - NFDetective
       - SeniorOfficer
       - Sheriff
       - SecurityGuard
@@ -96,4 +95,4 @@
   suffix: Panic Bunker, 100
   components:
   - type: PacifiedZoneGenerator
-    radius: 100
+    radius: 100

Resources/Prototypes/_Mono/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -59,8 +59,8 @@
     tags:
     - Security
     - Armory
-    - Sergeant
-    - Bailiff
+    - TsfFTL
+    - TsfCaptain
     - Medical
     - Chemistry
     - TsfmcEngineering
@@ -71,7 +71,7 @@
     - Mercenary
     - Captain
   - type: AccessReader
-    access: [["Security"], ["Armory"], ["Sergeant"], ["Bailiff"], ["TsfmcEngineering"], ["Brig"]]
+    access: [["Security"], ["Armory"], ["TsfFTL"], ["TsfCaptain"], ["TsfmcEngineering"], ["Brig"]]
   - type: IntrinsicRadioTransmitter
     channels:
     - Common
@@ -123,7 +123,7 @@
     - PirateNF
   - type: Access
     tags:
-    - Pirate
+    - PDVBase
     - PDVCommand
     - GrandVizier
     - Mercenary

Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml

@@ -610,7 +610,7 @@
     - Freespeak
   - type: Access
     tags:
-    - Pirate
+    - PDVBase
     - GrandVizier
     - PDVCommand
 

Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml

@@ -208,7 +208,7 @@
   - type: Access
     tags:
     - Maintenance
-    - Pirate
+    - PDVBase
     - Mercenary
   - type: Sprite
     sprite: _Mono/Objects/Misc/id_cards.rsi

Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml

@@ -153,13 +153,13 @@
     redemptionsLeft: 2
     access: # note - removed HOS/colonel access to prevent free flyssa (its only ship that uses HOS access, so it should be fine)
     - Armory
-    - Sergeant
-    - Bailiff
+    - TsfFTL
+    - TsfCaptain
     - Security
     vessels:
     - Altair
     accessGroups:
-    - GeneralNfsdAccess
+    - GeneralTsfAccess
 
 - type: entity
   parent: BaseShipLPC
@@ -282,7 +282,7 @@
     - Inertia
   - type: StaticPrice
     vendPrice: 30000
-    
+
 - type: entity
   parent: BaseShipLPC
   id: ShipVoucherSnakelet

Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml

@@ -18,7 +18,7 @@
     - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       state: generic_panel_open
   - type: AccessReader
-    access: [[ "Pirate" ]]
+    access: [[ "PDVBase" ]]
   - type: CommunicationsConsole
     title: comms-console-announcement-title-rogue
     color: "#D2B48C"