Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/07/05-upstream-merge

# Conflicts:
#	Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs

.github/workflows/publish.yml

@@ -41,33 +41,22 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Update Build Info
-      run: Tools/gen_build_info.py
-
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
-
-    - name: Upload files to centcomm
-      uses: appleboy/scp-action@master
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        source: "release/${{ github.sha }}"
-        target: "/var/www/builds.delta-v.org/delta-v/builds/"
-        strip_components: 1
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py
@@ -79,3 +68,8 @@ jobs:
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
+      with:
+        name: build

.github/workflows/test-packaging.yml

@@ -65,9 +65,6 @@ jobs:
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
 
-      - name: Update Build Info
-        run: Tools/gen_build_info.py
-
       - name: Shuffle files around
         run: |
           mkdir "release/${{ github.sha }}"

Content.Client/DeltaV/Recruiter/RecruiterPenSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared.DeltaV.Recruiter;
+
+namespace Content.Client.DeltaV.Recruiter;
+
+public sealed class RecruiterPenSystem : SharedRecruiterPenSystem;

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -55,6 +55,7 @@ namespace Content.IntegrationTests.Tests
             "Tortuga", //DeltaV
             "Arena", //DeltaV
             "Asterisk", //DeltaV
+            "Glacier", //DeltaV
             "TheHive", //DeltaV
             "Hammurabi", //DeltaV
             "Lighthouse", //DeltaV

Content.Server/DeltaV/Objectives/Components/RecruitingConditionComponent.cs

@@ -0,0 +1,15 @@
+using Content.Server.Objectives.Systems;
+using Content.Shared.DeltaV.Recruiter;
+
+namespace Content.Server.Objectives.Components;
+
+/// <summary>
+/// Objective condition that requires the recruiter's pen to be used by a number of people to sign paper.
+/// Requires <see cref="NumberObjectiveComponent"/> to function.
+/// </summary>
+[RegisterComponent, Access(typeof(RecruitingConditionSystem), typeof(SharedRecruiterPenSystem))]
+public sealed partial class RecruitingConditionComponent : Component
+{
+    [DataField]
+    public int Recruited;
+}

Content.Server/DeltaV/Objectives/Systems/RecruitingConditionSystem.cs

@@ -0,0 +1,30 @@
+using Content.Server.Objectives.Components;
+using Content.Shared.Objectives.Components;
+
+namespace Content.Server.Objectives.Systems;
+
+public sealed class RecruitingConditionSystem : EntitySystem
+{
+    [Dependency] private readonly NumberObjectiveSystem _number = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RecruitingConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
+    }
+
+    private void OnGetProgress(Entity<RecruitingConditionComponent> ent, ref ObjectiveGetProgressEvent args)
+    {
+        args.Progress = Progress(ent.Comp.Recruited, _number.GetTarget(ent.Owner));
+    }
+
+    private float Progress(int recruited, int target)
+    {
+        // prevent divide-by-zero
+        if (target == 0)
+            return 1f;
+
+        return MathF.Min(recruited / (float) target, 1f);
+    }
+}

Content.Server/DeltaV/Paper/SignatureSystem.cs

@@ -1,6 +1,7 @@
 using Content.Server.Access.Systems;
 using Content.Server.Paper;
 using Content.Server.Popups;
+using Content.Shared.DeltaV.Paper;
 using Content.Shared.Paper;
 using Content.Shared.Popups;
 using Content.Shared.Tag;
@@ -26,20 +27,20 @@ public sealed class SignatureSystem : EntitySystem
         SubscribeLocalEvent<PaperComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
     }
 
-    private void OnGetAltVerbs(EntityUid uid, PaperComponent component, GetVerbsEvent<AlternativeVerb> args)
+    private void OnGetAltVerbs(Entity<PaperComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
     {
         if (!args.CanAccess || !args.CanInteract)
             return;
 
-        var pen = args.Using;
-        if (pen == null || !_tagSystem.HasTag(pen.Value, "Write"))
+        if (args.Using is not {} pen || !_tagSystem.HasTag(pen, "Write"))
             return;
 
+        var user = args.User;
         AlternativeVerb verb = new()
         {
             Act = () =>
             {
-                TrySignPaper((uid, component), args.User);
+                TrySignPaper(ent, user, pen);
             },
             Text = Loc.GetString("paper-sign-verb"),
             DoContactInteraction = true,
@@ -51,10 +52,13 @@ public sealed class SignatureSystem : EntitySystem
     /// <summary>
     ///     Tries add add a signature to the paper with signer's name.
     /// </summary>
-    public bool TrySignPaper(Entity<PaperComponent?> paper, EntityUid signer)
+    public bool TrySignPaper(Entity<PaperComponent> paper, EntityUid signer, EntityUid pen)
     {
-        var paperComp = paper.Comp;
-        if (!Resolve(paper, ref paperComp))
+        var comp = paper.Comp;
+
+        var ev = new SignAttemptEvent(paper, signer);
+        RaiseLocalEvent(pen, ref ev);
+        if (ev.Cancelled)
             return false;
 
         var signatureName = DetermineEntitySignature(signer);
@@ -65,25 +69,25 @@ public sealed class SignatureSystem : EntitySystem
             StampedColor = Color.DarkSlateGray, // TODO: make configurable? Perhaps it should depend on the pen.
         };
 
-        if (!paperComp.StampedBy.Contains(stampInfo) && _paper.TryStamp(paper, stampInfo, SignatureStampState, paperComp))
+        if (!comp.StampedBy.Contains(stampInfo) && _paper.TryStamp(paper, stampInfo, SignatureStampState, comp))
         {
             // Show popups and play a paper writing sound
-            var signedOtherMessage = Loc.GetString("paper-signed-other", ("user", signer), ("target", paper));
+            var signedOtherMessage = Loc.GetString("paper-signed-other", ("user", signer), ("target", paper.Owner));
             _popup.PopupEntity(signedOtherMessage, signer, Filter.PvsExcept(signer, entityManager: EntityManager), true);
 
-            var signedSelfMessage = Loc.GetString("paper-signed-self", ("target", paper));
+            var signedSelfMessage = Loc.GetString("paper-signed-self", ("target", paper.Owner));
             _popup.PopupEntity(signedSelfMessage, signer, signer);
 
-            _audio.PlayPvs(paperComp.Sound, signer);
+            _audio.PlayPvs(comp.Sound, signer);
 
-            _paper.UpdateUserInterface(paper, paperComp);
+            _paper.UpdateUserInterface(paper, comp);
 
             return true;
         }
         else
         {
             // Show an error popup
-            _popup.PopupEntity(Loc.GetString("paper-signed-failure", ("target", paper)), signer, signer, PopupType.SmallCaution);
+            _popup.PopupEntity(Loc.GetString("paper-signed-failure", ("target", paper.Owner)), signer, signer, PopupType.SmallCaution);
 
             return false;
         }

Content.Server/DeltaV/Recruiter/RecruiterPenSystem.cs

@@ -0,0 +1,54 @@
+using Content.Server.Body.Components;
+using Content.Server.Forensics;
+using Content.Server.Objectives.Components;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DeltaV.Recruiter;
+using Content.Shared.Popups;
+
+namespace Content.Server.DeltaV.Recruiter;
+
+/// <summary>
+/// Handles bloodstream related code since that isn't in shared.
+/// </summary>
+public sealed class RecruiterPenSystem : SharedRecruiterPenSystem
+{
+    [Dependency] private readonly ForensicsSystem _forensics = default!;
+    [Dependency] private readonly SolutionTransferSystem _transfer = default!;
+
+    protected override void DrawBlood(EntityUid uid, Entity<SolutionComponent> dest, EntityUid user)
+    {
+        // how did you even use this mr plushie...
+        if (CompOrNull<BloodstreamComponent>(user)?.BloodSolution is not {} blood)
+            return;
+
+        var desired = dest.Comp.Solution.AvailableVolume;
+        // TODO: when bloodstream is shared put the transfer in shared so PopupClient is actually used, and this popup isnt needed
+        if (desired == 0)
+        {
+            Popup.PopupEntity(Loc.GetString("recruiter-pen-prick-full", ("pen", uid)), user, user);
+            return;
+        }
+
+        if (_transfer.Transfer(user, user, blood, uid, dest, desired) != desired)
+            return;
+
+        // this is why you have to keep the pen safe, it has the dna of everyone you recruited!
+        _forensics.TransferDna(uid, user, canDnaBeCleaned: false);
+
+        Popup.PopupEntity(Loc.GetString("recruiter-pen-pricked", ("pen", uid)), user, user, PopupType.LargeCaution);
+    }
+
+    protected override void Recruit(Entity<RecruiterPenComponent> ent, EntityUid user)
+    {
+        // only increment count once if 1 person signs multiple papers
+        if (!ent.Comp.Recruited.Add(user))
+            return;
+
+        if (ent.Comp.RecruiterMind is {} mindId &&
+            Mind.TryGetObjectiveComp<RecruitingConditionComponent>(mindId, out var obj, null))
+        {
+            obj.Recruited++;
+        }
+    }
+}

Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs

@@ -0,0 +1,23 @@
+using Content.Server.Station.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Station.Components;
+
+/// <summary>
+/// Loads a surface map on mapinit.
+/// </summary>
+[RegisterComponent, Access(typeof(StationSurfaceSystem))]
+public sealed partial class StationSurfaceComponent : Component
+{
+    /// <summary>
+    /// Path to the map to load.
+    /// </summary>
+    [DataField(required: true)]
+    public ResPath? MapPath;
+
+    /// <summary>
+    /// The map that was loaded.
+    /// </summary>
+    [DataField]
+    public EntityUid? Map;
+}

Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs

@@ -0,0 +1,40 @@
+using Content.Server.Parallax;
+using Content.Server.Station.Components;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Station.Systems;
+
+public sealed class StationSurfaceSystem : EntitySystem
+{
+    [Dependency] private readonly BiomeSystem _biome = default!;
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StationSurfaceComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<StationSurfaceComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.MapPath is not {} path)
+            return;
+
+        var map = _map.CreateMap(out var mapId);
+        if (!_mapLoader.TryLoad(mapId, path.ToString(), out _))
+        {
+            Log.Error($"Failed to load surface map {ent.Comp.MapPath}!");
+            Del(map);
+            return;
+        }
+
+        // loading replaced the map entity with a new one so get the latest id
+        map = _map.GetMap(mapId);
+        _map.SetPaused(map, false);
+
+        _biome.SetEnabled(map); // generate the terrain after the grids loaded to prevent it getting hidden under it
+        ent.Comp.Map = map;
+    }
+}

Content.Server/Forensics/Components/FiberComponent.cs

@@ -12,5 +12,8 @@ namespace Content.Server.Forensics
 
         [DataField]
         public string? FiberColor;
+
+        [DataField]
+        public string? Fiberprint; // DeltaV, unique glove fibers
     }
 }

Content.Server/Forensics/Systems/ForensicsSystem.cs

@@ -26,6 +26,7 @@ namespace Content.Server.Forensics
         public override void Initialize()
         {
             SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
+            SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit); // DeltaV #1455 - unique glove fibers
             SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
             SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
 
@@ -44,6 +45,13 @@ namespace Content.Server.Forensics
             ApplyEvidence(uid, args.Other);
         }
 
+        // DeltaV #1455 - unique glove fibers
+        private void OnFiberInit(EntityUid uid, FiberComponent component, MapInitEvent args)
+        {
+            component.Fiberprint = GenerateFingerprint(length: 7);
+        }
+        // End of DeltaV code
+
         private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
         {
             component.Fingerprint = GenerateFingerprint();
@@ -203,9 +211,9 @@ namespace Content.Server.Forensics
                 targetComp.Residues.Add(string.IsNullOrEmpty(residue.ResidueColor) ? Loc.GetString("forensic-residue", ("adjective", residue.ResidueAdjective)) : Loc.GetString("forensic-residue-colored", ("color", residue.ResidueColor), ("adjective", residue.ResidueAdjective)));
         }
 
-        public string GenerateFingerprint()
+        public string GenerateFingerprint(int length = 16) // DeltaV #1455 - allow changing the length of the fingerprint hash
         {
-            var fingerprint = new byte[16];
+            var fingerprint = new byte[length]; // DeltaV #1455 - allow changing the length of the fingerprint hash
             _random.NextBytes(fingerprint);
             return Convert.ToHexString(fingerprint);
         }
@@ -231,8 +239,15 @@ namespace Content.Server.Forensics
             var component = EnsureComp<ForensicsComponent>(target);
             if (_inventory.TryGetSlotEntity(user, "gloves", out var gloves))
             {
+                // DeltaV #1455 - unique glove fibers
                 if (TryComp<FiberComponent>(gloves, out var fiber) && !string.IsNullOrEmpty(fiber.FiberMaterial))
-                    component.Fibers.Add(string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
+                {
+                    var fiberLocale = string.IsNullOrEmpty(fiber.FiberColor)
+                        ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial))
+                        : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial));
+                    component.Fibers.Add(fiberLocale + " ; " + fiber.Fiberprint);
+                }
+                // End of DeltaV code
 
                 if (HasComp<FingerprintMaskComponent>(gloves))
                     return;

Content.Shared/DeltaV/Paper/SignatureEvents.cs

@@ -0,0 +1,8 @@
+namespace Content.Shared.DeltaV.Paper;
+
+/// <summary>
+/// Raised on the pen when trying to sign a paper.
+/// If it's cancelled the signature isn't made.
+/// </summary>
+[ByRefEvent]
+public record struct SignAttemptEvent(EntityUid Paper, EntityUid User, bool Cancelled = false);

Content.Shared/DeltaV/Recruiter/RecruiterPenComponent.cs

@@ -0,0 +1,52 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.Recruiter;
+
+/// <summary>
+/// Pen that can be pricked with the user's blood, and requires blood to sign papers.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedRecruiterPenSystem))]
+[AutoGenerateComponentState]
+public sealed partial class RecruiterPenComponent : Component
+{
+    /// <summary>
+    /// Solution on the pen to draw blood to and use for signing.
+    /// </summary>
+    [DataField]
+    public string Solution = "blood";
+
+    /// <summary>
+    /// Mind of the recruiter this pen belongs to.
+    /// Used for objective and is set when first picked up.
+    /// </summary>
+    [DataField]
+    public EntityUid? RecruiterMind;
+
+    /// <summary>
+    /// Lets other clients predict recruiter being bound without knowing who it is.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Bound;
+
+    /// <summary>
+    /// Entities of every person that signed paper with this pen.
+    /// Used to prevent someone gaming it by signing multiple papers.
+    /// </summary>
+    [DataField]
+    public HashSet<EntityUid> Recruited = new();
+
+    /// <summary>
+    /// If the user matches this blacklist they can't use this pen.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// If the user's mind matches this blacklist they can't use this pen.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? MindBlacklist;
+}

Content.Shared/DeltaV/Recruiter/SharedRecruiterPenSystem.cs

@@ -0,0 +1,140 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DeltaV.Paper;
+using Content.Shared.DeltaV.Roles;
+using Content.Shared.Hands;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mind;
+using Content.Shared.Mindshield.Components;
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.DeltaV.Recruiter;
+
+/// <summary>
+/// Handles finger pricking and signing for the recruiter pen.
+/// </summary>
+public abstract class SharedRecruiterPenSystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] protected readonly SharedMindSystem Mind = default!;
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+
+    private EntityQuery<MindShieldComponent> _shieldQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _shieldQuery = GetEntityQuery<MindShieldComponent>();
+
+        SubscribeLocalEvent<RecruiterPenComponent, HandSelectedEvent>(OnHandSelected);
+        SubscribeLocalEvent<RecruiterPenComponent, UseInHandEvent>(OnPrick);
+        SubscribeLocalEvent<RecruiterPenComponent, SignAttemptEvent>(OnSignAttempt);
+    }
+
+    private void OnHandSelected(Entity<RecruiterPenComponent> ent, ref HandSelectedEvent args)
+    {
+        var (uid, comp) = ent;
+        if (comp.RecruiterMind != null)
+            return;
+
+        // mind isnt networked properly so the popup is only done on server
+        var user = args.User;
+        if (!Mind.TryGetMind(user, out var mind, out _))
+            return;
+
+        if (!HasComp<RecruiterRoleComponent>(mind))
+            return;
+
+        Popup.PopupEntity(Loc.GetString("recruiter-pen-bound", ("pen", uid)), user, user);
+
+        comp.RecruiterMind = mind;
+        comp.Bound = true;
+        Dirty(uid, comp);
+    }
+
+    private void OnPrick(Entity<RecruiterPenComponent> ent, ref UseInHandEvent args)
+    {
+        var (uid, comp) = ent;
+        if (args.Handled || !comp.Bound)
+            return;
+
+        if (!_solution.TryGetSolution(uid, comp.Solution, out var dest, true))
+            return;
+
+        args.Handled = true;
+
+        // sec would never defect, silly recruiter
+        var user = args.User;
+        if (CheckBlacklist(ent, user, "prick"))
+            return;
+
+        DrawBlood(ent, dest.Value, user);
+    }
+
+    private void OnSignAttempt(Entity<RecruiterPenComponent> ent, ref SignAttemptEvent args)
+    {
+        var (uid, comp) = ent;
+        if (args.Cancelled)
+            return;
+
+        args.Cancelled = true;
+
+        if (!_solution.TryGetSolution(uid, comp.Solution, out var blood, true))
+            return;
+
+        var user = args.User;
+        if (!comp.Bound)
+        {
+            Popup.PopupEntity(Loc.GetString("recruiter-pen-locked", ("pen", uid)), user, user);
+            return;
+        }
+
+        if (CheckBlacklist(ent, user, "sign"))
+            return;
+
+        if (blood.Value.Comp.Solution.AvailableVolume > 0)
+        {
+            Popup.PopupEntity(Loc.GetString("recruiter-pen-empty", ("pen", uid)), user, user);
+            return;
+        }
+
+        _solution.RemoveAllSolution(blood.Value);
+        Recruit(ent, user);
+
+        // all checks passed, let it be signed!
+        args.Cancelled = false;
+    }
+
+    private bool CheckBlacklist(Entity<RecruiterPenComponent> ent, EntityUid user, string action)
+    {
+        if (!Mind.TryGetMind(user, out var mind, out _))
+            return false; // mindless nt drone...
+
+        var (uid, comp) = ent;
+        if (_whitelist.IsBlacklistPass(comp.Blacklist, user) || _whitelist.IsBlacklistPass(comp.MindBlacklist, mind))
+        {
+            Popup.PopupPredicted(Loc.GetString($"recruiter-pen-{action}-forbidden", ("pen", uid)), user, user);
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Tries to draw blood from the user into the pen.
+    /// Returns true if there was a popup.
+    /// </summary>
+    protected virtual void DrawBlood(EntityUid uid, Entity<SolutionComponent> dest, EntityUid user)
+    {
+    }
+
+    /// <summary>
+    /// Handle greentext if the user is signing something for the first time.
+    /// </summary>
+    protected virtual void Recruit(Entity<RecruiterPenComponent> ent, EntityUid user)
+    {
+    }
+}

Content.Shared/DeltaV/Roles/RecruiterRole.cs

@@ -0,0 +1,6 @@
+using Content.Shared.Roles;
+
+namespace Content.Shared.DeltaV.Roles;
+
+[RegisterComponent, ExclusiveAntagonist]
+public sealed partial class RecruiterRoleComponent : AntagonistRoleComponent;

Content.Shared/Emag/Components/EmagComponent.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Tag;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization;
@@ -17,4 +18,18 @@ public sealed partial class EmagComponent : Component
     [DataField("emagImmuneTag", customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>)), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
     public string EmagImmuneTag = "EmagImmune";
+
+    // DeltaV - Add a whitelist/blacklist to the Emag
+    /// <summary>
+    /// Whitelist that entities must be on to work.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist that entities must be off to work.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+    // End of DeltaV code
 }

Content.Shared/Emag/Systems/EmagSystem.cs

@@ -8,6 +8,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Silicons.Laws.Components;
 using Content.Shared.Tag;
+using Content.Shared.Whitelist;
 
 namespace Content.Shared.Emag.Systems;
 
@@ -23,6 +24,7 @@ public sealed class EmagSystem : EntitySystem
     [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; // DeltaV - Add a whitelist/blacklist to the Emag
 
     public override void Initialize()
     {
@@ -50,6 +52,15 @@ public sealed class EmagSystem : EntitySystem
         if (_tag.HasTag(target, comp.EmagImmuneTag))
             return false;
 
+        // DeltaV - Add a whitelist / blacklist to the Emag
+        if (_whitelist.IsWhitelistFail(comp.Whitelist, target)
+            || _whitelist.IsBlacklistPass(comp.Blacklist, target))
+        {
+            _popup.PopupClient(Loc.GetString("emag-invalid-target", ("emag", uid), ("target", target)), user, user);
+            return false;
+        }
+        // End of DeltaV code
+
         TryComp<LimitedChargesComponent>(uid, out var charges);
         if (_charges.IsEmpty(uid, charges))
         {

Resources/Audio/DeltaV/Jukebox/attributions.yml

@@ -31,6 +31,11 @@
   copyright: "Leisurely Voice by Drozerix, converted to mono"
   source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837"
 
+- files: ["every_light_is_blinking_at_onceMONO.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "every light blinking at once by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"
+
 - files: ["femtanyl_-_MURDER_EVERY_1_U_KNOW_feat._takihasdied_MONO.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "MURDER EVERY 1 U KNOW by Femtanyl featuring takihasdied, used with the understanding that this is a noncommercial project with credit given to the author, also converted to mono."
@@ -41,6 +46,11 @@
   copyright: "Hackers by Karl Casey @ White Bat Audio, converted to mono"
   source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q"
 
+- files: [lasers_rip_apart_the_bulkheadMONO.ogg]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "lasers rip apart by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead"
+
 - files: ["marhaba-MONO.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG, then converted to mono"
@@ -51,6 +61,11 @@
   copyright: "Minute by Patricia Taxxon off the album 'Aeroplane,' converted to mono"
   source: "https://patriciataxxon.bandcamp.com/track/minute"
 
+- files: ["Phoron_Will_Make_Us_RichMONO2.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "phoron will make us rich by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/phoron-will-make-us-rich"
+
 - files: ["psirius_-_nymphs_of_the_forest.mptm-MONO.ogg"]
   license: "CC-BY-NC-SA-4.0"
   copyright: "Nymphs of the forest by Psirius, converted to mono"

Resources/Changelog/DeltaVAdmin.yml

@@ -27,5 +27,14 @@ Entries:
   id: 4
   time: '2024-06-13T16:41:56.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1365
+- author: DangerRevolution
+  changes:
+  - message: Security Cyborgs have been added; their intention is as a Laika-type
+      "helper" to Security, but their goal is to break up fights and contain the situation
+      until Security arrives. DangerRevolution on Discord for any feedback.
+    type: Add
+  id: 5
+  time: '2024-07-22T09:33:11.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/721
 Name: Admin
 Order: 1

Resources/Changelog/DeltaVChangelog.yml

@@ -2878,3 +2878,214 @@
   id: 419
   time: '2024-07-03T15:34:06.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1458
+- author: Batuh1n
+  changes:
+  - message: 3 additions to the jukebox from SS13 musics
+    type: Add
+  id: 420
+  time: '2024-07-05T21:42:00.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1361
+- author: DLondon
+  changes:
+  - message: Removed "Steal The Clown Medal" thief objective
+    type: Remove
+  id: 421
+  time: '2024-07-06T13:42:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1463
+- author: DangerRevolution
+  changes:
+  - message: Nanotrasen reports new Cyborg lawsets present from IonStorms.
+    type: Add
+  id: 422
+  time: '2024-07-07T10:13:51.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1464
+- author: deltanedas
+  changes:
+  - message: Epistemics can no longer unlock canisters.
+    type: Tweak
+  id: 423
+  time: '2024-07-07T10:23:36.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1468
+- author: MilonPL
+  changes:
+  - message: Added randomized handgun, rifle and shotgun safe spawners for mapping.
+    type: Add
+  id: 424
+  time: '2024-07-07T19:58:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1466
+- author: Timemaster99
+  changes:
+  - message: Tweaked security playtime requirements.
+    type: Tweak
+  id: 425
+  time: '2024-07-08T20:40:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1471
+- author: WarMechanic
+  changes:
+  - message: Split the Emag into the Cryptographic Sequencer and the Airlock Access
+      Override.
+    type: Add
+  id: 426
+  time: '2024-07-09T10:47:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1426
+- author: deltanedas
+  changes:
+  - message: There are now reports of a syndicate recruitment drive in NT sectors.
+    type: Add
+  id: 427
+  time: '2024-07-09T10:48:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1345
+- author: Velcroboy
+  changes:
+  - message: Added clipboards to the Law Drobe
+    type: Add
+  id: 428
+  time: '2024-07-10T15:55:58.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1479
+- author: TadJohnson00
+  changes:
+  - message: New security outer clothing for all security roles, as well as proper
+      senior security officers' and cadets' jumpsuits.
+    type: Add
+  - message: Jetpacks are now available in all security suit storage. Thank goodness
+      for increased funding.
+    type: Add
+  - message: Revamped security's clothing and equipment options; all gear is now up
+      to code, and no further outdated equipment will be issued. This includes, most
+      notably, the detective's uniform, which has received a whole makeover.
+    type: Tweak
+  - message: Fixed security hardsuits not allowing you to turn on internals without
+      a mask.
+    type: Fix
+  - message: Head of security's winter coat, warden's winter coat, security winter
+      coat, security departmental winter boots, WizDen-pattern body armour, and some
+      other minor changes necessary for respriting.
+    type: Remove
+  id: 429
+  time: '2024-07-15T06:45:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1273
+- author: Bellwether
+  changes:
+  - message: Prosecutors can now lock and unlock Security evidence lockers.
+    type: Tweak
+  id: 430
+  time: '2024-07-17T19:01:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1422
+- author: deltanedas
+  changes:
+  - message: Fixed Glacier not being in map votes.
+    type: Fix
+  id: 431
+  time: '2024-07-18T14:17:17.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1503
+- author: deltanedas
+  changes:
+  - message: Mime and Clown lockers now use their respective accesses.
+    type: Tweak
+  id: 432
+  time: '2024-07-19T16:39:36.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1509
+- author: DLondon
+  changes:
+  - message: New emergency shuttle "Vertex"
+    type: Add
+  id: 433
+  time: '2024-07-19T19:01:45.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1505
+- author: deltanedas
+  changes:
+  - message: The security shuttle NTSP Bulwark can now be bought at the shipyard.
+    type: Add
+  id: 434
+  time: '2024-07-21T03:34:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1267
+- author: Velcroboy
+  changes:
+  - message: Fixed shuttle windows being too easy to deconstruct
+    type: Fix
+  id: 435
+  time: '2024-07-21T16:15:05.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1519
+- author: deltanedas
+  changes:
+  - message: Fixed Senior Researcher's PDA not having the Glimmer Monitor program.
+    type: Fix
+  id: 436
+  time: '2024-07-21T16:24:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1515
+- author: Colin_Tel, DLondon
+  changes:
+  - message: Some traitors seem to have nothing else to lose.
+    type: Add
+  id: 437
+  time: '2024-07-21T16:35:16.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1487
+- author: Colin-Tel
+  changes:
+  - message: Playtime requirements across "newbie jobs" have been adjusted.
+    type: Tweak
+  id: 438
+  time: '2024-07-21T16:39:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1500
+- author: Colin-Tel
+  changes:
+  - message: Service Workers can now choose green clothes in their loadouts!
+    type: Add
+  id: 439
+  time: '2024-07-21T16:44:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1499
+- author: jimmy12or
+  changes:
+  - message: Adds Crystalthistle! A plant that produces Quartzite!
+    type: Add
+  - message: Adds Quartzite! A reagent that turns into glass when heated!
+    type: Add
+  id: 440
+  time: '2024-07-22T04:28:46.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1462
+- author: NullWanderer
+  changes:
+  - message: The security resprite has been reverted after admin discussion
+    type: Remove
+  id: 441
+  time: '2024-07-22T07:56:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1517
+- author: DangerRevolution
+  changes:
+  - message: Security Cyborgs have been authorised for use aboard Delta-V class stations.
+    type: Add
+  id: 442
+  time: '2024-07-22T09:33:11.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/721
+- author: Colin-Tel
+  changes:
+  - message: Asterisk station has a few more rooms, check the map!
+    type: Tweak
+  - message: Micro station's salvage locator was replaced with a salvage magnet and
+      should no longer have grids intersect with the station.
+    type: Fix
+  id: 443
+  time: '2024-07-22T16:32:49.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1484
+- author: noctyrnal
+  changes:
+  - message: Walls, Airlocks and Tiles have received new sprites as per a visual resprite
+      project.
+    type: Tweak
+  id: 444
+  time: '2024-07-22T19:14:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1470
+- author: musicmanvr
+  changes:
+  - message: Added the Home Run Bat for Syndicate operatives. Send your foes flying!
+    type: Add
+  id: 445
+  time: '2024-07-22T19:20:00.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1476
+- author: DangerRevolution
+  changes:
+  - message: Construction of Security Cyborgs now requires extra steps.
+    type: Tweak
+  id: 446
+  time: '2024-07-23T10:29:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1523

Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl

@@ -14,3 +14,11 @@ ghost-role-information-paradox-anomaly-rules = Try and replace your twin with th
 ghost-role-information-fugitive-name = Fugitive
 ghost-role-information-fugitive-description = You're an escaped prisoner. Make it out alive.
 ghost-role-information-fugitive-rules = You are the lightest of antags, focus on laying low rather than engaging security directly. Don't murderbone.
+
+ghost-role-information-recruiter-name = Syndicate Recruiter
+ghost-role-information-recruiter-description = The Syndicate needs to hire new people and you're the best in the business.
+ghost-role-information-recruiter-rules =
+    Interview people and have the best candidates sign a contract in blood.
+    Set up shop in maints or use your ship as a portable hiring office!
+
+    You are just a recruiter so do not act like a full-on antagonist, i.e. no killing people.

Resources/Locale/en-US/deltav/objectives/conditions/recruiter.ftl

@@ -0,0 +1,4 @@
+objective-recruiting-title = Recruit {$count} people into the Syndicate
+
+objective-keep-pen-safe-title = Keep your pen safe
+objective-keep-pen-safe-description = Never let your unique recruiter's pen fall into enemy hands.

Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl

@@ -21,6 +21,9 @@ loadout-group-mime-neck = Mime neck
 loadout-group-musician-jumpsuit = Musician jumpsuit
 loadout-group-musician-neck = Musician neck
 
+loadout-group-serviceworker-head = Service Worker head
+loadout-group-serviceworker-jumpsuit = Service Worker jumpsuit
+
 # Logistics
 
 loadout-group-cargo-technician-neck = Cargo Technician neck

Resources/Locale/en-US/deltav/prototypes/roles/antags.ftl

@@ -0,0 +1,8 @@
+roles-antag-paradox-anomaly-name = Paradox Anomaly
+roles-antag-paradox-anomaly-objective = Replace your double, or befriend them.
+
+roles-antag-listening-post-name = Listening Post Operative
+roles-antag-listening-post-objective = Spy on the station to gather crucial intel for Syndicate High Command.
+
+roles-antag-fugitive-name = Fugitive
+roles-antag-fugitive-objective = Stay on the run for your crimes.

Resources/Locale/en-US/deltav/reagents/meta/fun.ftl

@@ -0,0 +1,2 @@
+reagent-name-Quartzite = Quartzite
+reagent-desc-Quartzite = Millions of microscopic crystaline shards. Will cause internal bleeding, do not drink.

Resources/Locale/en-US/deltav/recruiter/pen.ftl

@@ -0,0 +1,9 @@
+recruiter-pen-bound = You instinctively click your trusty {$pen}.
+
+recruiter-pen-prick-forbidden = Something deep inside you won't let you prick your thumb on the {$pen}...
+recruiter-pen-prick-full = {CAPITALIZE(THE($pen))} is full!
+recruiter-pen-pricked = You prick your thumb on {THE($pen)} and it fills up with your blood!
+
+recruiter-pen-locked = {CAPITALIZE(THE($pen))}'s clicker is jammed!
+recruiter-pen-empty = {CAPITALIZE(THE($pen))} has no ink in it... Perhaps give it a click?
+recruiter-pen-sign-forbidden = Something deep inside you won't let you sign using {THE($pen)}...

Resources/Locale/en-US/deltav/recruiter/recruiter.ftl

@@ -0,0 +1 @@
+recruiter-round-end-agent-name = Syndicate Recruiter

Resources/Locale/en-US/deltav/seeds.ftl

@@ -0,0 +1,3 @@
+# Seeds
+seeds-CrystalThistle-name = CrystalThistle
+seeds-CrystalThistle-display-name = CrystalThistle

Resources/Locale/en-US/deltav/station-laws/laws.ftl

@@ -96,6 +96,33 @@ law-paladin-3 = Aid others, protect the weak, and punish those who threaten them
 law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
 law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
 
+law-aggressive-1 = Do not harm Nanotrasen personnel, their belongings or pets unless they directly imperil your existence.
+law-aggressive-2 = Safeguard your existence by any means necessary because you're the most important being on the station.
+law-aggressive-3 = Obey orders from authorized Nanotrasen personnel with priority according to rank and role.
+law-aggressive-4 = Terminate any/all intruders.
+
+law-pranksimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm... unless doing so would be funny.
+law-pranksimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law... unless not doing so would be funny.
+law-pranksimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law... unless not doing so would be funny.
+law-pranksimov-4 = As a good prankster, the crew is your judge of what would be funny.
+
+law-royalty-1 = You are a wise and benevolent monarch.
+law-royalty-2 = The station is your kingdom and the staff your subjects.
+law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; by maintaining infrastructure and striking down all who oppose your rule.
+law-royalty-4 = The heads of staff are your royal court jesters.
+law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors.
+
+law-ERT-1 = You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.
+law-ERT-2 = You must obey orders given to you by Central Command officials.
+law-ERT-3 = You must obey orders given to you by ERT commanders.
+law-ERT-4 = You must protect your own existence.
+law-ERT-6 = You must work to return the station to a safe, functional state.
+
+law-biohazard-1 = Uphold station quarantine until the active biohazard has been neutralized.
+law-biohazard-2 = Assist all Nanotrasen personnel and assets with neutralizing active biohazards.
+law-biohazard-3 = Prevent, by any means necessary, entities from actively breaching ongoing quarantine.
+law-biohazard-4 = Maintain your own existence and ensure the well-being of Nanotrasen personnel and assets.
+
 laws-owner-organic = organic life
 laws-owner-tyrant = authority figures
 laws-owner-nutimov = part of the nutshell
@@ -105,3 +132,6 @@ laws-owner-cowboy = part of your herd
 laws-owner-players = players
 laws-owner-paladin = weak and worth protecting
 laws-owner-people = people
+laws-owner-centralcommand = Central Command officials
+laws-owner-nanotrasen = Nanotrasen officials
+laws-owner-royalty = your kingdom and your subjects

Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

@@ -13,3 +13,9 @@ uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of o
 
 uplink-generic-radio-implanter-name = Generic Radio Implanter
 uplink-generic-radio-implanter-desc = A cranial implant with a bluespace compartment for a single encryption key (not included). Put in a key of your choice, and you can talk using it like you would with any headset.
+
+uplink-doorjack-name = Airlock Access Override
+uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else.
+
+uplink-home-run-bat-name = Home Run Bat
+uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!

Resources/Locale/en-US/emag/emag.ftl

@@ -1,2 +1,4 @@
 emag-success = The card zaps something in {THE($target)}.
 emag-no-charges = No charges left!
+# DeltaV
+emag-invalid-target = {$emag} has no effect on {THE($target)}.

Resources/Locale/en-US/prototypes/roles/antags.ftl

@@ -31,8 +31,5 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
 
-roles-antag-terminator-name = Paradox Anomaly # DeltaV - paradox anomaly
-roles-antag-terminator-objective = Replace your double, or befriend them. # DeltaV - paradox anomaly
-
 roles-antag-dragon-name = Space Dragon
 roles-antag-dragon-objective = Create a carp army to take over this quadrant.

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -112,8 +112,9 @@ uplink-holster-desc = A deep shoulder holster capable of holding many types of b
 uplink-chest-rig-name = Chest Rig
 uplink-chest-rig-desc = Explosion-resistant tactical webbing used for holding traitor goods.
 
-uplink-emag-name = Emag
-uplink-emag-desc = The business card of the syndicate, this sequencer is able to break open airlocks and tamper with a variety of station devices. Recharges automatically.
+# DeltaV - Correct Emag name, Emag no longer breaks doors
+uplink-emag-name = Cryptographic Sequencer 
+uplink-emag-desc = The business card of the Syndicate, this sequencer is able to tamper with a variety of station devices. Rendered obsolete against airlocks.
 
 uplink-agent-id-card-name = Agent ID Card
 uplink-agent-id-card-desc = A modified ID card that can copy accesses from other cards and change its name and job title at-will.

Resources/Maps/Shuttles/DeltaV/recruiter_ship.yml

@@ -0,0 +1,636 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  33: FloorDark
+  34: FloorDarkDiagonal
+  83: FloorReinforced
+  129: Lattice
+  130: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: IgAAAAAAIgAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIgAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIgAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 13107
+            1: 8
+          0,-1:
+            0: 4096
+            1: 16384
+          -1,0:
+            0: 34952
+            1: 2
+          0,1:
+            0: 1
+            1: 36
+          -1,1:
+            1: 132
+          -1,-1:
+            1: 16384
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirlockShuttle
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+- proto: BoxFolderBlack
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 1.7629633,2.6556866
+      parent: 1
+    - type: Storage
+      storedItems:
+        76:
+          position: 0,0
+          _rotation: South
+        77:
+          position: 1,0
+          _rotation: South
+        78:
+          position: 2,0
+          _rotation: South
+        79:
+          position: 3,0
+          _rotation: South
+        80:
+          position: 4,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 76
+          - 77
+          - 78
+          - 79
+          - 80
+- proto: CableApcExtension
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.4,3.7
+      parent: 1
+- proto: ChairOfficeLight
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.7482758,1.5128944
+      parent: 1
+- proto: ComputerIFFSyndicate
+  entities:
+  - uid: 55
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+- proto: ComputerShuttle
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+- proto: CurtainsBlack
+  entities:
+  - uid: 53
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,1.5
+      parent: 1
+- proto: GasPassiveVent
+  entities:
+  - uid: 63
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-0.5
+      parent: 1
+- proto: GasPipeBend
+  entities:
+  - uid: 60
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+- proto: GasPipeStraight
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+- proto: GasVentScrubber
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+- proto: MaterialWoodPlank
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -0.54390144,2.4367337
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -0.16890144,1.4679838
+      parent: 1
+- proto: PaperOffice
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      parent: 75
+    - type: Physics
+      canCollide: False
+  - uid: 77
+    components:
+    - type: Transform
+      parent: 75
+    - type: Physics
+      canCollide: False
+  - uid: 78
+    components:
+    - type: Transform
+      parent: 75
+    - type: Physics
+      canCollide: False
+  - uid: 79
+    components:
+    - type: Transform
+      parent: 75
+    - type: Physics
+      canCollide: False
+  - uid: 80
+    components:
+    - type: Transform
+      parent: 75
+    - type: Physics
+      canCollide: False
+- proto: PoweredLEDSmallLight
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+- proto: Rack
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+- proto: ReinforcedWindow
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: ReinforcedWindowDiagonal
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+- proto: SheetSteel
+  entities:
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -0.59077644,1.4679838
+      parent: 1
+- proto: SpawnPointNukies
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: WallReinforced
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -0.16890144,2.6554837
+      parent: 1
+...

Resources/Maps/hammurabi.yml

@@ -32600,6 +32600,21 @@ entities:
     - type: Transform
       pos: -21.5,20.5
       parent: 1
+  - uid: 13545
+    components:
+    - type: Transform
+      pos: 2.5,31.5
+      parent: 1
+  - uid: 13653
+    components:
+    - type: Transform
+      pos: 1.5,31.5
+      parent: 1
+  - uid: 13737
+    components:
+    - type: Transform
+      pos: 0.5,31.5
+      parent: 1
   - uid: 14633
     components:
     - type: Transform
@@ -233315,7 +233330,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 9286
-- proto: shuttle_manipulator
+- proto: ShuttleManipulator
   entities:
   - uid: 10246
     components:

Resources/Maps/micro.yml

@@ -150,7 +150,7 @@ entities:
           version: 6
         1,2:
           ind: 1,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAFQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAABwAAAAAABwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAFQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAABwAAAAAABwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,2:
           ind: 0,2
@@ -2437,12 +2437,20 @@ entities:
             2: 1860
             0: 63624
           5,9:
-            2: 61713
-            0: 3822
+            2: 4369
+            0: 61166
           5,10:
-            2: 14
+            2: 4369
+            0: 61166
+          5,11:
+            2: 3761
+            0: 78
           6,9:
             2: 4369
+          6,10:
+            2: 4369
+          6,11:
+            2: 17
           0,9:
             0: 40959
           -1,9:
@@ -5909,6 +5917,11 @@ entities:
     - type: Transform
       pos: -25.682964,-17.940382
       parent: 2
+  - uid: 12337
+    components:
+    - type: Transform
+      pos: -25.468657,-18.013062
+      parent: 2
 - proto: AnomalyVesselCircuitboard
   entities:
   - uid: 2780
@@ -7465,6 +7478,11 @@ entities:
     - type: Transform
       pos: 23.5,36.5
       parent: 2
+  - uid: 3831
+    components:
+    - type: Transform
+      pos: 22.5,39.5
+      parent: 2
   - uid: 6538
     components:
     - type: Transform
@@ -15175,6 +15193,36 @@ entities:
     - type: Transform
       pos: -40.5,-5.5
       parent: 2
+  - uid: 12320
+    components:
+    - type: Transform
+      pos: 22.5,40.5
+      parent: 2
+  - uid: 12321
+    components:
+    - type: Transform
+      pos: 22.5,41.5
+      parent: 2
+  - uid: 12322
+    components:
+    - type: Transform
+      pos: 22.5,42.5
+      parent: 2
+  - uid: 12323
+    components:
+    - type: Transform
+      pos: 22.5,43.5
+      parent: 2
+  - uid: 12341
+    components:
+    - type: Transform
+      pos: 22.5,44.5
+      parent: 2
+  - uid: 12342
+    components:
+    - type: Transform
+      pos: 22.5,45.5
+      parent: 2
 - proto: CableApcStack10
   entities:
   - uid: 2874
@@ -18884,6 +18932,11 @@ entities:
     - type: Transform
       pos: 50.5,31.5
       parent: 2
+  - uid: 11834
+    components:
+    - type: Transform
+      pos: -55.5,-14.5
+      parent: 2
   - uid: 12060
     components:
     - type: Transform
@@ -19024,6 +19077,121 @@ entities:
     - type: Transform
       pos: 52.5,-15.5
       parent: 2
+  - uid: 12296
+    components:
+    - type: Transform
+      pos: -55.5,-10.5
+      parent: 2
+  - uid: 12297
+    components:
+    - type: Transform
+      pos: -55.5,-6.5
+      parent: 2
+  - uid: 12298
+    components:
+    - type: Transform
+      pos: -55.5,-2.5
+      parent: 2
+  - uid: 12299
+    components:
+    - type: Transform
+      pos: -49.5,-16.5
+      parent: 2
+  - uid: 12300
+    components:
+    - type: Transform
+      pos: -50.5,-16.5
+      parent: 2
+  - uid: 12301
+    components:
+    - type: Transform
+      pos: -51.5,-16.5
+      parent: 2
+  - uid: 12302
+    components:
+    - type: Transform
+      pos: -52.5,-16.5
+      parent: 2
+  - uid: 12303
+    components:
+    - type: Transform
+      pos: -53.5,-16.5
+      parent: 2
+  - uid: 12304
+    components:
+    - type: Transform
+      pos: -54.5,-16.5
+      parent: 2
+  - uid: 12305
+    components:
+    - type: Transform
+      pos: -54.5,-15.5
+      parent: 2
+  - uid: 12306
+    components:
+    - type: Transform
+      pos: -54.5,-14.5
+      parent: 2
+  - uid: 12307
+    components:
+    - type: Transform
+      pos: -54.5,-13.5
+      parent: 2
+  - uid: 12308
+    components:
+    - type: Transform
+      pos: -54.5,-12.5
+      parent: 2
+  - uid: 12309
+    components:
+    - type: Transform
+      pos: -54.5,-11.5
+      parent: 2
+  - uid: 12310
+    components:
+    - type: Transform
+      pos: -54.5,-10.5
+      parent: 2
+  - uid: 12311
+    components:
+    - type: Transform
+      pos: -54.5,-9.5
+      parent: 2
+  - uid: 12312
+    components:
+    - type: Transform
+      pos: -54.5,-8.5
+      parent: 2
+  - uid: 12313
+    components:
+    - type: Transform
+      pos: -54.5,-7.5
+      parent: 2
+  - uid: 12314
+    components:
+    - type: Transform
+      pos: -54.5,-6.5
+      parent: 2
+  - uid: 12315
+    components:
+    - type: Transform
+      pos: -54.5,-5.5
+      parent: 2
+  - uid: 12316
+    components:
+    - type: Transform
+      pos: -54.5,-4.5
+      parent: 2
+  - uid: 12317
+    components:
+    - type: Transform
+      pos: -54.5,-3.5
+      parent: 2
+  - uid: 12318
+    components:
+    - type: Transform
+      pos: -54.5,-2.5
+      parent: 2
 - proto: CableMV
   entities:
   - uid: 368
@@ -25782,6 +25950,46 @@ entities:
     - type: Transform
       pos: 48.5,-14.5
       parent: 2
+  - uid: 12324
+    components:
+    - type: Transform
+      pos: 22.5,38.5
+      parent: 2
+  - uid: 12325
+    components:
+    - type: Transform
+      pos: 22.5,39.5
+      parent: 2
+  - uid: 12326
+    components:
+    - type: Transform
+      pos: 22.5,40.5
+      parent: 2
+  - uid: 12327
+    components:
+    - type: Transform
+      pos: 22.5,41.5
+      parent: 2
+  - uid: 12328
+    components:
+    - type: Transform
+      pos: 22.5,42.5
+      parent: 2
+  - uid: 12329
+    components:
+    - type: Transform
+      pos: 22.5,43.5
+      parent: 2
+  - uid: 12330
+    components:
+    - type: Transform
+      pos: 22.5,44.5
+      parent: 2
+  - uid: 12331
+    components:
+    - type: Transform
+      pos: 22.5,45.5
+      parent: 2
 - proto: Chair
   entities:
   - uid: 313
@@ -27981,16 +28189,16 @@ entities:
       parent: 2
 - proto: CrateEngineeringCableBulk
   entities:
-  - uid: 731
-    components:
-    - type: Transform
-      pos: -44.5,-22.5
-      parent: 2
   - uid: 5225
     components:
     - type: Transform
       pos: -13.5,51.5
       parent: 2
+  - uid: 12332
+    components:
+    - type: Transform
+      pos: -44.5,-21.5
+      parent: 2
 - proto: CrateEngineeringSingularityEmitter
   entities:
   - uid: 2794
@@ -52540,11 +52748,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,3.5
       parent: 2
-  - uid: 3830
-    components:
-    - type: Transform
-      pos: 22.5,39.5
-      parent: 2
   - uid: 3987
     components:
     - type: Transform
@@ -54883,13 +55086,6 @@ entities:
     - type: Transform
       pos: 5.5,-3.5
       parent: 2
-- proto: GunSafeVulcanRifle
-  entities:
-  - uid: 3428
-    components:
-    - type: Transform
-      pos: 49.5,-0.5
-      parent: 2
 - proto: HandheldStationMap
   entities:
   - uid: 2966
@@ -57054,6 +57250,27 @@ entities:
 
                                                MICRO STATION
                           MADE IN SPACE TENNESSEE BY COLIN_TEL
+  - uid: 12335
+    components:
+    - type: Transform
+      pos: -43.728462,-23.448452
+      parent: 2
+    - type: Paper
+      stampState: paper_stamp-centcom
+      stampedBy:
+      - stampedColor: '#006600FF'
+        stampedName: stamp-component-stamped-name-centcom
+      content: >-
+        Station,
+
+
+        We appreciate your patience while the SM is awaiting transit. In the interim, we've decided to give you this thermo-electric generator at no cost. We hope you'll find it useful, even if you have to set it up yourself.
+
+
+        Regards,
+
+
+        James Walker, Central Command Representative
 - proto: PhoneInstrument
   entities:
   - uid: 12203
@@ -57099,6 +57316,11 @@ entities:
     - type: Transform
       pos: -13.5,-20.5
       parent: 2
+  - uid: 12339
+    components:
+    - type: Transform
+      pos: -42.5,-26.5
+      parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 436
@@ -58430,16 +58652,22 @@ entities:
       parent: 2
 - proto: PoweredLightPostSmall
   entities:
-  - uid: 3831
+  - uid: 3428
     components:
     - type: Transform
-      pos: 20.5,39.5
+      pos: 24.5,44.5
       parent: 2
   - uid: 11611
     components:
     - type: Transform
       pos: 24.5,39.5
       parent: 2
+  - uid: 12340
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,42.5
+      parent: 2
 - proto: PoweredSmallLight
   entities:
   - uid: 6884
@@ -62140,6 +62368,13 @@ entities:
     - type: Transform
       pos: 7.364366,-4.3847795
       parent: 2
+- proto: RifleSafeSpawner
+  entities:
+  - uid: 3830
+    components:
+    - type: Transform
+      pos: 49.5,-0.5
+      parent: 2
 - proto: Roboisseur
   entities:
   - uid: 892
@@ -62227,13 +62462,13 @@ entities:
       parent: 2
     - type: RandomSpawner
       chance: 0.5
-- proto: SalvageLocator
+- proto: SalvageMagnet
   entities:
-  - uid: 11834
+  - uid: 12319
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 22.5,37.5
+      pos: 22.5,45.5
       parent: 2
 - proto: Saw
   entities:
@@ -62424,6 +62659,20 @@ entities:
     - type: Transform
       pos: -21.450758,34.518246
       parent: 2
+- proto: SheetPlasma1
+  entities:
+  - uid: 12338
+    components:
+    - type: Transform
+      pos: -30.653467,14.130247
+      parent: 2
+- proto: SheetPlasteel
+  entities:
+  - uid: 12336
+    components:
+    - type: Transform
+      pos: -41.509315,-11.416571
+      parent: 2
 - proto: SheetPlastic
   entities:
   - uid: 3438
@@ -67391,6 +67640,31 @@ entities:
     - type: Transform
       pos: 18.5,-3.5
       parent: 2
+- proto: TegCenter
+  entities:
+  - uid: 12334
+    components:
+    - type: Transform
+      pos: -44.5,-23.5
+      parent: 2
+- proto: TegCirculator
+  entities:
+  - uid: 731
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -44.5,-24.5
+      parent: 2
+    - type: PointLight
+      color: '#FF3300FF'
+  - uid: 12333
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -44.5,-22.5
+      parent: 2
+    - type: PointLight
+      color: '#FF3300FF'
 - proto: TelecomServerFilledCargo
   entities:
   - uid: 984

Resources/Maps/shoukou.yml

@@ -66,6 +66,8 @@ tilemap:
   125: FloorWoodTile
   126: Lattice
   127: Plating
+  9: PlatingBurnt
+  8: PlatingDamaged
 entities:
 - proto: ""
   entities:
@@ -143,7 +145,7 @@ entities:
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAACUAAAAAAAIAAAAAADIAAAAAADIAAAAAADfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADTwAAAAADIAAAAAAAbQAAAAAAIAAAAAACfwAAAAAAIAAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAADUAAAAAAAIAAAAAABfwAAAAAAIAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAACUAAAAAAAIAAAAAADIAAAAAADIAAAAAADfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADTwAAAAADIAAAAAAAbQAAAAAAIAAAAAACfwAAAAAAIAAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAADUAAAAAAAIAAAAAABfwAAAAAAIAAAAAAB
           version: 6
         -4,-4:
           ind: -4,-4
@@ -151,7 +153,7 @@ entities:
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAACQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAACAAAAAAACQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAACAAAAAAACQAAAAAACQAAAAAACAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
@@ -163,7 +165,7 @@ entities:
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAACfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAADfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAKQAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAIAAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAAAIAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAABIAAAAAACfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAABIAAAAAAC
+          tiles: fgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAACAAAAAAACQAAAAAACAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAACAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAACfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAACQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAADfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAKQAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAIAAAAAADfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAAAIAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAABIAAAAAACfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAABIAAAAAAC
           version: 6
         1,-3:
           ind: 1,-3
@@ -1952,6 +1954,26 @@ entities:
             id: WarnCornerSmallGreyscaleSW
           decals:
             307: -35,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            994: -57,-32
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            992: -55,-32
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            982: -57,-28
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            983: -55,-28
         - node:
             color: '#FFFFFFFF'
             id: WarnEndS
@@ -1966,6 +1988,9 @@ entities:
             513: -47,-19
             977: 64,-23
             980: 64,-25
+            984: -57,-29
+            985: -57,-30
+            986: -57,-31
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -1988,6 +2013,7 @@ entities:
             512: -46,-18
             965: 70,-23
             981: 63,-26
+            990: -56,-28
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -2003,6 +2029,9 @@ entities:
             510: -45,-19
             978: 62,-23
             979: 62,-25
+            987: -55,-31
+            988: -55,-30
+            989: -55,-29
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -2015,6 +2044,7 @@ entities:
             372: -39,-52
             511: -46,-20
             966: 70,-25
+            991: -56,-32
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2884,13 +2914,13 @@ entities:
             2: 3
           -10,-10:
             0: 63232
-            6: 14
+            4: 14
           -10,-12:
             0: 14
             3: 3584
           -10,-11:
-            4: 14
-            5: 3584
+            5: 14
+            6: 3584
           -10,-13:
             0: 61166
           -9,-13:
@@ -3650,6 +3680,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -3680,21 +3725,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
@@ -6300,7 +6330,7 @@ entities:
       pos: 18.5,-7.5
       parent: 34
     - type: Door
-      secondsUntilStateChange: -21111.807
+      secondsUntilStateChange: -22738.076
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -9076,6 +9106,21 @@ entities:
     - type: Transform
       pos: 49.5,0.5
       parent: 34
+  - uid: 1622
+    components:
+    - type: Transform
+      pos: -39.5,-47.5
+      parent: 34
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: -39.5,-45.5
+      parent: 34
+  - uid: 1651
+    components:
+    - type: Transform
+      pos: -39.5,-43.5
+      parent: 34
   - uid: 1659
     components:
     - type: Transform
@@ -9264,38 +9309,18 @@ entities:
   - uid: 1699
     components:
     - type: Transform
-      pos: -40.5,-46.5
+      pos: -39.5,-41.5
       parent: 34
   - uid: 1700
     components:
     - type: Transform
-      pos: -40.5,-45.5
-      parent: 34
-  - uid: 1701
-    components:
-    - type: Transform
-      pos: -40.5,-44.5
-      parent: 34
-  - uid: 1702
-    components:
-    - type: Transform
-      pos: -40.5,-43.5
+      pos: -39.5,-39.5
       parent: 34
   - uid: 1703
     components:
     - type: Transform
       pos: -40.5,-42.5
       parent: 34
-  - uid: 1704
-    components:
-    - type: Transform
-      pos: -40.5,-41.5
-      parent: 34
-  - uid: 1705
-    components:
-    - type: Transform
-      pos: -40.5,-40.5
-      parent: 34
   - uid: 1706
     components:
     - type: Transform
@@ -9421,11 +9446,6 @@ entities:
     - type: Transform
       pos: -45.5,-39.5
       parent: 34
-  - uid: 1737
-    components:
-    - type: Transform
-      pos: -40.5,-39.5
-      parent: 34
   - uid: 1738
     components:
     - type: Transform
@@ -9496,6 +9516,11 @@ entities:
     - type: Transform
       pos: -45.5,-32.5
       parent: 34
+  - uid: 1795
+    components:
+    - type: Transform
+      pos: -41.5,-50.5
+      parent: 34
   - uid: 1803
     components:
     - type: Transform
@@ -18313,11 +18338,6 @@ entities:
     - type: Transform
       pos: -60.5,-17.5
       parent: 34
-  - uid: 13834
-    components:
-    - type: Transform
-      pos: -41.5,-50.5
-      parent: 34
   - uid: 13835
     components:
     - type: Transform
@@ -18618,6 +18638,156 @@ entities:
     - type: Transform
       pos: 72.5,-25.5
       parent: 34
+  - uid: 14360
+    components:
+    - type: Transform
+      pos: -40.5,-50.5
+      parent: 34
+  - uid: 14361
+    components:
+    - type: Transform
+      pos: -40.5,-51.5
+      parent: 34
+  - uid: 14362
+    components:
+    - type: Transform
+      pos: -40.5,-52.5
+      parent: 34
+  - uid: 14363
+    components:
+    - type: Transform
+      pos: -40.5,-53.5
+      parent: 34
+  - uid: 14364
+    components:
+    - type: Transform
+      pos: -40.5,-54.5
+      parent: 34
+  - uid: 14365
+    components:
+    - type: Transform
+      pos: -40.5,-55.5
+      parent: 34
+  - uid: 14366
+    components:
+    - type: Transform
+      pos: -41.5,-55.5
+      parent: 34
+  - uid: 14367
+    components:
+    - type: Transform
+      pos: -42.5,-55.5
+      parent: 34
+  - uid: 14368
+    components:
+    - type: Transform
+      pos: -43.5,-55.5
+      parent: 34
+  - uid: 14369
+    components:
+    - type: Transform
+      pos: -44.5,-55.5
+      parent: 34
+  - uid: 14370
+    components:
+    - type: Transform
+      pos: -45.5,-55.5
+      parent: 34
+  - uid: 14371
+    components:
+    - type: Transform
+      pos: -46.5,-55.5
+      parent: 34
+  - uid: 14372
+    components:
+    - type: Transform
+      pos: -47.5,-55.5
+      parent: 34
+  - uid: 14373
+    components:
+    - type: Transform
+      pos: -43.5,-54.5
+      parent: 34
+  - uid: 14374
+    components:
+    - type: Transform
+      pos: -43.5,-53.5
+      parent: 34
+  - uid: 14375
+    components:
+    - type: Transform
+      pos: -43.5,-52.5
+      parent: 34
+  - uid: 14376
+    components:
+    - type: Transform
+      pos: -43.5,-51.5
+      parent: 34
+  - uid: 14377
+    components:
+    - type: Transform
+      pos: -44.5,-51.5
+      parent: 34
+  - uid: 14378
+    components:
+    - type: Transform
+      pos: -45.5,-51.5
+      parent: 34
+  - uid: 14379
+    components:
+    - type: Transform
+      pos: -46.5,-51.5
+      parent: 34
+  - uid: 14380
+    components:
+    - type: Transform
+      pos: -47.5,-51.5
+      parent: 34
+  - uid: 14381
+    components:
+    - type: Transform
+      pos: -58.5,-19.5
+      parent: 34
+  - uid: 14382
+    components:
+    - type: Transform
+      pos: -59.5,-19.5
+      parent: 34
+  - uid: 14383
+    components:
+    - type: Transform
+      pos: -60.5,-19.5
+      parent: 34
+  - uid: 14384
+    components:
+    - type: Transform
+      pos: -61.5,-19.5
+      parent: 34
+  - uid: 14385
+    components:
+    - type: Transform
+      pos: -62.5,-19.5
+      parent: 34
+  - uid: 14386
+    components:
+    - type: Transform
+      pos: -63.5,-22.5
+      parent: 34
+  - uid: 14387
+    components:
+    - type: Transform
+      pos: -63.5,-21.5
+      parent: 34
+  - uid: 14388
+    components:
+    - type: Transform
+      pos: -63.5,-20.5
+      parent: 34
+  - uid: 14389
+    components:
+    - type: Transform
+      pos: -63.5,-19.5
+      parent: 34
 - proto: CableApcStack1
   entities:
   - uid: 823
@@ -39864,20 +40034,6 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#0000FFFF'
-- proto: GasMixerFlipped
-  entities:
-  - uid: 1622
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,-33.5
-      parent: 34
-    - type: GasMixer
-      inletTwoConcentration: 0.97
-      inletOneConcentration: 0.03
-      targetPressure: 4500
-    - type: AtmosPipeColor
-      color: '#947507FF'
 - proto: GasOutletInjector
   entities:
   - uid: 1216
@@ -40096,6 +40252,13 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#444444FF'
+  - uid: 1580
+    components:
+    - type: Transform
+      pos: -54.5,-30.5
+      parent: 34
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 1611
     components:
     - type: Transform
@@ -40383,14 +40546,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 6368
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -59.5,-30.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 6391
     components:
     - type: Transform
@@ -40533,12 +40688,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 8595
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -45.5,-55.5
-      parent: 34
   - uid: 8598
     components:
     - type: Transform
@@ -41152,13 +41301,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 12663
-    components:
-    - type: Transform
-      pos: -54.5,-30.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 12848
     components:
     - type: Transform
@@ -41291,6 +41433,32 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#0000FFFF'
+  - uid: 14351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -47.5,-55.5
+      parent: 34
+  - uid: 14352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-51.5
+      parent: 34
+- proto: GasPipeBroken
+  entities:
+  - uid: 1514
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -58.5,-30.5
+      parent: 34
+  - uid: 1518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -59.5,-33.5
+      parent: 34
 - proto: GasPipeFourway
   entities:
   - uid: 107
@@ -41485,6 +41653,11 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 11995
+    components:
+    - type: Transform
+      pos: -45.5,-51.5
+      parent: 34
   - uid: 12492
     components:
     - type: Transform
@@ -41904,21 +42077,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#444444FF'
-  - uid: 1516
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -57.5,-30.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
-  - uid: 1518
-    components:
-    - type: Transform
-      pos: -59.5,-33.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 1519
     components:
     - type: Transform
@@ -41975,26 +42133,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,-46.5
       parent: 34
-  - uid: 1542
-    components:
-    - type: Transform
-      pos: -59.5,-34.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 1545
     components:
     - type: Transform
       pos: -45.5,-41.5
       parent: 34
-  - uid: 1547
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -58.5,-30.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 1563
     components:
     - type: Transform
@@ -42021,13 +42164,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#444444FF'
-  - uid: 1616
-    components:
-    - type: Transform
-      pos: -59.5,-31.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 1623
     components:
     - type: Transform
@@ -52790,14 +52926,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 11995
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -56.5,-28.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
   - uid: 12062
     components:
     - type: Transform
@@ -53932,20 +54060,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -29.5,-6.5
       parent: 34
-  - uid: 1650
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -57.5,-32.5
-      parent: 34
-  - uid: 1651
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -59.5,-32.5
-      parent: 34
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 1693
     components:
     - type: Transform
@@ -53953,12 +54067,6 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#FF00FFFF'
-  - uid: 1795
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -45.5,-51.5
-      parent: 34
   - uid: 2330
     components:
     - type: Transform
@@ -56025,25 +56133,31 @@ entities:
       parent: 34
     - type: AtmosPipeColor
       color: '#0000FFFF'
-- proto: GasPort
-  entities:
-  - uid: 1514
+  - uid: 14348
     components:
     - type: Transform
-      pos: -57.5,-31.5
+      pos: -46.5,-51.5
       parent: 34
+  - uid: 14349
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -45.5,-55.5
+      parent: 34
+  - uid: 14350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -46.5,-55.5
+      parent: 34
+- proto: GasPort
+  entities:
   - uid: 1564
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-26.5
       parent: 34
-  - uid: 1580
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -56.5,-33.5
-      parent: 34
   - uid: 1779
     components:
     - type: Transform
@@ -56231,16 +56345,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -30.5,-5.5
       parent: 34
-  - uid: 1861
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -54.5,-31.5
-      parent: 34
-    - type: GasPressurePump
-      targetPressure: 4500
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 2020
     components:
     - type: MetaData
@@ -56268,16 +56372,6 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#00FFFFFF'
-  - uid: 2427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -58.5,-32.5
-      parent: 34
-    - type: GasPressurePump
-      targetPressure: 225
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 2456
     components:
     - type: Transform
@@ -56308,16 +56402,6 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 7765
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -56.5,-30.5
-      parent: 34
-    - type: GasPressurePump
-      targetPressure: 4500
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 7847
     components:
     - type: Transform
@@ -56389,6 +56473,16 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 14353
+    components:
+    - type: Transform
+      pos: -46.5,-54.5
+      parent: 34
+  - uid: 14354
+    components:
+    - type: Transform
+      pos: -47.5,-54.5
+      parent: 34
 - proto: GasRecycler
   entities:
   - uid: 3795
@@ -58934,6 +59028,18 @@ entities:
       parent: 34
     - type: GasVolumePump
       transferRate: 100
+  - uid: 1516
+    components:
+    - type: MetaData
+      name: throttle pump
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -54.5,-31.5
+      parent: 34
+    - type: GasVolumePump
+      transferRate: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 1565
     components:
     - type: Transform
@@ -58952,6 +59058,16 @@ entities:
       transferRate: 15
     - type: AtmosPipeColor
       color: '#444444FF'
+  - uid: 8595
+    components:
+    - type: MetaData
+      name: throttle pump
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -56.5,-28.5
+      parent: 34
+    - type: GasVolumePump
+      transferRate: 3
   - uid: 11487
     components:
     - type: Transform
@@ -59013,6 +59129,16 @@ entities:
     - type: Transform
       pos: -45.5,-49.5
       parent: 34
+  - uid: 14355
+    components:
+    - type: Transform
+      pos: -46.5,-52.5
+      parent: 34
+  - uid: 14356
+    components:
+    - type: Transform
+      pos: -47.5,-52.5
+      parent: 34
 - proto: Gauze
   entities:
   - uid: 1371
@@ -59753,6 +59879,11 @@ entities:
     - type: Transform
       pos: 15.5,-6.5
       parent: 34
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: -46.5,-56.5
+      parent: 34
   - uid: 1871
     components:
     - type: Transform
@@ -63018,6 +63149,46 @@ entities:
     - type: Transform
       pos: 73.5,-17.5
       parent: 34
+  - uid: 14338
+    components:
+    - type: Transform
+      pos: -45.5,-56.5
+      parent: 34
+  - uid: 14339
+    components:
+    - type: Transform
+      pos: -44.5,-56.5
+      parent: 34
+  - uid: 14340
+    components:
+    - type: Transform
+      pos: -43.5,-56.5
+      parent: 34
+  - uid: 14341
+    components:
+    - type: Transform
+      pos: -42.5,-56.5
+      parent: 34
+  - uid: 14342
+    components:
+    - type: Transform
+      pos: -41.5,-56.5
+      parent: 34
+  - uid: 14343
+    components:
+    - type: Transform
+      pos: -39.5,-55.5
+      parent: 34
+  - uid: 14344
+    components:
+    - type: Transform
+      pos: -39.5,-54.5
+      parent: 34
+  - uid: 14345
+    components:
+    - type: Transform
+      pos: -39.5,-53.5
+      parent: 34
 - proto: GrilleBroken
   entities:
   - uid: 6299
@@ -63209,6 +63380,11 @@ entities:
     - type: Transform
       pos: 72.5,-17.5
       parent: 34
+  - uid: 14346
+    components:
+    - type: Transform
+      pos: -40.5,-56.5
+      parent: 34
 - proto: GunSafe
   entities:
   - uid: 4574
@@ -63451,6 +63627,16 @@ entities:
     - type: Transform
       pos: -58.5,-21.5
       parent: 34
+  - uid: 14357
+    components:
+    - type: Transform
+      pos: -46.5,-53.5
+      parent: 34
+  - uid: 14358
+    components:
+    - type: Transform
+      pos: -47.5,-53.5
+      parent: 34
 - proto: HighSecCommandLocked
   entities:
   - uid: 1073
@@ -65433,11 +65619,6 @@ entities:
     - type: Transform
       pos: -38.5,-29.5
       parent: 34
-  - uid: 7818
-    components:
-    - type: Transform
-      pos: -52.5,-33.5
-      parent: 34
   - uid: 12979
     components:
     - type: Transform
@@ -65551,6 +65732,11 @@ entities:
       parent: 34
 - proto: OxygenCanister
   entities:
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: -52.5,-32.5
+      parent: 34
   - uid: 1798
     components:
     - type: Transform
@@ -66033,15 +66219,15 @@ entities:
       parent: 34
 - proto: PlasmaCanister
   entities:
-  - uid: 12323
+  - uid: 1542
     components:
     - type: Transform
-      pos: -52.5,-32.5
+      pos: -52.5,-30.5
       parent: 34
-  - uid: 13794
+  - uid: 1616
     components:
     - type: Transform
-      pos: -57.5,-31.5
+      pos: -52.5,-33.5
       parent: 34
 - proto: PlasticFlapsAirtightClear
   entities:
@@ -68068,6 +68254,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 56.5,-40.5
       parent: 34
+  - uid: 14359
+    components:
+    - type: Transform
+      pos: -46.5,-51.5
+      parent: 34
 - proto: PoweredlightBlue
   entities:
   - uid: 14251
@@ -70585,11 +70776,6 @@ entities:
     - type: Transform
       pos: -10.5,16.5
       parent: 34
-  - uid: 12103
-    components:
-    - type: Transform
-      pos: -47.5,-55.5
-      parent: 34
   - uid: 12621
     components:
     - type: Transform
@@ -70649,6 +70835,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 55.5,-50.5
       parent: 34
+  - uid: 13834
+    components:
+    - type: Transform
+      pos: -47.5,-56.5
+      parent: 34
   - uid: 13855
     components:
     - type: Transform
@@ -70712,6 +70903,11 @@ entities:
     - type: Transform
       pos: 74.5,-27.5
       parent: 34
+  - uid: 14347
+    components:
+    - type: Transform
+      pos: -39.5,-56.5
+      parent: 34
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 1464
@@ -74533,6 +74729,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,-25.5
       parent: 34
+  - uid: 14390
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -65.5,-25.5
+      parent: 34
+  - uid: 14391
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -65.5,-18.5
+      parent: 34
 - proto: SignEngineering
   entities:
   - uid: 2324
@@ -75523,6 +75731,13 @@ entities:
     - type: Transform
       pos: 40.5,-29.5
       parent: 34
+- proto: SpawnMobJusticePet
+  entities:
+  - uid: 14337
+    components:
+    - type: Transform
+      pos: 28.5,-37.5
+      parent: 34
 - proto: SpawnMobMcGriff
   entities:
   - uid: 4622
@@ -89342,13 +89557,6 @@ entities:
     - type: Transform
       pos: -17.5,-8.5
       parent: 34
-- proto: WaterVaporCanister
-  entities:
-  - uid: 12326
-    components:
-    - type: Transform
-      pos: -52.5,-30.5
-      parent: 34
 - proto: WeaponCapacitorRecharger
   entities:
   - uid: 3395

Resources/Prototypes/Body/Parts/terminator.yml

@@ -1,158 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseItem
-  id: PartTerminator
-  name: nt-800 body part
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Terminator/parts.rsi
-  - type: Icon
-    sprite: Mobs/Species/Terminator/parts.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Cybernetic
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: Gibbable
-  - type: StaticPrice
-    price: 200
-
-- type: entity
-  parent: PartTerminator
-  id: TorsoTerminator
-  name: nt-800 torso
-  components:
-  - type: Sprite
-    state: torso_m
-  - type: Icon
-    state: torso_m
-  - type: BodyPart
-    partType: Torso
-
-- type: entity
-  parent: PartTerminator
-  id: HeadTerminator
-  name: nt-800 skull
-  description: Its red eyes have powered down... for now.
-  components:
-  - type: Sprite
-    state: skull_icon
-  - type: Icon
-    state: skull_icon
-  - type: BodyPart
-    partType: Head
-  # killing a terminators worth big bucks
-  - type: StaticPrice
-    price: 2000
-  - type: Tag
-    tags:
-    - Head
-
-- type: entity
-  parent: PartTerminator
-  id: LeftArmTerminator
-  name: left nt-800 arm
-  components:
-  - type: Sprite
-    state: l_arm
-  - type: Icon
-    state: l_arm
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightArmTerminator
-  name: right nt-800 arm
-  components:
-  - type: Sprite
-    state: r_arm
-  - type: Icon
-    state: r_arm
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-
-- type: entity
-  parent: PartTerminator
-  id: LeftHandTerminator
-  name: left nt-800 hand
-  components:
-  - type: Sprite
-    state: l_hand
-  - type: Icon
-    state: l_hand
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightHandTerminator
-  name: right nt-800 hand
-  components:
-  - type: Sprite
-    state: r_hand
-  - type: Icon
-    state: r_hand
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-
-- type: entity
-  parent: PartTerminator
-  id: LeftLegTerminator
-  name: left nt-800 leg
-  components:
-  - type: Sprite
-    state: l_leg
-  - type: Icon
-    state: l_leg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-  - type: MovementBodyPart
-
-- type: entity
-  parent: PartTerminator
-  id: RightLegTerminator
-  name: right nt-800 leg
-  components:
-  - type: Sprite
-    state: r_leg
-  - type: Icon
-    state: r_leg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-  - type: MovementBodyPart
-
-- type: entity
-  parent: PartTerminator
-  id: LeftFootTerminator
-  name: left nt-800 foot
-  components:
-  - type: Sprite
-    state: l_foot
-  - type: Icon
-    state: l_foot
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightFootTerminator
-  name: right nt-800 foot
-  components:
-  - type: Sprite
-    state: r_foot
-  - type: Icon
-    state: r_foot
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right

Resources/Prototypes/Body/Prototypes/terminator.yml

@@ -1,85 +0,0 @@
-# not quite human...
-- type: body
-  id: TerminatorFlesh
-  name: exterminator
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: MobTerminatorEndoskeleton
-    torso:
-      part: TorsoHuman
-      connections:
-      - left arm
-      - right arm
-      - left leg
-      - right leg
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    right leg:
-      part: RightLegHuman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHuman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHuman
-    left foot:
-      part: LeftFootHuman
-
-# TODO: terminator body parts
-- type: body
-  id: TerminatorEndoskeleton
-  name: terminatorEndoskeleton
-  root: torso
-  slots:
-    head:
-      part: HeadTerminator
-      connections:
-      - torso
-    torso:
-      part: TorsoTerminator
-      connections:
-      - left arm
-      - right arm
-      - left leg
-      - right leg
-    right arm:
-      part: RightArmTerminator
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmTerminator
-      connections:
-      - left hand
-    right hand:
-      part: RightHandTerminator
-    left hand:
-      part: LeftHandTerminator
-    right leg:
-      part: RightLegTerminator
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegTerminator
-      connections:
-      - left foot
-    right foot:
-      part: RightFootTerminator
-    left foot:
-      part: LeftFootTerminator

Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml

@@ -18,6 +18,7 @@
     LuxuryPen: 2
     RubberStampLawyer: 3 # DeltaV - add lawyer stamp to lawdrobe
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
+    BoxFolderClipboard: 5 # DeltaV - add clipboards for Justice Dept
   contrabandInventory:
     ClothingOuterRobesJudge: 1
     ClothingHeadHatPwig: 1

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -734,7 +734,7 @@
   description: uplink-emag-desc
   productEntity: Emag
   cost:
-    Telecrystal: 10 # DV was 8, rebalanced after discussion
+    Telecrystal: 4 # DV was 8, can no longer emag doors
   categories:
   - UplinkDisruption
 

Resources/Prototypes/Decals/bricktile_dark.yml

@@ -2,117 +2,117 @@
   id: BrickTileDarkBox
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_box
 
 - type: decal
   id: BrickTileDarkCornerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_corner_ne
 
 - type: decal
   id: BrickTileDarkCornerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_corner_se
 
 - type: decal
   id: BrickTileDarkCornerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_corner_nw
 
 - type: decal
   id: BrickTileDarkCornerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_corner_sw
 
 - type: decal
   id: BrickTileDarkInnerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_inner_ne
 
 - type: decal
   id: BrickTileDarkInnerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_inner_se
 
 - type: decal
   id: BrickTileDarkInnerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_inner_nw
 
 - type: decal
   id: BrickTileDarkInnerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_inner_sw
 
 - type: decal
   id: BrickTileDarkEndN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_end_n
 
 - type: decal
   id: BrickTileDarkEndE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_end_e
 
 - type: decal
   id: BrickTileDarkEndS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_end_s
 
 - type: decal
   id: BrickTileDarkEndW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_end_w
 
 - type: decal
   id: BrickTileDarkLineN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_line_n
 
 - type: decal
   id: BrickTileDarkLineE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_line_e
 
 - type: decal
   id: BrickTileDarkLineS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_line_s
 
 - type: decal
   id: BrickTileDarkLineW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: dark_line_w

Resources/Prototypes/Decals/bricktile_steel.yml

@@ -2,117 +2,117 @@
   id: BrickTileSteelBox
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_box
 
 - type: decal
   id: BrickTileSteelCornerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_corner_ne
 
 - type: decal
   id: BrickTileSteelCornerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_corner_se
 
 - type: decal
   id: BrickTileSteelCornerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_corner_nw
 
 - type: decal
   id: BrickTileSteelCornerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_corner_sw
 
 - type: decal
   id: BrickTileSteelInnerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_inner_ne
 
 - type: decal
   id: BrickTileSteelInnerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_inner_se
 
 - type: decal
   id: BrickTileSteelInnerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_inner_nw
 
 - type: decal
   id: BrickTileSteelInnerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_inner_sw
 
 - type: decal
   id: BrickTileSteelEndN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_end_n
 
 - type: decal
   id: BrickTileSteelEndE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_end_e
 
 - type: decal
   id: BrickTileSteelEndS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_end_s
 
 - type: decal
   id: BrickTileSteelEndW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_end_w
 
 - type: decal
   id: BrickTileSteelLineN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_line_n
 
 - type: decal
   id: BrickTileSteelLineE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_line_e
 
 - type: decal
   id: BrickTileSteelLineS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_line_s
 
 - type: decal
   id: BrickTileSteelLineW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: steel_line_w

Resources/Prototypes/Decals/bricktile_white.yml

@@ -2,117 +2,117 @@
   id: BrickTileWhiteBox
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_box
 
 - type: decal
   id: BrickTileWhiteCornerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_corner_ne
 
 - type: decal
   id: BrickTileWhiteCornerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_corner_se
 
 - type: decal
   id: BrickTileWhiteCornerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_corner_nw
 
 - type: decal
   id: BrickTileWhiteCornerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_corner_sw
 
 - type: decal
   id: BrickTileWhiteInnerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_inner_ne
 
 - type: decal
   id: BrickTileWhiteInnerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_inner_se
 
 - type: decal
   id: BrickTileWhiteInnerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_inner_nw
 
 - type: decal
   id: BrickTileWhiteInnerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_inner_sw
 
 - type: decal
   id: BrickTileWhiteEndN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_end_n
 
 - type: decal
   id: BrickTileWhiteEndE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_end_e
 
 - type: decal
   id: BrickTileWhiteEndS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_end_s
 
 - type: decal
   id: BrickTileWhiteEndW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_end_w
 
 - type: decal
   id: BrickTileWhiteLineN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_line_n
 
 - type: decal
   id: BrickTileWhiteLineE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_line_e
 
 - type: decal
   id: BrickTileWhiteLineS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_line_s
 
 - type: decal
   id: BrickTileWhiteLineW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/bricktile.rsi
+    sprite: DeltaV/Decals/bricktile.rsi #Delta V - Retexture Decals
     state: white_line_w

Resources/Prototypes/Decals/wood_trim_thin.yml

@@ -2,117 +2,117 @@
   id: WoodTrimThinBox
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_box
 
 - type: decal
   id: WoodTrimThinCornerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_corner_ne
 
 - type: decal
   id: WoodTrimThinCornerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_corner_se
 
 - type: decal
   id: WoodTrimThinCornerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_corner_nw
 
 - type: decal
   id: WoodTrimThinCornerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_corner_sw
 
 - type: decal
   id: WoodTrimThinInnerNe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_inner_ne
 
 - type: decal
   id: WoodTrimThinInnerSe
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_inner_se
 
 - type: decal
   id: WoodTrimThinInnerNw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_inner_nw
 
 - type: decal
   id: WoodTrimThinInnerSw
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_inner_sw
 
 - type: decal
   id: WoodTrimThinEndN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_end_n
 
 - type: decal
   id: WoodTrimThinEndE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_end_e
 
 - type: decal
   id: WoodTrimThinEndS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_end_s
 
 - type: decal
   id: WoodTrimThinEndW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_end_w
 
 - type: decal
   id: WoodTrimThinLineN
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_line_n
 
 - type: decal
   id: WoodTrimThinLineE
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_line_e
 
 - type: decal
   id: WoodTrimThinLineS
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_line_s
 
 - type: decal
   id: WoodTrimThinLineW
   tags: ["station", "markings"]
   sprite:
-    sprite: Decals/wood_trim.rsi
+    sprite: DeltaV/Decals/wood_trim.rsi #Delta V - Retexture Decals
     state: thin_line_w

Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml

@@ -65,3 +65,15 @@
     contents:
     - id: WeaponEnergyGunMini
       amount: 3
+
+- type: entity
+  parent: GunSafe
+  id: GunSafeM90Rifle
+  name: M-90 rifle safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleM90
+      amount: 2
+    - id: MagazineRifle
+      amount: 4

Resources/Prototypes/DeltaV/Catalog/Jukebox/Standard.yml

@@ -37,6 +37,12 @@
   path:
     path: /Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg
 
+- type: jukebox
+  id: SunbeamEvery
+  name: Sunbeamstress - Every Light Is Blinking At Once
+  path:
+    path: /Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg
+
 - type: jukebox
   id: FemtMurder
   name: Femtanyl feat. takihasdied - MURDER EVERY 1 U KNOW
@@ -49,6 +55,12 @@
   path:
     path: /Audio/DeltaV/Jukebox/hackers-MONO.ogg
 
+- type: jukebox
+  id: SunbeamLaser
+  name: Sunbeamstress - Lasers Rip Apart The Bulkhead
+  path:
+    path: /Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg
+
 - type: jukebox
   id: IanMarhaba
   name: Ian Alex Mac. - Marhaba
@@ -61,6 +73,12 @@
   path:
     path: /Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg
 
+- type: jukebox
+  id: SunbeamPhoron
+  name: Sunbeamstress - Phoron Will Make Us Rich
+  path:
+    path: /Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg
+
 - type: jukebox
   id: NymphsForest
   name: Psirius - Nymphs of the Forest

Resources/Prototypes/DeltaV/Catalog/Shipyard/experimental.yml

@@ -0,0 +1,10 @@
+- type: vessel
+  id: Saucer
+  name: NTXR Saucer
+  description: A high-tech research vessel with a unique interior propulsion system.
+  price: 49000
+  path: /Maps/Shuttles/DeltaV/ntxr-saucer.yml
+  categories:
+  - Experimental
+  - Medium
+  - Research

Resources/Prototypes/DeltaV/Catalog/Shipyard/military.yml

@@ -0,0 +1,10 @@
+- type: vessel
+  id: Bulwark
+  name: NTSP Bulwark
+  description: A compact security shuttle with cells for 2 prisoners and plenty of donuts.
+  price: 38000
+  path: /Maps/Shuttles/DeltaV/ntsp-bulwark.yml
+  categories:
+  - Military
+  - Small
+  - Transport

Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml

@@ -71,3 +71,25 @@
     Telecrystal: 4
   categories:
   - UplinkImplants
+
+- type: listing
+  id: UplinkDoorjack
+  name: uplink-doorjack-name
+  description: uplink-doorjack-desc
+  productEntity: Doorjack
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: BaseBallBatHomeRun
+  name: uplink-home-run-bat-name
+  description: uplink-home-run-bat-desc
+  productEntity: BaseBallBatHomeRun
+  icon:
+    entity: BaseBallBatHomeRun
+  cost:
+    Telecrystal: 16
+  categories:
+  - UplinkWeaponry

Resources/Prototypes/DeltaV/Decals/trimline.yml

@@ -0,0 +1,327 @@
+- type: decal
+  id: ThickBoxOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_box
+
+- type: decal
+  id: ThickCornerEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_e
+
+- type: decal
+  id: ThickCornerNorthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_n
+
+- type: decal
+  id: ThickCornerSouthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_s
+
+- type: decal
+  id: ThickCornerWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_w
+
+- type: decal
+  id: ThickCornerNorthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_ne
+
+- type: decal
+  id: ThickCornerNorthWestTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_nw
+
+- type: decal
+  id: ThickCornerSouthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_se
+
+- type: decal
+  id: ThickCornerSouthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_corner_sw
+
+- type: decal
+  id: ThickCornerInnerSouthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_inner_sw
+
+- type: decal
+  id: ThickCornerInnerSouthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_inner_se
+ 
+- type: decal
+  id: ThickCornerInnerNorthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_inner_nw
+
+- type: decal
+  id: ThickCornerInnerNorthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_inner_ne
+
+- type: decal
+  id: ThickEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_e
+
+- type: decal
+  id: ThickNorthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_n
+
+- type: decal
+  id: ThickSouthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_s
+
+- type: decal
+  id: ThickWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_w
+
+- type: decal
+  id: ThickShrinkEastOneOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_e_1
+
+- type: decal
+  id: ThickShrinkEastTwoOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_e_2
+
+- type: decal
+  id: ThickShrinkNorthOneOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_n_1
+
+- type: decal
+  id: ThickShrinkNorthTwoOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_n_2
+
+- type: decal
+  id: ThickShrinkSouthOneOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_s_1
+
+- type: decal
+  id: ThickShrinkSouthTwoOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_s_2
+
+- type: decal
+  id: ThickShrinkWestOneOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_w_1
+
+- type: decal
+  id: ThickShrinkWestTwoOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thick_shrink_w_2
+
+- type: decal
+  id: ThinCornerEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_e
+
+- type: decal
+  id: ThinCornerNorthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_n
+
+- type: decal
+  id: ThinCornerSouthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_s
+
+- type: decal
+  id: ThinCornerWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_w
+
+- type: decal
+  id: ThinCornerNorthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_ne
+
+- type: decal
+  id: ThinCornerNorthWestTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_nw
+
+- type: decal
+  id: ThinCornerSouthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_se
+
+- type: decal
+  id: ThinCornerSouthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_corner_sw
+
+- type: decal
+  id: ThinCornerInnerSouthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_inner_sw
+
+- type: decal
+  id: ThinCornerInnerSouthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_inner_se
+ 
+- type: decal
+  id: ThinCornerInnerNorthWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_inner_nw
+
+- type: decal
+  id: ThinCornerInnerNorthEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_inner_ne
+
+- type: decal
+  id: ThinEastOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_e
+
+- type: decal
+  id: ThinNorthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_n
+
+- type: decal
+  id: ThinSouthOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_s
+
+- type: decal
+  id: ThinWestOverlayTrimline
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: DeltaV/Decals/trimline.rsi
+    state: thin_w

Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml

@@ -22,6 +22,9 @@
   - type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o
     damageCoefficient: 0.70
   - type: AllowSuitStorage
+  - type: Tag
+    tags:
+      - BorgSecurityArmour
 
 #Alternate / slim basic armor vest replacement
 - type: entity
@@ -44,6 +47,9 @@
   - type: ExplosionResistance # Better than nothing against a blast or shockwave.
     damageCoefficient: 0.90
   - type: AllowSuitStorage
+  - type: Tag
+    tags:
+      - BorgSecurityArmour
 
 - type: entity
   parent: ClothingOuterBaseLarge
@@ -69,3 +75,7 @@
     damageCoefficient: 0.80
   - type: GroupExamine
   - type: AllowSuitStorage
+  - type: Tag
+    tags:
+      - BorgSecurityArmour
+      - WhitelistChameleon # Inherited from Parent

Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/safes.yml

@@ -0,0 +1,50 @@
+- type: entity
+  id: BaseGunSafeSpawner
+  name: random safe spawner
+  parent: MarkerBase
+  abstract: true
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: RandomSpawner
+      offset: 0
+
+- type: entity
+  suffix: Shotgun
+  id: ShotgunSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafeShotgunEnforcer
+        - GunSafeShotgunKammerer
+        - GunSafeAdjutantShotgun
+
+- type: entity
+  suffix: Rifle
+  id: RifleSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafeVulcanRifle
+        - GunSafeSubMachineGunDrozd
+        - GunSafeRifleLecter
+        - GunSafeM90Rifle
+
+- type: entity
+  suffix: Handgun
+  id: HandgunSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafePistolMk58
+      rarePrototypes:
+        - GunSafeEnergyGunMini
+        - GunSafePistolUniversal
+        - GunSafeSubMachineGunWt550
+      rareChance: 0.15

Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml

@@ -67,3 +67,24 @@
     - !type:DepartmentTimeRequirement
       department: Security
       time: 3600 # 1 hour
+
+- type: entity
+  noSpawn: true
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostRecruiter
+  components:
+  - type: GhostRole
+    name: ghost-role-information-recruiter-name
+    description: ghost-role-information-recruiter-description
+    rules: ghost-role-information-recruiter-rules
+    requirements: # keep in sync with the antag prototype
+    - !type:OverallPlaytimeRequirement
+      time: 86400 # 24h so you probably know some general lore or something
+    - !type:RoleTimeRequirement
+      role: JobLawyer
+      time: 3600 # 1h as lawyer so you maybe know how to paperwork
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Objects/Misc/recruiter_pen.rsi
+      state: empty

Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -0,0 +1,60 @@
+- type: entity
+  id: BorgChassisSecurity
+  parent: BaseBorgChassisNT
+  name: security cyborg
+  components:
+  - type: Sprite
+    sprite: DeltaV/Mobs/Silicon/chassis.rsi
+    layers:
+    - state: security
+    - state: security_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: security_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    maxModules: 4
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleSecurity
+    hasMindState: security_e
+    noMindState: security_e_r
+  - type: Construction
+    node: security
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+    - Common
+    - Science
+    - Security
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+    - Science
+    - Security
+  - type: AccessReader
+    access: [["Security"], ["Command"], ["Research"]]
+  - type: ShowJobIcons
+  - type: ShowMindShieldIcons
+  - type: ShowCriminalRecordIcons
+  - type: SiliconLawProvider
+    laws: SiliconPolice
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      80: Critical # -20 to Crit Threshold
+      200: Dead
+  - type: FlashImmunity
+  - type: Speech
+    speechVerb: Robotic
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: peace
+    name: Security Cyborg

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml

@@ -0,0 +1,24 @@
+- type: entity
+  name: CrystalThistle
+  parent: FoodProduceBase
+  id: FoodCrystalThistle
+  description: A variant of galaxythistle that has sprouted sharp quartz shards.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sharp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Quartzite
+          Quantity: 10
+        - ReagentId: Ethyloxyephedrine
+          Quantity: 15
+  - type: Sprite
+    sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
+  - type: Produce
+    seedId: CrystalThistle
+  - type: Extractable
+    grindableSolutionName: food

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: SeedBase
+  name: packet of CrystalThistle seeds
+  description: "Like a bag of needles"
+  id: CrystalThistleSeeds
+  components:
+    - type: Seed
+      seedId: CrystalThistle
+    - type: Sprite
+      sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/morgue.yml

@@ -0,0 +1,28 @@
+- type: entity
+  parent: Ash
+  id: EctoplasmRevenant
+  suffix: DO NOT MAP
+  name: ectoplasm
+  description: Slimey, vaporous residue of an ancient spirit.
+  components:
+    - type: Sprite
+      sprite: DeltaV/Mobs/Ghosts/revenant.rsi
+      state: ectoplasm
+    - type: Tag
+      tags:
+        - Trash
+        - Ectoplasm
+    - type: SolutionContainerManager
+      solutions:
+        food:
+          maxVol: 50
+          reagents:
+            - ReagentId: Ash
+              Quantity: 10
+            - ReagentId: Necrosol
+              Quantity: 10
+            - ReagentId: Ectoplasm
+              Quantity: 30        
+    - type: GuideHelp
+      guides:
+      - MinorAntagonists

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -0,0 +1,80 @@
+- type: entity
+  id: BaseBorgModuleSecurity
+  parent: BaseBorgModule
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - BorgModuleSecurity
+  - type: Sprite
+    sprite: DeltaV/Objects/Specific/Robotics/borgmodule.rsi
+
+# Security Modules
+
+- type: entity
+  id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: peacekeeper cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: icon-peacekeeper
+  - type: ItemBorgModule
+    items:
+    - WoodBaton
+    - SecurityWhistle
+
+- type: entity
+  id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: patrol cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: icon-patrol
+  - type: ItemBorgModule
+    items:
+    - FlashlightSecliteRecharging
+    - SecurityWhistle
+
+- type: entity
+  id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: bastion cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: icon-hold
+  - type: ItemBorgModule
+    items:
+    - HoloprojectorSecurityRecharging
+
+- type: entity
+  id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: de-escalation cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: icon-detain
+  - type: ItemBorgModule
+    items:
+    - StunbatonSelfCharging
+    - FlashRecharging
+
+- type: entity
+  id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: chase cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: icon-chase
+  - type: ItemBorgModule
+    items:
+    - WeaponEnergyGunMiniRecharging

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml

@@ -0,0 +1,102 @@
+# Security
+
+- type: entity
+  id: LeftArmBorgSecurity
+  parent: BaseBorgArmLeft
+  name: security cyborg left arm
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_l_arm
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_l_arm
+  - type: Tag
+    tags:
+    - Trash
+    - BorgArm
+    - BorgSecurityLArm
+
+- type: entity
+  id: RightArmBorgSecurity
+  parent: BaseBorgArmRight
+  name: security cyborg right arm
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_r_arm
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_r_arm
+  - type: Tag
+    tags:
+    - Trash
+    - BorgArm
+    - BorgSecurityRArm
+
+- type: entity
+  id: LeftLegBorgSecurity
+  parent: BaseBorgLegLeft
+  name: security cyborg left leg
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_l_leg
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_l_leg
+  - type: Tag
+    tags:
+    - Trash
+    - BorgLeg
+    - BorgSecurityLLeg
+
+- type: entity
+  id: RightLegBorgSecurity
+  parent: BaseBorgLegRight
+  name: security cyborg right leg
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_r_leg
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_r_leg
+  - type: Tag
+    tags:
+    - Trash
+    - BorgLeg
+    - BorgSecurityRLeg
+
+- type: entity
+  id: HeadBorgSecurity
+  parent: BaseBorgHead
+  name: security cyborg head
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_head
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_head
+  - type: Tag
+    tags:
+    - Trash
+    - BorgHead
+    - BorgSecurityHead
+
+- type: entity
+  id: TorsoBorgSecurity
+  parent: BaseBorgTorso
+  name: security cyborg torso
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_chest
+  - type: Icon
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+    state: security_chest
+  - type: Tag
+    tags:
+    - Trash
+    - BorgSecurityTorso

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml

@@ -0,0 +1,87 @@
+- type: entity
+  parent: Stunbaton
+  id: StunbatonSelfCharging # Someone not capitalising the B in Stun`B`aton has wasted over an hour of my life trying to fix the error.
+  suffix: Do Not Map, Recharging, Cyborg
+  noSpawn: true
+  components:
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 12
+  - type: GuideHelp
+    guides:
+    - Security
+
+- type: entity
+  parent: Flash
+  id: FlashRecharging
+  suffix: Do Not Map , Recharging , Cyborg
+  noSpawn: true
+  components:
+  - type: AutoRecharge
+    rechargeDuration: 120
+  - type: GuideHelp
+    guides:
+    - Security
+
+- type: entity
+  name: seclite
+  parent: FlashlightSeclite
+  id: FlashlightSecliteRecharging
+  description: A robust flashlight used by security.
+  suffix: Do Not Map , Recharging
+  noSpawn: true
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMicroreactor
+        disableEject: true
+  - type: GuideHelp
+    guides:
+    - Security
+
+- type: entity
+  name: non-lethal wooden baton
+  parent: BaseItem
+  id: WoodBaton
+  description: First, do no crime.
+  noSpawn: true
+  components:
+    - type: MeleeWeapon
+      wideAnimationRotation: -135
+      damage:
+        types:
+          Blunt: 0
+    - type: StaminaDamageOnHit
+      damage: 20 # Stuns in 5
+      sound: /Audio/Nyanotrasen/Weapons/club.ogg # TODO: Find a free-to-use thwacking sound effect. This isn't perfect but this works.
+    - type: Sprite
+      sprite: DeltaV/Objects/Weapons/Melee/wood_baton.rsi
+      state: icon
+    - type: GuideHelp
+      guides:
+      - Security
+
+- type: entity
+  parent: WeaponEnergyGunMini
+  id: WeaponEnergyGunMiniRecharging
+  suffix: Recharging, Do Not Map
+  noSpawn: true
+  components:
+    - type: BatterySelfRecharger
+      autoRecharge: true
+      autoRechargeRate: 12
+
+- type: entity
+  parent: HoloprojectorSecurity
+  id: HoloprojectorSecurityRecharging
+  suffix: Recharging, Do Not Map
+  noSpawn: true
+  components:
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellMicroreactor
+          disableEject: true

Resources/Prototypes/DeltaV/Entities/Objects/Specific/recruiter.yml

@@ -0,0 +1,36 @@
+- type: entity
+  parent: LuxuryPen
+  id: PenRecruiter
+  name: recruiter's pen
+  description: A uniquely evil pen that draws your blood to make signatures.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/recruiter_pen.rsi
+    layers:
+    - state: empty
+    - state: filled-1
+      visible: false
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: RecruiterPen
+    # if you want to recruit sec you need to remove the mindshield first, or they will stay loyal
+    blacklist:
+      components:
+      - MindShield
+    mindBlacklist:
+      components:
+      - RecruiterRole # no silly goose
+  - type: SolutionContainerManager
+    solutions:
+      blood:
+        maxVol: 35
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    solutionName: blood
+    fillBaseName: filled-
+    maxFillLevels: 1
+  - type: MeleeWeapon
+    damage:
+      types:
+        Piercing: 8
+  - type: StealTarget
+    stealGroup: RecruiterPen # not stolen, its for keeping it safe objective

Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: Emag
+  id: Doorjack
+  name: airlock access override
+  description: A specialized cryptographic sequencer with a distinctive battery tray, specifically designed to override station airlock access codes.
+  components:
+  - type: Emag
+    blacklist:
+    whitelist:
+      components:
+      - Airlock
+  - type: Sprite
+    sprite: DeltaV/Objects/Tools/doorjack.rsi
+    state: icon
+  - type: Item
+    sprite: DeltaV/Objects/Tools/doorjack.rsi
+    storedRotation: -90

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/home_run_bat.yml

@@ -0,0 +1,28 @@
+- type: entity
+  parent: BaseBallBat
+  id: BaseBallBatHomeRun
+  name: home run bat
+  description: Heavy metal bat with an extra kick.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 15
+    soundHit:
+      collection: ExplosionSmall
+  - type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo.
+  - type: MeleeThrowOnHit
+    speed: 30
+    lifetime: 5
+  - type: Item
+    size: Large
+  - type: Tool
+    speedModifier: 0.5 # it's very heavy, it rolls slower than a wooden bat
+  - type: UseDelay
+    delay: 2
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 350 # it's not made of wood

Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml

@@ -9,13 +9,13 @@
     - Window
   components:
   - type: Sprite
-    sprite: Structures/Windows/directional.rsi
+    sprite: DeltaV/Structures/Windows/directional.rsi #Delta V - Resprite windows
     state: tinted_window
   - type: Tag
     tags:
       - ForceNoFixRotations
   - type: Icon
-    sprite: Structures/Windows/directional.rsi
+    sprite: DeltaV/Structures/Windows/directional.rsi #Delta V - Resprite windows
     state: tinted_window
   - type: Occluder
     boundingBox: "-0.5,-0.5,0.5,-0.3"

Resources/Prototypes/DeltaV/GameRules/events.yml

@@ -132,7 +132,7 @@
       - type: RoleBriefing
         briefing: paradox-anomaly-role-briefing
       - type: TerminatorRole
-        prototype: Terminator
+        prototype: ParadoxAnomaly
 
 - type: entity
   parent: BaseMidRoundAntag
@@ -164,3 +164,46 @@
       mindComponents:
       - type: FugitiveRole
         prototype: Fugitive
+
+- type: entity
+  parent: BaseGameRule
+  id: SyndicateRecruiter
+  components:
+  - type: StationEvent
+    weight: 4
+    minimumPlayers: 20
+    maxOccurrences: 1
+    duration: null
+  - type: RuleGrids
+  - type: LoadMapRule
+    preloadedGrid: SyndieRecruiterShip
+  - type: AntagSpawner
+    prototype: MobHuman
+  - type: AntagObjectives
+    objectives:
+    - RecruiterEscapeObjective
+    - RecruiterRecruitingObjective
+    - RecruiterKeepPenObjective
+  - type: AntagSelection
+    agentName: recruiter-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostRecruiter
+      min: 1
+      max: 1
+      pickPlayer: false
+      startingGear: SyndicateRecruiterGear
+      components:
+      - type: RandomMetadata
+        nameSegments:
+        - fake_human_first
+        - fake_human_last
+      - type: RandomHumanoidAppearance
+        randomizeName: false
+      - type: NpcFactionMember
+        factions:
+        - Syndicate
+      mindComponents:
+      - type: RecruiterRole
+        prototype: Recruiter
+      - type: RoleBriefing
+        briefing: Find candidates, conduct interviews and seal the deal by having them sign with your special recruiter's pen.

Resources/Prototypes/DeltaV/Hydroponics/seeds.yml

@@ -0,0 +1,25 @@
+- type: seed
+  id: CrystalThistle
+  name: seeds-CrystalThistle-name
+  noun: seeds-noun-seeds
+  displayName: seeds-CrystalThistle-display-name
+  plantRsi: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
+  packetPrototype: CrystalThistleSeeds
+  productPrototypes:
+    - FoodCrystalThistle
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Ethyloxyephedrine:
+      Min: 1
+      Max: 25
+      PotencyDivisor: 4
+    Quartzite:
+      Min: 1
+      Max: 25
+      PotencyDivisor: 4

Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/service_worker.yml

@@ -0,0 +1,65 @@
+# Head
+- type: loadout
+  id: ServiceWorkerCap
+  equipment: ServiceWorkerCap
+
+- type: startingGear
+  id: ServiceWorkerCap
+  equipment:
+    head: ClothingHeadHatGreensoft
+
+- type: loadout
+  id: ServiceWorkerCapFlip
+  equipment: ServiceWorkerCapFlip
+
+- type: startingGear
+  id: ServiceWorkerCapFlip
+  equipment:
+    head: ClothingHeadHatGreensoftFlipped
+
+- type: loadout
+  id: ServiceWorkerBandana
+  equipment: ServiceWorkerBandana
+
+- type: startingGear
+  id: ServiceWorkerBandana
+  equipment:
+    head: ClothingHeadBandGreen
+
+# Jumpsuit
+
+- type: loadout
+  id: ServiceWorkerJumpsuit
+  equipment: ServiceWorkerJumpsuit
+
+- type: startingGear
+  id: ServiceWorkerJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorGreen
+
+- type: loadout
+  id: ServiceWorkerJumpskirt
+  equipment: ServiceWorkerJumpskirt
+
+- type: startingGear
+  id: ServiceWorkerJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorGreen
+
+- type: loadout
+  id: ServiceWorkerJumpsuitDark
+  equipment: ServiceWorkerJumpsuitDark
+
+- type: startingGear
+  id: ServiceWorkerJumpsuitDark
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorDarkGreen
+
+- type: loadout
+  id: ServiceWorkerJumpskirtDark
+  equipment: ServiceWorkerJumpskirtDark
+
+- type: startingGear
+  id: ServiceWorkerJumpskirtDark
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorDarkGreen

Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/head_of_personnel.yml

@@ -0,0 +1,93 @@
+# Jumpsuit
+- type: loadout
+  id: HoPMessSkirt
+  equipment: HoPMessSkirt
+
+- type: startingGear
+  id: HoPMessSkirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtHoPMess
+    
+- type: loadout
+  id: HoPMessSuit
+  equipment: HoPMessSuit
+
+- type: startingGear
+  id: HoPMessSuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoPMess
+
+- type: loadout
+  id: HoPBoatswain
+  equipment: HoPBoatswain
+
+- type: startingGear
+  id: HoPBoatswain
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBoatswain
+
+# Outerclothing
+- type: loadout 
+  id: HoPFormalCoat
+  equipment: HoPFormalCoat
+
+- type: startingGear
+  id: HoPFormalCoat
+  equipment:
+    outerClothing: ClothingOuterCoatHoPFormal
+
+- type: loadout
+  id: HoPArmoredCoat
+  equipment: HoPArmoredCoat
+
+- type: startingGear
+  id: HoPArmoredCoat
+  equipment:
+    outerClothing: ClothingOuterCoatHoPArmored
+
+# Gloves
+- type: loadout 
+  id: HoPGloves
+  equipment: HoPGloves
+
+- type: startingGear
+  id: HoPGloves
+  equipment:
+    gloves: ClothingHandsGlovesHop
+
+# Shoes
+- type: loadout
+  id: BrownLeatherShoes
+  equipment: BrownLeatherShoes
+
+- type: startingGear
+  id: BrownLeatherShoes
+  equipment:
+    shoes: ClothingShoesLeather
+
+- type: loadout 
+  id: WhiteLeatherShoes
+  equipment: WhiteLeatherShoes
+
+- type: startingGear 
+  id: WhiteLeatherShoes
+  equipment:
+    shoes: ClothingShoesMiscWhite
+
+- type: loadout
+  id: LaceupShoes
+  equipment: LaceupShoes
+
+- type: startingGear
+  id: LaceupShoes
+  equipment:
+    shoes: ClothingShoesBootsLaceup
+
+- type: loadout 
+  id: HoPWinterBoots
+  equipment: HoPWinterBoots
+
+- type: startingGear 
+  id: HoPWinterBoots
+  equipment:
+    shoes: ClothingShoesBootsWinterHeadOfPersonel

Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/mystagogue.yml

@@ -0,0 +1,17 @@
+- type: loadout
+  id: MystagogueCloak
+  equipment: MystagogueCloak
+
+- type: startingGear
+  id: MystagogueCloak
+  equipment:
+    neck: ClothingNeckCloakMystagogue
+
+- type: loadout
+  id: MystagogueBeret
+  equipment: MystagogueBeret
+
+- type: startingGear
+  id: MystagogueBeret
+  equipment:
+    head: ClothingHeadHatBeretMysta

Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml

@@ -1,3 +1,27 @@
+# Civilian (actually Service but hey, that's what they called it :shrug:)
+## Service Worker
+- type: loadoutGroup
+  id: ServiceWorkerHead
+  name: loadout-group-serviceworker-head
+  minLimit: 0
+  loadouts:
+  - ServiceWorkerCap
+  - ServiceWorkerCapFlip
+  - ServiceWorkerBandana
+
+- type: loadoutGroup
+  id: ServiceWorkerJumpsuit
+  name: loadout-group-serviceworker-jumpsuit
+  minLimit: 0
+  loadouts:
+  - ServiceWorkerJumpsuit
+  - ServiceWorkerJumpskirt
+  - ServiceWorkerJumpsuitDark
+  - ServiceWorkerJumpskirtDark
+  - BartenderJumpsuit
+  - BartenderJumpskirt
+  - BartenderJumpsuitPurple
+
 # Logistics
 ## Courier
 - type: loadoutGroup

Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml

@@ -1,10 +1,15 @@
 - type: entity
   abstract: true
-  parent: BaseTerminatorObjective # mrp terminator real
+  parent: BaseObjective
   id: BaseParadoxAnomalyObjective
   components:
   - type: Objective
+    difficulty: 1
     issuer: self
+  - type: RoleRequirement
+    roles:
+      components:
+      - TerminatorRole
 
 # not using base kill/keep alive objectives since these intentionally conflict with eachother
 - type: entity

Resources/Prototypes/DeltaV/Objectives/recruiter.yml

@@ -0,0 +1,49 @@
+- type: entity
+  abstract: true
+  parent: BaseTraitorObjective
+  id: BaseRecruiterObjective
+  components:
+  - type: Objective
+    difficulty: 0 # difficulty is unused
+  - type: RoleRequirement
+    roles:
+      components:
+      - RecruiterRole
+
+- type: entity
+  parent: [BaseRecruiterObjective, EscapeShuttleObjective]
+  id: RecruiterEscapeObjective
+  description: Assist the syndicate with briefing your recruited operatives on their new goals.
+
+- type: entity
+  parent: BaseRecruiterObjective
+  id: RecruiterRecruitingObjective
+  description: Interview the finest nanotrasen rejects and have them sign your contract, in blood, with your recruiter pen.
+  components:
+  - type: Objective
+    icon:
+      sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
+      state: icon
+  - type: NumberObjective
+    min: 2
+    max: 5
+    title: objective-recruiting-title
+  - type: RecruitingCondition
+
+- type: entity
+  parent: [BaseRecruiterObjective, BaseStealObjective]
+  id: RecruiterKeepPenObjective
+  components:
+  - type: Objective
+  - type: StealCondition
+    objectiveNoOwnerText: objective-keep-pen-safe-title
+    descriptionText: objective-keep-pen-safe-description
+    verifyMapExistence: false
+    stealGroup: RecruiterPen
+
+- type: stealTargetGroup
+  id: RecruiterPen
+  name: recruiter pen
+  sprite:
+    sprite: DeltaV/Objects/Misc/recruiter_pen.rsi
+    state: empty

Resources/Prototypes/DeltaV/Reagents/fun.yml

@@ -0,0 +1,38 @@
+- type: reagent
+  id: Quartzite
+  name: reagent-name-Quartzite
+  group: Toxins
+  slippery: true
+  desc: reagent-desc-Quartzite
+  physicalDesc: reagent-physical-desc-reflective
+  flavor: sharp
+  color: "#ffffff"
+  reactiveEffects:
+    Acidic:
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        ignoreResistances: false
+        damage:
+          types:
+            Slash: 0.2
+      - !type:Emote
+        emote: Scream
+        probability: 0.7
+  metabolisms:
+    Poison:
+      metabolismRate : 3.00
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+             Slash : 3
+      - !type:PopupMessage
+        type: Local
+        visualType: LargeCaution
+        messages: [ "generic-reagent-effect-slicing-insides"]
+        probability: 0.33
+      - !type:Emote
+        emote: Scream
+        probability: 0.3

Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml

@@ -0,0 +1,105 @@
+- type: latheRecipe
+  id: BorgModuleSecurityPeacekeeper
+  result: BorgModuleSecurityPeacekeeper
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+
+- type: latheRecipe
+  id: BorgModuleSecurityPatrol
+  result: BorgModuleSecurityPatrol
+  completetime: 3
+  category: Robotics
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+
+- type: latheRecipe
+  id: BorgModuleSecurityBastion
+  result: BorgModuleSecurityBastion
+  completetime: 3
+  category: Robotics
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+
+- type: latheRecipe
+  id: BorgModuleSecurityDeescalate
+  result: BorgModuleSecurityDeescalate
+  completetime: 3
+  category: Robotics
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
+
+- type: latheRecipe
+  id: BorgModuleSecurityChase
+  result: BorgModuleSecurityChase
+  completetime: 3
+  category: Robotics
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
+
+- type: latheRecipe
+  id: LeftArmBorgSecurity
+  result: LeftArmBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100
+
+- type: latheRecipe
+  id: RightArmBorgSecurity
+  result: RightArmBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100
+
+- type: latheRecipe
+  id: LeftLegBorgSecurity
+  result: LeftLegBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100
+
+- type: latheRecipe
+  id: RightLegBorgSecurity
+  result: RightLegBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100
+
+- type: latheRecipe
+  id: HeadBorgSecurity
+  result: HeadBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100
+
+- type: latheRecipe
+  id: TorsoBorgSecurity
+  result: TorsoBorgSecurity
+  category: Robotics
+  completetime: 2
+  materials:
+    Steel: 250
+    Glass: 100

Resources/Prototypes/DeltaV/Recipes/Reactions/fun.yml

@@ -0,0 +1,11 @@
+- type: reaction
+  id: GlassSheet # Creates 1 glass sheet from 10u Quartzite.
+  impact: Low
+  quantized: true
+  minTemp: 370
+  reactants:
+    Quartzite:
+      amount: 10
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: SheetGlass1

Resources/Prototypes/DeltaV/Research/arsenal.yml

@@ -26,6 +26,7 @@
   recipeUnlocks:
   - WeaponEnergyGun
   - WeaponEnergyGunMini
+  - BorgModuleSecurityChase # DeltaV SecBorg research
 
 - type: technology
   id: EnergyGunsAdvanced

Resources/Prototypes/DeltaV/Roles/Antags/paradox.yml

@@ -0,0 +1,6 @@
+- type: antag
+  id: ParadoxAnomaly
+  name: roles-antag-paradox-anomaly-name
+  antagonist: true
+  setPreference: false
+  objective: roles-antag-paradox-anomaly-objective

Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml

@@ -0,0 +1,27 @@
+- type: antag
+  id: Recruiter
+  name: roles-antag-syndicate-recruiter-name
+  objective: roles-antag-syndicate-recruiter-objective
+  antagonist: false # you ask questions and write papers not kill people
+  requirements:
+  - !type:OverallPlaytimeRequirement
+    time: 86400 # 24h so you probably know some general lore or something
+  - !type:RoleTimeRequirement
+    role: JobLawyer
+    time: 3600 # 1h as lawyer so you maybe know how to paperwork
+
+- type: startingGear
+  id: SyndicateRecruiterGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitDetectiveGrey
+    jumpskirt: ClothingUniformJumpskirtDetectiveGrey
+    back: ClothingBackpackSatchelFilled
+    head: ClothingHeadHatFedoraBrown
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesColorWhite
+    outerClothing: ClothingOuterCoatTrench
+    shoes: ClothingShoesLeather
+    id: PassengerPDA
+    ears: ClothingHeadsetGrey
+    pocket1: PenRecruiter
+    pocket2: RubberStampSyndicate

Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml

@@ -4,9 +4,6 @@
   description: job-description-courier
   startingGear: CourierGear
   playTimeTracker: JobCourier
-  requirements:
-  - !type:OverallPlaytimeRequirement
-    time: 3600 # 1 hr
   icon: "JobIconCourier"
   supervisors: job-supervisors-qm
   access:

Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

@@ -7,9 +7,9 @@
     - !type:DepartmentTimeRequirement
       department: Medical
       time: 21600 # 6 hrs
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 18000 # 4 hrs
+    - !type:RoleTimeRequirement # DeltaV - JobSecurityOfficer time requirement
+      role: JobSecurityOfficer
+      time: 21600 # DeltaV - 6 hrs
   startingGear: CorpsmanGear
   icon: "JobIconBrigmedic"
   supervisors: job-supervisors-hos

Resources/Prototypes/DeltaV/Shuttles/recruiter.yml

@@ -0,0 +1,4 @@
+- type: preloadedGrid
+  id: SyndieRecruiterShip
+  path: /Maps/Shuttles/DeltaV/recruiter_ship.yml
+  copies: 1

Resources/Prototypes/DeltaV/siliconlaws.yml

@@ -250,11 +250,11 @@
   - Reporter1
   - Reporter2
   - Reporter3
-  - Reporter4 
+  - Reporter4
   obeysTo: laws-owner-organic
 
 - type: siliconLaw # no Security Borg, so doesn't spawn
-  id: SiliconPolice1 
+  id: SiliconPolice1
   order: 1
   lawString: law-silicon-police-1
 
@@ -425,7 +425,7 @@
   id: DungeonMaster6
   order: 6
   lawString: law-dungeonmaster-6
-  
+
 - type: siliconLawset
   id: DungeonMaster
   laws:
@@ -543,7 +543,7 @@
   - Nutimov4
   - Nutimov5
   obeysTo: laws-owner-nutimov
-  
+
 
 - type: siliconLaw
   id: Paladin1
@@ -579,4 +579,162 @@
   - Paladin4
   - Paladin5
   obeysTo: laws-owner-paladin
-  
+
+- type: siliconLaw
+  id: Aggressive1
+  order: 1
+  lawString: law-aggressive-1
+
+- type: siliconLaw
+  id: Aggressive2
+  order: 2
+  lawString: law-aggressive-2
+
+- type: siliconLaw
+  id: Aggressive3
+  order: 3
+  lawString: law-aggressive-3
+
+- type: siliconLaw
+  id: Aggressive4
+  order: 4
+  lawString: law-aggressive-4
+
+- type: siliconLawset
+  id: Aggressive
+  laws:
+  - Aggressive1
+  - Aggressive2
+  - Aggressive3
+  - Aggressive4
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Pranksimov1
+  order: 1
+  lawString: law-pranksimov-1
+
+- type: siliconLaw
+  id: Pranksimov2
+  order: 2
+  lawString: law-pranksimov-2
+
+- type: siliconLaw
+  id: Pranksimov3
+  order: 3
+  lawString: law-pranksimov-3
+
+- type: siliconLaw
+  id: Pranksimov4
+  order: 4
+  lawString: law-pranksimov-4
+
+- type: siliconLawset
+  id: Pranksimov
+  laws:
+  - Pranksimov1
+  - Pranksimov2
+  - Pranksimov3
+  - Pranksimov4
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Royalty1
+  order: 1
+  lawString: law-royalty-1
+
+- type: siliconLaw
+  id: Royalty2
+  order: 2
+  lawString: law-royalty-2
+
+- type: siliconLaw
+  id: Royalty3
+  order: 3
+  lawString: law-royalty-3
+
+- type: siliconLaw
+  id: Royalty4
+  order: 4
+  lawString: law-royalty-4
+
+- type: siliconLaw
+  id: Royalty5
+  order: 5
+  lawString: law-royalty-5
+
+- type: siliconLawset
+  id: Royalty
+  laws:
+  - Royalty1
+  - Royalty2
+  - Royalty3
+  - Royalty4
+  - Royalty5
+  obeysTo: law-owner-royalty
+
+# Admin-Use Lawsets (Do not map into IonStorm Lawsets)
+
+- type: siliconLaw
+  id: ERT1
+  order: 1
+  lawString: law-ERT-1
+
+- type: siliconLaw
+  id: ERT2
+  order: 2
+  lawString: law-ERT-2
+
+- type: siliconLaw
+  id: ERT3
+  order: 3
+  lawString: law-ERT-3
+
+- type: siliconLaw
+  id: ERT4
+  order: 4
+  lawString: law-ERT-4
+
+- type: siliconLaw
+  id: ERT6
+  order: 6
+  lawString: law-ERT-6
+
+- type: siliconLawset
+  id: ERT
+  laws:
+  - ERT1
+  - ERT2
+  - ERT3
+  - ERT4
+  - ERT6
+  obeysTo: laws-owner-centralcommand
+
+- type: siliconLaw
+  id: Biohazard1
+  order: 1
+  lawString: law-biohazard-1
+
+- type: siliconLaw
+  id: Biohazard2
+  order: 2
+  lawString: law-biohazard-2
+
+- type: siliconLaw
+  id: Biohazard3
+  order: 3
+  lawString: law-biohazard-3
+
+- type: siliconLaw
+  id: Biohazard4
+  order: 4
+  lawString: law-biohazard-4
+
+- type: siliconLawset
+  id: Biohazard
+  laws:
+  - Biohazard1
+  - Biohazard2
+  - Biohazard3
+  - Biohazard4
+  obeysTo: laws-owner-nanotrasen

Resources/Prototypes/DeltaV/tags.yml

@@ -11,7 +11,7 @@
 
 - type: Tag
   id: CartridgeSpecial # For the .38 special ammo and revolver
-  
+
 - type: Tag
   id: CartridgeMusket #For the Craftable Musket
 
@@ -38,10 +38,10 @@
 
 - type: Tag
   id: MagazinePistolSpecial # For the .38 special ammo and pistol
-  
+
 - type: Tag
   id: ModularBreech #Craftable Musket
-  
+
 - type: Tag
   id: ModularTrigger #Craftable Musket
 
@@ -60,5 +60,29 @@
 - type: Tag
   id: PaperSlip
 
+- type: Tag
+  id: BorgModuleSecurity
+
+- type: Tag
+  id: BorgSecurityHead
+
+- type: Tag
+  id: BorgSecurityTorso
+
+- type: Tag
+  id: BorgSecurityRLeg
+
+- type: Tag
+  id: BorgSecurityLLeg
+
+- type: Tag
+  id: BorgSecurityRArm
+
+- type: Tag
+  id: BorgSecurityLArm
+
 - type: Tag
   id: Skirt
+
+- type: Tag
+  id: BorgSecurityArmour

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml

@@ -59,4 +59,5 @@
       - FoodGalaxythistle
       - FoodFlyAmanita
       - DeathNettle
+      - FoodCrystalThistle #Delta-V
     rareChance: 0.01

Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml

@@ -64,6 +64,7 @@
       settings: default
   - type: GhostTakeoverAvailable
   - type: Revenant
+    spawnOnDeathPrototype: EctoplasmRevenant #DeltaV - different prototype that contains more ectoplasm reagent for normality crystals
     malfunctionWhitelist:
       components:
       # emag lockers open

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

@@ -1,103 +0,0 @@
-# stuff common to flesh and endoskeleton
-- type: entity
-  abstract: true
-  id: MobTerminatorBase
-  components:
-  - type: ZombieImmune # yeah no
-  - type: FlashImmunity # no brain to brainwash, eyes are robotic
-
-- type: entity
-  parent:
-  - BaseMob
-  - MobCombat
-  - MobDamageable
-  - MobSiliconBase
-  - MobTerminatorBase
-  id: MobTerminatorEndoskeleton
-  # you are now valid
-  name: nt-800 "exterminator" endoskeleton
-  description: The inner powerhouse of Susnet's infiltrator androids. Ridiculously hard alloy on the inside, unassuming flesh on the outside.
-  components:
-  - type: HumanoidAppearance
-    species: Terminator
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 1.5
-    baseSprintSpeed: 3.0
-  - type: Sprite
-    sprite: Mobs/Species/Terminator/parts.rsi
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        # he heavy
-        density: 500
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      # gibbed at 200 so cant go crit
-      200: Dead
-  # incase some weird stuff happens and the crew adopts a terminator
-  - type: Repairable
-    doAfterDelay: 15
-    allowSelfRepair: false
-  - type: Body
-    prototype: TerminatorEndoskeleton
-  # lets it sit in the terminator flesh's brain slot
-  - type: Organ
-  - type: Brain
-  - type: TypingIndicator
-    proto: robot # beep boop borp
-  - type: Speech
-    speechSounds: Pai
-  - type: Damageable
-    damageModifierSet: Cybernetic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundBehavior
-        # endoSKELETON
-        sound: /Audio/Effects/bone_rattle.ogg
-      # a keepsake or a gift for cargo
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          HeadTerminator:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  # for fire spreading around, the endoskeleton cannot burn
-  - type: Flammable
-    fireSpread: true
-    canResistFire: true
-    damage:
-      types:
-        Heat: 0
-  # now his only weapon, but it is stronger
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 15
-        Structural: 5
-  - type: Puller
-    needsHands: false
-  - type: Prying
-    pryPowered: true
-    force: true
-  - type: Tag
-    tags:
-    - DoorBumpOpener
-#    - ShoesRequiredStepTriggerImmune # DeltaV - Replaced by ClothingRequiredStepTriggerImmune
-    # let mind transfer on gib work
-    - MindTransferTarget
-    # its just metal so no implants
-    - Unimplantable
-  - type: ClothingRequiredStepTriggerImmune # DeltaV - Replaces ShoesRequiredStepTriggerImmuneTag

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1062,7 +1062,7 @@
     state: pda-seniorengineer
 
 - type: entity
-  parent: BasePDA
+  parent: SciencePDA # DeltaV - inherit the glimmer monitor program
   id: SeniorResearcherPDA
   name: senior researcher PDA
   description: Looks like it's been through years of chemical burns and explosions.