Merge branch 'master' into offmed-staging

2025-10-08 20:45:21 -04:00
parent 925c300174 ef0c9ecc63
commit 847154b320
36 changed files with 3795 additions and 2343 deletions
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -4,7 +4,6 @@ using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
 using Linguini.Shared.Util;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;

 namespace Content.Server.GameTicking.Commands
 {
@@ -12,7 +11,6 @@ namespace Content.Server.GameTicking.Commands
    public sealed class SetGamePresetCommand : IConsoleCommand
    {
        [Dependency] private readonly IEntityManager _entity = default!;
-        [Dependency] private readonly IPrototypeManager _prototype = default!;

        public string Command => "setgamepreset";
        public string Description => Loc.GetString("set-game-preset-command-description", ("command", Command));
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -9,7 +9,6 @@ using Content.Shared.Holopad;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Labels.Components;
 using Content.Shared.Mobs;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Speech;
@@ -40,7 +39,6 @@ public sealed class HolopadSystem : SharedHolopadSystem
    [Dependency] private readonly PopupSystem _popupSystem = default!;
    [Dependency] private readonly IGameTiming _timing = default!;
    [Dependency] private readonly PvsOverrideSystem _pvs = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;

    private float _updateTimer = 1.0f;
    private const float UpdateTime = 1.0f;
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.ActionBlocker;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
@@ -17,7 +16,6 @@ namespace Content.Server.SurveillanceCamera;
 public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
 {
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
    [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!;
    [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -100,6 +100,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
        {
            SkinColorationStrategyInput.Unary => skinColoration.FromUnary(speciesPrototype.DefaultHumanSkinTone),
            SkinColorationStrategyInput.Color => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone),
+            _ => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone),
        };

        return new(
@@ -109,11 +110,11 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
            Color.Black,
            Color.Black,
            skinColor,
-            new ()
+            new()
        );
    }

-    private static IReadOnlyList<Color> RealisticEyeColors = new List<Color>
+    private static IReadOnlyList<Color> _realisticEyeColors = new List<Color>
    {
        Color.Brown,
        Color.Gray,
@@ -145,7 +146,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,

        // TODO: Add random markings

-        var newEyeColor = random.Pick(RealisticEyeColors);
+        var newEyeColor = random.Pick(_realisticEyeColors);

        var protoMan = IoCManager.Resolve<IPrototypeManager>();
        var skinType = protoMan.Index<SpeciesPrototype>(species).SkinColoration;
@@ -155,9 +156,10 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
        {
            SkinColorationStrategyInput.Unary => strategy.FromUnary(random.NextFloat(0f, 100f)),
            SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
+            _ => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
        };

-        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new ());
+        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new());

        float RandomizeColor(float channel)
        {
--- a/Content.Shared/Zombies/PendingZombieComponent.cs
+++ b/Content.Shared/Zombies/PendingZombieComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class PendingZombieComponent : Component
    {
        DamageDict = new ()
        {
-            { "Poison", 0.4 },
+            { "Poison", 0.3 },
        }
    };

@@ -34,7 +34,7 @@ public sealed partial class PendingZombieComponent : Component
    /// The amount of time left before the infected begins to take damage.
    /// </summary>
    [DataField("gracePeriod"), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan GracePeriod = TimeSpan.Zero;
+    public TimeSpan GracePeriod = TimeSpan.FromMinutes(2);

    /// <summary>
    /// The minimum amount of time initial infected have before they start taking infection damage.
--- a/README.md
+++ b/README.md
@@ -32,6 +32,15 @@ Just make sure your changes and pull requests are in accordance with the [contri

 We are not currently accepting translations of the game on our main repository. If you would like to translate the game into another language, consider creating a fork or contributing to a fork.

+## AI-generated contributions disclaimer
+This project does not accept low-effort or wholesale AI-generated contributions. Examples include, but are not limited to:
+
+- Any code (including yaml) generated by tools like GitHub Copilot, ChatGPT, or similar.
+- AI-created artwork, sound files, or other assets.
+- Auto-generated documentation, issue reports or pull request descriptions.
+
+Exceptions to this are simple tools like Rider's single-line completion feature.
+
 ## Building

 1. Clone this repo:
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,80 +1,4 @@
 Entries:
- author: metalgearsloth
-  changes:
-  - message: Shuttle impact force is now proportional to direction of impact.
-    type: Tweak
-  id: 8548
-  time: '2025-05-21T13:32:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37667
- author: muburu
-  changes:
-  - message: Singularity beacons and powersinks now require two free hands to hold.
-    type: Tweak
-  id: 8549
-  time: '2025-05-21T17:11:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37683
- author: ElectroJr
-  changes:
-  - message: Microwaving the nuke disk will now slightly randomize the nuke countdown
-      timer.
-    type: Add
-  id: 8550
-  time: '2025-05-21T18:06:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36114
- author: AsnDen
-  changes:
-  - message: Cyborgs now can scream. 9 new screaming sound were added.
-    type: Tweak
-  id: 8551
-  time: '2025-05-21T19:49:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32329
- author: ScarKy0
-  changes:
-  - message: The "Help another traitor" objective now requires you help them complete
-      all of their objectives.
-    type: Tweak
-  - message: The "Help another traitor" objective now updates it's progress according
-      to the progress of who you're supposed to help, allowing for partial completion.
-    type: Tweak
-  id: 8552
-  time: '2025-05-21T20:45:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37679
- author: PJB3005
-  changes:
-  - message: Significantly reduced video memory usage of the parallax system.
-    type: Tweak
-  id: 8553
-  time: '2025-05-22T01:22:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37180
- author: ArtisticRoomba
-  changes:
-  - message: Tesla coils can now hold a max capacity of 5 MJ, and receive 5 MJ of
-      energy when struck by lightning.
-    type: Tweak
-  - message: Tesla coils can now only output a maximum of 350 kW to the grid. This
-      was done to make power flow smoother (it was triggering epilepsy in extreme
-      circumstances).
-    type: Tweak
-  id: 8554
-  time: '2025-05-22T01:39:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37626
- author: Wolfkey-SomeoneElseTookMyUsername
-  changes:
-  - message: You can now construct disposal signalers, which trigger a signal every
-      time an item passes through them.
-    type: Add
-  id: 8555
-  time: '2025-05-22T02:18:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37535
- author: ScarKy0
-  changes:
-  - message: The "Escape alive and unrestrained" objective now counts as partially
-      complete if you show up handcuffed. Being dead still has it count as a total
-      fail!
-    type: Tweak
-  id: 8556
-  time: '2025-05-22T03:25:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37680
 - author: EmoGarbage404
  changes:
  - message: Added cargo orders for gold and silver ingots.
@@ -3959,3 +3883,72 @@
  id: 9050
  time: '2025-10-08T02:51:21.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/40757
+- author: archee1
+  changes:
+  - message: Space Cobras no longer attack Space Adders automatically.
+    type: Fix
+  id: 9051
+  time: '2025-10-08T11:30:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37424
+- author: aada
+  changes:
+  - message: Buckets are now destructible.
+    type: Tweak
+  id: 9052
+  time: '2025-10-08T13:58:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40772
+- author: UpAndLeaves
+  changes:
+  - message: Zombie infections now take approximately three minutes longer to bring
+      a fully healed person to critical condition.
+    type: Tweak
+  id: 9053
+  time: '2025-10-08T14:11:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37445
+- author: YoungThugSS14
+  changes:
+  - message: The temperature gun bolts now count as energy projectiles for the sake
+      of reflection.
+    type: Tweak
+  - message: The temperature gun's cold projectile can no longer pass through windows.
+    type: Fix
+  - message: The temperature gun now has color-appropriate muzzle flashes.
+    type: Fix
+  id: 9054
+  time: '2025-10-08T15:10:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37581
+- author: K-Dynamic
+  changes:
+  - message: Energy shotgun lethal projectiles can now hit holo mobs.
+    type: Fix
+  id: 9055
+  time: '2025-10-08T15:23:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37920
+- author: Hitlinemoss
+  changes:
+  - message: Folders and clipboards are now available in the Trinkets loadout tab.
+    type: Add
+  id: 9056
+  time: '2025-10-08T15:49:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39920
+- author: SlamBamActionman
+  changes:
+  - message: Disablers, temperature guns and tasers can now hit holo mobs.
+    type: Fix
+  id: 9057
+  time: '2025-10-08T21:59:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40782
+- author: Centronias
+  changes:
+  - message: You can now attach paper labels to wrapped parcels.
+    type: Add
+  id: 9058
+  time: '2025-10-08T22:27:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40783
+- author: ToastEnjoyer
+  changes:
+  - message: On fland, the wardens enforcer has been removed.
+    type: Remove
+  id: 9059
+  time: '2025-10-08T23:45:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40786
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -749,4 +749,19 @@
  id: 90
  time: '2025-10-07T02:21:21.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/40725
+- author: Vortebo
+  changes:
+  - message: On Relic, some small changes to address unintended gameplay issues and
+      further increase historical accuracy.
+    type: Tweak
+  id: 91
+  time: '2025-10-08T16:59:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40537
+- author: ToastEnjoyer
+  changes:
+  - message: On box, the wardens enforcer has been removed from their office.
+    type: Remove
+  id: 92
+  time: '2025-10-08T20:41:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40785
 Order: 1
--- a/Resources/Maps/Shuttles/arrivals_relic.yml
+++ b/Resources/Maps/Shuttles/arrivals_relic.yml
@@ -66,7 +66,10 @@ entities:
    - type: OccluderTree
    - type: SpreaderGrid
    - type: Shuttle
-      dampingModifier: 0.25
+    - type: DeviceNetwork
+      configurators: []
+      deviceLists: []
+      transmitFrequencyId: ArrivalsShuttleTimer
    - type: GridPathfinding
    - type: Gravity
      gravityShakeSound: !type:SoundPathSpecifier
--- a/Resources/Maps/Shuttles/cargo_relic.yml
+++ b/Resources/Maps/Shuttles/cargo_relic.yml
@@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Grid
-  engineVersion: 264.0.0
+  engineVersion: 267.1.0
  forkId: ""
  forkVersion: ""
-  time: 08/06/2025 14:30:26
-  entityCount: 176
+  time: 09/27/2025 19:19:05
+  entityCount: 180
 maps: []
 grids:
 - 1
@@ -93,34 +93,12 @@ entities:
        uniqueMixes:
        - volume: 2500
          immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
        - volume: 2500
          temperature: 293.15
          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
        chunkSize: 4
    - type: GasTileOverlay
    - type: RadiationGridResistance
@@ -155,6 +133,21 @@ entities:
    - type: Transform
      pos: 6.5,1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,1.5
+      parent: 1
 - proto: CableApcExtension
  entities:
  - uid: 111
@@ -464,6 +457,9 @@ entities:
  entities:
  - uid: 9
    components:
+    - type: MetaData
+      desc: Used to pilot the prison shuttle.
+      name: prison shuttle console
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: 13.5,-1.5
@@ -726,13 +722,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 12.5,0.5
      parent: 1
- proto: PrefilledSyringe
-  entities:
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 13.5,-0.5
-      parent: 1
 - proto: RadioHandheld
  entities:
  - uid: 94
@@ -747,41 +736,57 @@ entities:
    - type: Transform
      pos: 5.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 53
    components:
    - type: Transform
      pos: 9.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 54
    components:
    - type: Transform
      pos: 12.5,1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 55
    components:
    - type: Transform
      pos: 12.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 56
    components:
    - type: Transform
      pos: 14.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 57
    components:
    - type: Transform
      pos: 14.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 58
    components:
    - type: Transform
      pos: 14.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 89
    components:
    - type: Transform
      pos: 5.5,1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: SMESBasic
  entities:
  - uid: 100
@@ -806,6 +811,13 @@ entities:
    - type: Transform
      pos: 3.5,0.5
      parent: 1
+- proto: Syringe
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
 - proto: Table
  entities:
  - uid: 76
@@ -1027,12 +1039,16 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 9.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 74
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindoorSecureSecurityLocked
  entities:
  - uid: 11
@@ -1040,16 +1056,37 @@ entities:
    - type: Transform
      pos: 1.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 75
    components:
    - type: Transform
      pos: 1.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 90
    components:
    - type: Transform
      pos: 1.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-4.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindowDirectional
  entities:
  - uid: 36
@@ -1057,89 +1094,121 @@ entities:
    - type: Transform
      pos: 5.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 50
    components:
    - type: Transform
      pos: 3.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 61
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 62
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 63
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 64
    components:
    - type: Transform
      pos: 12.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 65
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 12.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 66
    components:
    - type: Transform
      pos: 9.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 67
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 68
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 69
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 70
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 4.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 71
    components:
    - type: Transform
      pos: 2.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 87
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 5.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 170
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 4.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 171
    components:
    - type: Transform
      pos: 4.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 ...
--- a/Resources/Maps/Shuttles/emergency_relic.yml
+++ b/Resources/Maps/Shuttles/emergency_relic.yml
@@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Grid
-  engineVersion: 264.0.0
+  engineVersion: 267.1.0
  forkId: ""
  forkVersion: ""
-  time: 07/25/2025 18:00:45
-  entityCount: 176
+  time: 09/27/2025 19:18:41
+  entityCount: 180
 maps: []
 grids:
 - 1
@@ -66,7 +66,7 @@ entities:
          0,-1:
            0: 61166
          1,-1:
-            0: 65262
+            0: 65278
          1,0:
            0: 14
          2,0:
@@ -83,18 +83,8 @@ entities:
        - volume: 2500
          temperature: 293.15
          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
        chunkSize: 4
    - type: GasTileOverlay
    - type: RadiationGridResistance
@@ -114,31 +104,20 @@ entities:
      parent: 1
    - type: Physics
      bodyType: Static
- proto: AirlockFreezerLocked
+- proto: AirlockEngineeringLocked
  entities:
  - uid: 10
    components:
    - type: Transform
      pos: 4.5,-0.5
      parent: 1
-    - type: AccessReader
-      access:
-      - - Atmospherics
-      - - Captain
-      - - CentralCommand
-      - - Chemistry
-      - - ChiefEngineer
-      - - ChiefMedicalOfficer
-      - - Command
-      - - Cryogenics
-      - - Engineering
-      - - Medical
-    - type: Door
-      secondsUntilStateChange: -613.913
-      state: Opening
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
+- proto: AirlockMedicalLocked
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
 - proto: AirlockShuttle
  entities:
  - uid: 59
@@ -160,6 +139,21 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 4.5,0.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,1.5
+      parent: 1
 - proto: CableApcExtension
  entities:
  - uid: 110
@@ -325,7 +319,7 @@ entities:
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: 5.5,-2.5
+      pos: 5.5,-3.5
      parent: 1
  - uid: 52
    components:
@@ -630,11 +624,6 @@ entities:
    - type: Transform
      pos: 4.5,-3.5
      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
 - proto: LockerWallMedicalFilled
  entities:
  - uid: 8
@@ -643,6 +632,8 @@ entities:
      rot: 3.141592653589793 rad
      pos: 2.5,-4.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: MedkitBruteFilled
  entities:
  - uid: 6
@@ -753,13 +744,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 12.5,0.5
      parent: 1
- proto: PrefilledSyringe
-  entities:
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 13.5,-0.5
-      parent: 1
 - proto: Rack
  entities:
  - uid: 88
@@ -788,16 +772,15 @@ entities:
    - type: Transform
      pos: 4.5,-1.5
      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 92
    components:
    - type: Transform
      pos: 4.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: ShuttleWindow
  entities:
  - uid: 32
@@ -805,41 +788,57 @@ entities:
    - type: Transform
      pos: 5.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 53
    components:
    - type: Transform
      pos: 9.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 54
    components:
    - type: Transform
      pos: 12.5,1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 55
    components:
    - type: Transform
      pos: 12.5,-4.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 56
    components:
    - type: Transform
      pos: 14.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 57
    components:
    - type: Transform
      pos: 14.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 58
    components:
    - type: Transform
      pos: 14.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 89
    components:
    - type: Transform
      pos: 5.5,1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: SMESBasic
  entities:
  - uid: 100
@@ -876,6 +875,13 @@ entities:
    - type: Transform
      pos: 3.5,0.5
      parent: 1
+- proto: Syringe
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
 - proto: Table
  entities:
  - uid: 76
@@ -1079,12 +1085,16 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 9.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 74
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindowDirectional
  entities:
  - uid: 36
@@ -1092,68 +1102,116 @@ entities:
    - type: Transform
      pos: 5.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 61
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 62
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 63
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 13.5,-2.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 64
    components:
    - type: Transform
      pos: 12.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 65
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 12.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 66
    components:
    - type: Transform
      pos: 9.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 67
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-3.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 68
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,-1.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 69
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 9.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 70
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 7.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
  - uid: 87
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 5.5,0.5
      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 ...
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -7011,7 +7011,7 @@ entities:
  - uid: 955
    components:
    - type: Transform
-      pos: 5.5,-4.5
+      pos: 7.5,-4.5
      parent: 2
    - type: WarpPoint
      location: Automated Trade Station
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Map
-  engineVersion: 266.0.0
+  engineVersion: 267.2.0
  forkId: ""
  forkVersion: ""
-  time: 09/06/2025 03:51:25
-  entityCount: 28793
+  time: 10/08/2025 20:15:18
+  entityCount: 28790
 maps:
 - 780
 grids:
@@ -10936,8 +10936,8 @@ entities:
          id: docking46345
          localAnchorB: -0.5,-1
          localAnchorA: -66.5,22
-          damping: 42.40102
-          stiffness: 380.5907
+          damping: 42.401035
+          stiffness: 380.59082
    - type: OccluderTree
    - type: Shuttle
      dampingModifier: 0.25
@@ -23112,18 +23112,6 @@ entities:
    - type: Transform
      pos: 7.3923097,47.786827
      parent: 8364
- proto: BoxShotgunSlug
-  entities:
-  - uid: 7852
-    components:
-    - type: Transform
-      pos: -7.2934785,34.60984
-      parent: 8364
-  - uid: 9144
-    components:
-    - type: Transform
-      pos: -7.289858,34.610893
-      parent: 8364
 - proto: BoxSterileMask
  entities:
  - uid: 5467
@@ -182974,15 +182962,6 @@ entities:
    - type: Physics
      canCollide: False
    - type: InsideEntityStorage
- proto: WeaponShotgunEnforcer
-  entities:
-  - uid: 9086
-    components:
-    - type: Transform
-      pos: -7.4221897,34.38881
-      parent: 8364
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunSlug
 - proto: WeaponShotgunKammerer
  entities:
  - uid: 26308
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Map
-  engineVersion: 267.1.0
+  engineVersion: 267.2.0
  forkId: ""
  forkVersion: ""
-  time: 09/24/2025 21:56:25
-  entityCount: 36083
+  time: 10/08/2025 23:22:51
+  entityCount: 36080
 maps:
 - 1
 grids:
@@ -30897,11 +30897,6 @@ entities:
    - type: Transform
      pos: 16.61324,11.471256
      parent: 13329
-  - uid: 10642
-    components:
-    - type: Transform
-      pos: 31.342075,13.304442
-      parent: 13329
  - uid: 18486
    components:
    - type: Transform
@@ -31282,11 +31277,6 @@ entities:
    - type: Transform
      pos: 16.446573,11.429589
      parent: 13329
-  - uid: 9340
-    components:
-    - type: Transform
-      pos: 31.685825,13.288817
-      parent: 13329
 - proto: BoxLightMixed
  entities:
  - uid: 1644
@@ -227061,13 +227051,6 @@ entities:
    - type: Transform
      pos: 19.469765,12.608503
      parent: 13329
- proto: WeaponShotgunEnforcer
-  entities:
-  - uid: 9339
-    components:
-    - type: Transform
-      pos: 31.498325,13.851317
-      parent: 13329
 - proto: WeaponShotgunHandmade
  entities:
  - uid: 5418
--- a/Resources/Maps/relic.yml
+++ b/Resources/Maps/relic.yml
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,529 +1,4 @@
-# Belts that need/have visualizers
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltUtility
-  name: utility belt
-  description: Can hold various things.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/utility.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/utility.rsi
-  - type: Storage
-    maxItemSize: Normal
-    # Don't add more than absolutely needed to this whitelist!
-    # Utility belts shouldn't just be free extra storage.
-    # This is only intended for basic engineering equipment.
-    whitelist:
-      tags:
-        - Powerdrill
-        - Wirecutter
-        - Crowbar
-        - Screwdriver
-        - Flashlight
-        - Wrench
-        - GeigerCounter
-        - Flare
-        - CableCoil
-        - CigPack
-        - Radio
-        - HolofanProjector
-        - Multitool
-        - AppraisalTool
-        - JawsOfLife
-        - GPS
-        - WeldingMask
-        - RemoteSignaller
-        - UtilityKnife
-      components:
-        - StationMap
-        - SprayPainter
-        - SprayPainterAmmo
-        - NetworkConfigurator
-        - RCD
-        - RCDAmmo
-        - Welder
-        - PowerCell
-        - Geiger
-        - TrayScanner
-        - GasAnalyzer
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      drill:
-        whitelist:
-          tags:
-          - Powerdrill
-      cutters_red:
-        whitelist:
-          tags:
-          - Wirecutter
-      crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      crowbar_red:
-        whitelist:
-          tags:
-          - CrowbarRed
-      jaws:
-        whitelist:
-          tags:
-          - JawsOfLife
-      screwdriver_nuke:
-        whitelist:
-          tags:
-          - Screwdriver
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-      multitool:
-        whitelist:
-          tags:
-            - Multitool
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-  - type: Tag
-    tags:
-    - UtilityBelt
-    - WhitelistChameleon
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltChiefEngineer
-  name: chief engineer's toolbelt
-  description: Holds tools, looks snazzy.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/ce.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/ce.rsi
-  - type: Storage
-    grid:
-    - 0,0,9,1
-    # TODO: Fill this out more.
-    whitelist:
-      tags:
-        - Wirecutter
-        - Crowbar
-        - Screwdriver
-        - Flashlight
-        - Wrench
-        - GeigerCounter
-        - Flare
-        - CableCoil
-        - Powerdrill
-        - JawsOfLife
-        - CigPack
-        - Radio
-        - HolofanProjector
-        - Multitool
-        - AppraisalTool
-        - UtilityKnife
-      components:
-        - StationMap
-        - SprayPainter
-        - SprayPainterAmmo
-        - NetworkConfigurator
-        - RCD
-        - RCDAmmo
-        - Welder
-        - Flash
-        - Handcuff
-        - PowerCell
-        - Geiger
-        - TrayScanner
-        - GasAnalyzer
-  - type: ItemMapper
-    mapLayers:
-      drill:
-        whitelist:
-          tags:
-          - Powerdrill
-      cutters_red:
-        whitelist:
-          tags:
-          - Wirecutter
-      crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      crowbar_red:
-        whitelist:
-          tags:
-          - CrowbarRed
-      jaws:
-        whitelist:
-          tags:
-          - JawsOfLife
-      screwdriver_nuke:
-        whitelist:
-          tags:
-          - Screwdriver
-      multitool:
-        whitelist:
-          tags:
-            - Multitool
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-  - type: StealTarget
-    stealGroup: ChiefEngineerToolBelt
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltAssault
-  name: assault belt
-  description: A tactical assault belt.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/assault.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/assault.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - CigPack
-        - Taser
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - BallisticAmmoProvider
-        - Ammo
-  - type: ItemMapper
-    mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
-        whitelist:
-          components:
-          - Stunbaton
-      tear_gas_grenade:
-        whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltJanitor
-  name: janibelt
-  description: A belt used to hold most janitorial supplies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/janitor.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/janitor.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - Wrench
-        - Bottle
-        - Spray
-        - Soap
-        - Flashlight
-        - CigPack
-        - TrashBag
-        - WetFloorSign
-        - HolosignProjector
-        - Plunger
-        - GoldenPlunger
-        - WireBrush
-      components:
-        - LightReplacer
-        - SmokeOnTrigger
-    maxItemSize: Large
-  - type: ItemMapper
-    mapLayers:
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-      bottle_spray:
-        whitelist:
-          tags:
-          - Spray
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltMedical
-  name: medical belt
-  description: Can hold various medical equipment.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/medical.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/medical.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - Wrench
-        - Bottle
-        - Spray
-        - Brutepack
-        - Bloodpack
-        - Gauze
-        - Ointment
-        - CigPack
-        - PillCanister
-        - Radio
-        - DiscreteHealthAnalyzer
-        - SurgeryTool
-        - Dropper
-      components:
-        - Hypospray
-        - Injector
-        - Pill
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-      hypo:
-        whitelist:
-          components:
-          - Hypospray
-      pill:
-        whitelist:
-          components:
-          - Pill
-          tags:
-          - PillCanister
-      bottle_spray:
-        whitelist:
-          tags:
-          - Spray
-      # spray_med:
-      #   whitelist:
-      #     tags:
-      #     - SprayMedical
-      # wrench_medical:
-      #   whitelist:
-      #     tags:
-      #     - WrenchMedical
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
- type: entity
-  parent: ClothingBeltMedical
-  id: ClothingBeltMedicalEMT
-  name: EMT belt
-  description: Perfect for holding various equipment for medical emergencies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/emt.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/emt.rsi
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltPlant
-  name: botanical belt
-  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/plant.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/plant.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        # - PlantAnalyzer
-        - PlantSampleTaker
-        - BotanyShovel
-        - BotanyHoe
-        - BotanyHatchet
-        - PlantSampleTaker
-        - PlantBGone
-        - Bottle
-        - Syringe
-        - CigPack
-        - Dropper
-      components:
-        - Seed
-        - Smokable
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      hatchet:
-        whitelist:
-          tags:
-          - BotanyHatchet
-      # hydro:
-      #   whitelist:
-      #     tags:
-      #     - PlantAnalyzer # Dunno what to put here, should be aight.
-      hoe:
-        whitelist:
-          tags:
-          - BotanyHoe
-      secateurs: # We don't have secateurs and this looks similar enough.
-        whitelist:
-          tags:
-          - BotanyShovel
-      plantbgone:
-        whitelist:
-          tags:
-          - PlantBGone
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltChef
-  name: chef belt
-  description: A belt used to hold kitchen knives and condiments for quick access.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/chef.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/chef.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - KitchenKnife
-        - Cleaver
-        - RollingPin
-        - Coldsauce
-        - Enzyme
-        - Hotsauce
-        - Ketchup
-        - BBQsauce
-        - SaltShaker
-        - PepperShaker
-        - CigPack
-        - Packet
-        - Skewer
-        - MonkeyCube
-        - Mayo
-      components:
-        - Mousetrap
-        - Smokable
-        - Utensil
-  - type: ItemMapper
-    mapLayers:
-      kitchenknife:
-        whitelist:
-          tags:
-          - KitchenKnife
-      cleaver:
-        whitelist:
-          tags:
-          - Cleaver
-      rollingpin:
-        whitelist:
-          tags:
-          - RollingPin
-      coldsauce:
-        whitelist:
-          tags:
-          - Coldsauce
-      enzyme:
-        whitelist:
-          tags:
-          - Enzyme
-      hotsauce:
-        whitelist:
-          tags:
-          - Hotsauce
-      ketchup:
-        whitelist:
-          tags:
-          - Ketchup
-      bbqsauce:
-        whitelist:
-          tags:
-          - BBQsauce
-      saltshaker:
-        whitelist:
-          tags:
-          - SaltShaker
-      peppershaker:
-        whitelist:
-          tags:
-          - PepperShaker
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
- type: entity
-  parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSecurityContraband]
-  id: ClothingBeltSecurity
-  name: security belt
-  description: Can hold security gear like handcuffs and flashes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/security.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/security.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: Storage
-    whitelist:
-      tags:
-        - CigPack
-        - Taser
-        - SecBeltEquip
-        - Radio
-        - Sidearm
-        - MagazinePistol
-        - MagazineMagnum
-        - CombatKnife
-        - Truncheon
-        - HandGrenade
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - BallisticAmmoProvider
-        - CartridgeAmmo
-        - DoorRemote
-        - Whistle
-        - BalloonPopper
-  - type: ItemMapper
-    mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
-        whitelist:
-          components:
-          - Stunbaton
-      tear_gas_grenade:
-        whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
+## Belts that need/have visualizers

 - type: entity
  parent: [ClothingBeltBase, ClothingSlotBase, BaseCommandContraband]
@@ -557,7 +32,36 @@
          - CaptainSabre
  - type: Appearance

-# Belts without visualizers
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltQuiver
+  name: quiver
+  description: Can hold up to 15 arrows, and fits snug around your waist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/quiver.rsi
+    layers:
+    - state: icon
+    - map: [ "enum.StorageContainerVisualLayers.Fill" ]
+      visible: false
+  - type: Clothing
+  - type: Storage
+    grid:
+    - 0,0,7,3
+    maxItemSize: Small
+    whitelist:
+      tags:
+      - Arrow
+      - Plunger
+  - type: Appearance
+  - type: StorageContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: fill-
+  - type: Construction
+    graph: Quiver
+    node: Quiver
+
+## Belts without visualizers

 - type: entity
  parent: [ClothingBeltAmmoProviderBase, BaseSecurityBartenderContraband]
@@ -578,19 +82,24 @@
    capacity: 14

 - type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltChampion
-  name: championship belt
-  description: Proves to the world that you are the strongest!
+  parent: [ ClothingBeltStorageBase, BaseMagicalContraband ]
+  id: ClothingBeltWand
+  name: wand belt
+  description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
  components:
  - type: Sprite
-    sprite: Clothing/Belt/champion.rsi
+    sprite: Clothing/Belt/wand.rsi
  - type: Clothing
-    sprite: Clothing/Belt/champion.rsi
-    quickEquip: true
-  - type: Tag
-    tags:
-    - Kangaroo
+    sprite: Clothing/Belt/wand.rsi
+  - type: Storage
+    grid:
+    - 0,0,15,1
+    whitelist:
+      tags:
+      - WizardWand
+      - WhitelistChameleon
+
+## Holsters

 - type: entity
  parent: ClothingBeltStorageBase
@@ -616,20 +125,22 @@
    sprite: Clothing/Belt/syndieholster.rsi
  - type: Clothing
    sprite: Clothing/Belt/syndieholster.rsi
-  - type: Item
-    size: Ginormous
  - type: Storage
    maxItemSize: Huge
    grid:
    - 0,0,3,3
    whitelist:
      components:
-        - Gun
-        - BallisticAmmoProvider
-        - CartridgeAmmo
+      - Gun
+      - BallisticAmmoProvider
+      - CartridgeAmmo
  - type: StaticPrice
    price: 500

+## Webbing
+
+# Weirdly the only webbing with a storage whitelist and item mapper.
+# Might be worth making less common (armory only?) and removing the whitelist to eliminate the inconsistency.
 - type: entity
  parent: ClothingBeltSecurity
  id: ClothingBeltSecurityWebbing
@@ -688,50 +199,3 @@
    sprite: Clothing/Belt/militarywebbingmed.rsi
  - type: Clothing
    sprite: Clothing/Belt/militarywebbingmed.rsi
-  - type: Item
-    size: Huge
-  - type: ExplosionResistance
-    damageCoefficient: 0.1
-
- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltSuspendersRed
-  name: red suspenders
-  description: For holding your pants up.
-  components:
-  - type: Tag
-    tags:
-    - MimeBelt
-  - type: Sprite
-    sprite: Clothing/Belt/suspenders_red.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Belt/suspenders_red.rsi
-    quickEquip: true
-
- type: entity
-  parent: ClothingBeltSuspendersRed
-  id: ClothingBeltSuspendersBlack
-  name: black suspenders
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/suspenders_black.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/suspenders_black.rsi
-
- type: entity
-  parent: [ ClothingBeltStorageBase, BaseMagicalContraband ]
-  id: ClothingBeltWand
-  name: wand belt
-  description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/wand.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/wand.rsi
-  - type: Storage
-    grid:
-    - 0,0,15,1
-    whitelist:
-      tags:
-      - WizardWand
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -0,0 +1,422 @@
+# Belts meant to be used by a specific job to hold their tools
+
+- type: entity
+  abstract: true
+  parent: ClothingBeltStorageBase
+  id: BaseClothingBeltEngineering
+  components:
+  - type: Storage
+    # Don't add more than absolutely needed to this whitelist!
+    # Utility belts shouldn't just be free extra storage.
+    # This is only intended for basic engineering equipment.
+    whitelist:
+      tags:
+      - Powerdrill
+      - Wirecutter
+      - Crowbar
+      - Screwdriver
+      - Flashlight
+      - Wrench
+      - GeigerCounter
+      - Flare
+      - CableCoil
+      - CigPack
+      - Radio
+      - HolofanProjector
+      - Multitool
+      - AppraisalTool
+      - JawsOfLife
+      - GPS
+      - WeldingMask
+      - RemoteSignaller
+      - UtilityKnife
+      components:
+      - StationMap
+      - SprayPainter
+      - SprayPainterAmmo
+      - NetworkConfigurator
+      - RCD
+      - RCDAmmo
+      - Welder
+      - PowerCell
+      - Geiger
+      - TrayScanner
+      - GasAnalyzer
+      - HandLabeler
+  - type: ItemMapper
+    sprite: &BeltOverlay Clothing/Belt/belt_overlay.rsi
+    mapLayers:
+      drill:
+        whitelist:
+          tags:
+          - Powerdrill
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      jaws:
+        whitelist:
+          tags:
+          - JawsOfLife
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+      multitool:
+        whitelist:
+          tags:
+          - Multitool
+  - type: Appearance
+
+- type: entity
+  parent: BaseClothingBeltEngineering
+  id: ClothingBeltUtility
+  name: utility belt
+  description: Can hold various things.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/utility.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/utility.rsi
+  - type: Tag
+    tags:
+    - UtilityBelt
+    - WhitelistChameleon
+
+- type: entity
+  parent: BaseClothingBeltEngineering
+  id: ClothingBeltChiefEngineer
+  name: chief engineer's toolbelt
+  description: Holds tools, looks snazzy.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/ce.rsi
+  - type: Storage
+    grid:
+    - 0,0,9,1
+  - type: StealTarget
+    stealGroup: ChiefEngineerToolBelt
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltJanitor
+  name: janibelt
+  description: A belt used to hold most janitorial supplies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Storage
+    maxItemSize: Large
+    whitelist:
+      tags:
+      - Wrench
+      - Bottle
+      - Spray
+      - Soap
+      - Flashlight
+      - CigPack
+      - TrashBag
+      - WetFloorSign
+      - HolosignProjector
+      - Plunger
+      - GoldenPlunger
+      - WireBrush
+      components:
+      - LightReplacer
+      - SmokeOnTrigger
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltMedical
+  name: medical belt
+  description: Can hold various medical equipment.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/medical.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      - Wrench
+      - Bottle
+      - Spray
+      - Brutepack
+      - Bloodpack
+      - Gauze
+      - Ointment
+      - CigPack
+      - PillCanister
+      - Radio
+      - DiscreteHealthAnalyzer
+      - SurgeryTool
+      - Dropper
+      components:
+      - Hypospray
+      - Injector
+      - Pill
+      - HandLabeler
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      hypo:
+        whitelist:
+          components:
+          - Hypospray
+      pill:
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      # spray_med:
+      #   whitelist:
+      #     tags:
+      #     - SprayMedical
+      # wrench_medical:
+      #   whitelist:
+      #     tags:
+      #     - WrenchMedical
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltMedicalEMT
+  name: EMT belt
+  description: Perfect for holding various equipment for medical emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/emt.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/emt.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltPlant
+  name: botanical belt
+  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/plant.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/plant.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      # - PlantAnalyzer
+      - PlantSampleTaker
+      - BotanyShovel
+      - BotanyHoe
+      - BotanyHatchet
+      - PlantSampleTaker
+      - PlantBGone
+      - Bottle
+      - Syringe
+      - CigPack
+      - Dropper
+      components:
+      - Seed
+      - Smokable
+      - HandLabeler
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      hatchet:
+        whitelist:
+          tags:
+          - BotanyHatchet
+      # hydro:
+      #   whitelist:
+      #     tags:
+      #     - PlantAnalyzer # Dunno what to put here, should be aight.
+      hoe:
+        whitelist:
+          tags:
+          - BotanyHoe
+      secateurs: # We don't have secateurs and this looks similar enough.
+        whitelist:
+          tags:
+          - BotanyShovel
+      plantbgone:
+        whitelist:
+          tags:
+          - PlantBGone
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltChef
+  name: chef belt
+  description: A belt used to hold kitchen knives and condiments for quick access.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/chef.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/chef.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      - KitchenKnife
+      - Cleaver
+      - RollingPin
+      - Coldsauce
+      - Enzyme
+      - Hotsauce
+      - Ketchup
+      - BBQsauce
+      - SaltShaker
+      - PepperShaker
+      - CigPack
+      - Packet
+      - Skewer
+      - MonkeyCube
+      - Mayo
+      components:
+      - Mousetrap
+      - Smokable
+      - Utensil
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      kitchenknife:
+        whitelist:
+          tags:
+          - KitchenKnife
+      cleaver:
+        whitelist:
+          tags:
+          - Cleaver
+      rollingpin:
+        whitelist:
+          tags:
+          - RollingPin
+      coldsauce:
+        whitelist:
+          tags:
+          - Coldsauce
+      enzyme:
+        whitelist:
+          tags:
+          - Enzyme
+      hotsauce:
+        whitelist:
+          tags:
+          - Hotsauce
+      ketchup:
+        whitelist:
+          tags:
+          - Ketchup
+      bbqsauce:
+        whitelist:
+          tags:
+          - BBQsauce
+      saltshaker:
+        whitelist:
+          tags:
+          - SaltShaker
+      peppershaker:
+        whitelist:
+          tags:
+          - PepperShaker
+  - type: Appearance
+
+- type: entity
+  parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSecurityContraband]
+  id: ClothingBeltSecurity
+  name: security belt
+  description: Can hold security gear like handcuffs and flashes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/security.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/security.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: Storage
+    whitelist:
+      tags:
+      - CigPack
+      - Taser
+      - SecBeltEquip
+      - Radio
+      - Sidearm
+      - MagazinePistol
+      - MagazineMagnum
+      - CombatKnife
+      - Truncheon
+      - HandGrenade
+      components:
+      - Stunbaton
+      - FlashOnTrigger
+      - SmokeOnTrigger
+      - Flash
+      - Handcuff
+      - BallisticAmmoProvider
+      - CartridgeAmmo
+      - DoorRemote
+      - Whistle
+      - BalloonPopper
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+      tear_gas_grenade:
+        whitelist:
+          components:
+          - SmokeOnTrigger
+  - type: Appearance
--- a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
@@ -1,28 +0,0 @@
- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltQuiver
-  name: quiver
-  description: Can hold up to 15 arrows, and fits snug around your waist.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/quiver.rsi
-    layers:
-    - state: icon
-    - map: [ "enum.StorageContainerVisualLayers.Fill" ]
-      visible: false
-  - type: Clothing
-  - type: Storage
-    grid:
-    - 0,0,7,3
-    maxItemSize: Small
-    whitelist:
-      tags:
-      - Arrow
-      - Plunger
-  - type: Appearance
-  - type: StorageContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: fill-
-  - type: Construction
-    graph: Quiver
-    node: Quiver
--- a/Resources/Prototypes/Entities/Clothing/Belt/simple.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/simple.yml
@@ -0,0 +1,44 @@
+# For cosmetic belts parenting off ClothingBeltBase
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChampion
+  name: championship belt
+  description: Proves to the world that you are the strongest!
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/champion.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/champion.rsi
+    quickEquip: true
+  - type: Tag
+    tags:
+    - Kangaroo # Kangaroo wearable. Dare to challenge the champ?
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSuspendersRed
+  name: red suspenders
+  description: For holding your pants up.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/suspenders_red.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Belt/suspenders_red.rsi
+    quickEquip: true
+  - type: Tag
+    tags:
+    - MimeBelt
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingBeltSuspendersRed
+  id: ClothingBeltSuspendersBlack
+  name: black suspenders
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/suspenders_black.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/suspenders_black.rsi
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -393,6 +393,7 @@
  - type: NpcFactionMember
    factions:
    - Xeno
+    - SimpleHostile
  - type: MeleeWeapon
    angle: 0
    animation: WeaponArcBite
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -117,6 +117,34 @@
    materialComposition:
      Plastic: 25

+# Strong plastic
+- type: entity
+  abstract: true
+  parent: DrinkBaseMaterialPlastic
+  id: DrinkBaseMaterialStrongPlastic
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger: # Overkill threshold
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 20 # can take a few more hits than basic plastic
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalCrunch # TODO a plastic break collection
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+
 # Fragile cardboard
 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -83,7 +83,7 @@

 - type: entity
  abstract: true
-  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for roles' startingGear
+  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for things that should always be consistent, e.g roundstart items
  suffix: 3 papers
  components:
  - type: StorageFill
@@ -95,6 +95,10 @@
  parent: [BoxFolderBaseEmpty, BoxFolderFill]
  id: BoxFolderBase

+- type: entity
+  parent: [BoxFolderBaseEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBaseThreePapers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderRedEmpty
@@ -111,6 +115,11 @@
  id: BoxFolderRed
  suffix: Red, Filled

+- type: entity
+  parent: [BoxFolderRedEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderRedThreePapers
+  suffix: Red, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderBlueEmpty
@@ -127,6 +136,11 @@
  id: BoxFolderBlue
  suffix: Blue, Filled

+- type: entity
+  parent: [BoxFolderBlueEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBlueThreePapers
+  suffix: Blue, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderYellowEmpty
@@ -143,6 +157,11 @@
  id: BoxFolderYellow
  suffix: Yellow, Filled

+- type: entity
+  parent: [BoxFolderYellowEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderYellowThreePapers
+  suffix: Yellow, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderGreyEmpty
@@ -159,6 +178,11 @@
  id: BoxFolderGrey
  suffix: Grey, Filled

+- type: entity
+  parent: [BoxFolderGreyEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderGreyThreePapers
+  suffix: Grey, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderBlackEmpty
@@ -175,6 +199,11 @@
  id: BoxFolderBlack
  suffix: Black, Filled

+- type: entity
+  parent: [BoxFolderBlackEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBlackThreePapers
+  suffix: Black, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderGreenEmpty
@@ -191,6 +220,11 @@
  id: BoxFolderGreen
  suffix: Green, Filled

+- type: entity
+  parent: [BoxFolderGreenEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderGreenThreePapers
+  suffix: Green, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderWhiteEmpty
@@ -206,6 +240,11 @@
  id: BoxFolderWhite
  suffix: White, Filled

+- type: entity
+  parent: [BoxFolderWhiteEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderWhiteThreePapers
+  suffix: White, 3 papers
+
 - type: entity
  parent: BoxFolderBaseEmpty
  id: BoxFolderCentComEmpty
@@ -221,7 +260,12 @@
 - type: entity
  parent: [BoxFolderCentComEmpty, BoxFolderFill]
  id: BoxFolderCentCom
-  suffix: DO NOT MAP, Filled
+  suffix: DO NOT MAP; Filled
+
+- type: entity
+  parent: [BoxFolderCentComEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderCentComThreePapers
+  suffix: DO NOT MAP; 3 papers

 - type: entity
  parent: BoxFolderBaseEmpty
@@ -316,6 +360,10 @@
  parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill]
  id: BoxFolderPlasticClipboard

+- type: entity
+  parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderPlasticClipboardThreePapers
+
 - type: entity
  parent: BoxFolderClipboardEmpty
  id: BoxFolderCentComClipboardEmpty
--- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
@@ -38,6 +38,7 @@
  - type: ContainerContainer
    containers:
      contents: !type:ContainerSlot
+      paper_label: !type:ContainerSlot
  - type: Appearance
  - type: GenericVisualizer
    visuals:
@@ -49,11 +50,25 @@
          "Large": { state: "parcel-medium" }
          "Huge": { state: "parcel-large" }
          "Ginormous": { state: "parcel-large" }
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
  - type: Sprite
    sprite: Objects/Misc/ParcelWrap/wrapped_parcel.rsi
    layers:
    - state: parcel-medium
      map: [ "enum.WrappedParcelVisuals.Layer" ]
+    - state: paper
+      visible: false
+      sprite: Objects/Misc/ParcelWrap/paper_labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
  - type: WrappedParcel
    unwrapDelay: 0.5
    unwrapSound:
@@ -61,6 +76,17 @@
      params:
        volume: -4
    unwrapTrash: ParcelWrapTrash
+  - type: ItemSlots
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: comp-paper-label-insert
+      ejectVerbText: comp-paper-label-eject
+      whitelist:
+        components:
+        - Paper
+      blacklist:
+        tags:
+        - Book
  - type: Damageable
    damageContainer: Inorganic
  - type: Destructible
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -1,22 +1,13 @@
 - type: entity
-  parent: DrinkBase
+  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkVisualsFill ]
  id: Bucket
  name: bucket
  description: It's a boring old bucket.
  components:
-  - type: Clickable
  - type: Edible
-    edible: Drink
-    solution: bucket
-    destroyOnEmpty: false
    utensil: Spoon
  - type: Sprite
    sprite: Objects/Tools/bucket.rsi
-    layers:
-    - state: icon
-    - map: ["enum.SolutionContainerLayers.Fill"]
-      state: fill-1
-      visible: false
  - type: Item
    size: Normal
  - type: Clothing
@@ -26,50 +17,23 @@
    quickEquip: false
  - type: SolutionContainerManager
    solutions:
-      bucket:
+      drink:
        maxVol: 250
-  - type: MixableSolution
-    solution: bucket
  - type: SolutionTransfer
    transferAmount: 100
    maxTransferAmount: 100
    minTransferAmount: 10
-    canChangeTransferAmount: true
-  - type: UserInterface
-    interfaces:
-      enum.TransferAmountUiKey.Key:
-        type: TransferAmountBoundUserInterface
-  - type: MeleeWeapon
-    soundNoDamage:
-      path: "/Audio/Effects/Fluids/splat.ogg"
-    damage:
-      types:
-        Blunt: 0
-  - type: Spillable
-    solution: bucket
  - type: SpillWhenWorn
-    solution: bucket
-  - type: DrawableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: DrainableSolution
-    solution: bucket
-  - type: SolutionItemStatus
-    solution: bucket
-  - type: Appearance
+    solution: drink
  - type: SolutionContainerVisuals
    maxFillLevels: 3
-    fillBaseName: fill-
-  - type: ExaminableSolution
-    solution: bucket
+    inHandsFillBaseName: null
  - type: Tag
    tags:
      - Bucket
  - type: PhysicalComposition
    materialComposition:
      Plastic: 50
-  - type: DnaSubstanceTrace

 - type: entity
  parent: Bucket
@@ -79,5 +43,5 @@
  components:
  - type: SolutionContainerManager
    solutions:
-      bucket:
+      drink:
        maxVol: 500
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -211,8 +211,9 @@
          bounds: "-0.15,-0.45,0.15,0.15"
        hard: false
        mask:
-          - Impassable
-          - BulletImpassable
+        - Opaque
+        - Impassable
+        - BulletImpassable
      fly-by: *flybyfixture
  - type: Ammo
  - type: Projectile
@@ -289,6 +290,7 @@
          bounds: "-0.15,-0.3,0.15,0.3"
        hard: false
        mask:
+        - Opaque
        - Impassable
        - BulletImpassable
      fly-by: *flybyfixture
@@ -329,6 +331,7 @@
          bounds: "-0.15,-0.3,0.15,0.3"
        hard: false
        mask:
+        - Opaque
        - Impassable
        - BulletImpassable
      fly-by: *flybyfixture
@@ -398,7 +401,7 @@
    - state: omnilaser
      shader: unshaded
  - type: Ammo
-    muzzleFlash: null
+    muzzleFlash: MuzzleFlashEffectOmnilaser
  - type: Physics
  - type: Fixtures
    fixtures:
@@ -409,6 +412,8 @@
        hard: false
        mask:
        - Opaque
+        - Impassable
+        - BulletImpassable
      fly-by: *flybyfixture
  - type: Projectile
    #   soundHit:  Waiting on serv3
@@ -427,6 +432,9 @@
  parent: WatcherBolt
  categories: [ HideSpawnMenu ]
  components:
+  - type: Reflective
+    reflective:
+    - Energy
  - type: Projectile
    #   soundHit:  Waiting on serv3
    impactEffect: BulletImpactEffectDisabler
@@ -441,7 +449,7 @@
 - type: entity
  name: magmawing watcher bolt
  id: WatcherBoltMagmawing
-  parent: BaseBullet
+  parent: WatcherBolt
  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
@@ -450,6 +458,8 @@
    - state: omnilaser_greyscale
      shader: unshaded
      color: orangered
+  - type: Ammo
+    muzzleFlash: MuzzleFlashEffectHeavyLaser
  - type: Projectile
    #   soundHit:  Waiting on serv3
    impactEffect: BulletImpactEffectOrangeDisabler
@@ -465,6 +475,9 @@
  parent: WatcherBoltMagmawing
  categories: [ HideSpawnMenu ]
  components:
+  - type: Reflective
+    reflective:
+    - Energy
  - type: Projectile
    #   soundHit:  Waiting on serv3
    impactEffect: BulletImpactEffectOrangeDisabler
@@ -1132,6 +1145,7 @@
          bounds: "-0.15,-0.3,0.15,0.3"
        hard: false
        mask:
+        - Opaque
        - Impassable
        - BulletImpassable
      fly-by: *flybyfixture
@@ -1283,6 +1297,7 @@
          bounds: "-0.15,-0.3,0.15,0.3"
        hard: false
        mask:
+        - Opaque
        - Impassable
        - BulletImpassable
      fly-by: *flybyfixture
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -106,6 +106,31 @@
    - CigarGold
  groupBy: "smokeables"

+# Folders
+- type: loadout
+  id: BoxFolderBaseThreePapers
+  storage:
+    back:
+    - BoxFolderBaseThreePapers
+  groupBy: "folders"
+
+- type: loadout
+  id: BoxFolderPlasticClipboardThreePapers
+  storage:
+    back:
+    - BoxFolderPlasticClipboardThreePapers
+  groupBy: "folders"
+
+- type: loadout
+  id: BoxFolderClipboardThreePapers
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: Command
+  storage:
+    back:
+    - BoxFolderClipboardThreePapers
+  groupBy: "folders"
+
 # Pins
 - type: loadout
  id: ClothingNeckLGBTPin
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -18,6 +18,9 @@
  - CigPackBlack
  - CigarCase
  - CigarGold
+  - BoxFolderBaseThreePapers
+  - BoxFolderPlasticClipboardThreePapers
+  - BoxFolderClipboardThreePapers
  - ClothingNeckLGBTPin
  - ClothingNeckAllyPin
  - ClothingNeckAromanticPin
--- a/Resources/Prototypes/Maps/relic.yml
+++ b/Resources/Prototypes/Maps/relic.yml
@@ -58,7 +58,7 @@
            SecurityCadet: [ 2, 2 ] #intern, not counted
            Lawyer: [ 1, 1 ]
            #supply (0)
-            #civilian (1+)
+            #civilian (0+)
            Passenger: [ -1, -1 ] #infinite, not counted
            #silicon (1)
            StationAi: [ 1, 1 ]
--- a/Resources/Prototypes/Parallaxes/relic.yml
+++ b/Resources/Prototypes/Parallaxes/relic.yml
@@ -5,5 +5,5 @@
        !type:ImageParallaxTextureSource
        path: "/Textures/Parallaxes/oldspace.png"
      slowness: 0.0
-      scrolling: "-0.25, 0"
+      scrolling: "-0.125, 0"
      scale: "1, 1"
--- a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/bounty.png
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/bounty.png
--- a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/captains_paper.png
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/captains_paper.png
--- a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/invoice.png
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/invoice.png
--- a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original sprites by Vermidia and modified by SpaceRox1244; manual offset applied by Centronias",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "paper"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        }
+    ]
+}
--- a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/paper.png
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/paper.png
--- a/Resources/Textures/Parallaxes/oldspace.png
+++ b/Resources/Textures/Parallaxes/oldspace.png
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -725,3 +725,6 @@ PrefilledSyringe: Syringe
 # 2025-10-6
 BibleTanakh: null
 BibleSatanic: null
+
+# 2025-10-8
+ClothingBeltAssault: ClothingBeltMilitaryWebbing