Merge branch 'main' into pr/5894

.github/workflows/build-test-debug.yml

@@ -32,6 +32,7 @@ jobs:
       run: |
         cd RobustToolbox/
         git submodule update --init --recursive
+        rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0

.github/workflows/publish.yml

@@ -29,6 +29,7 @@ jobs:
       run: |
         cd RobustToolbox
         git fetch --depth=1
+        rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -23,6 +23,7 @@ jobs:
         run: |
           cd RobustToolbox/
           git submodule update --init --recursive
+          rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:

Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs

@@ -1,5 +1,6 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
+using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
@@ -7,6 +8,9 @@ namespace Content.Client.Medical.CrewMonitoring;
 
 public sealed partial class CrewMonitoringNavMapControl : NavMapControl
 {
+    [Dependency] private IPlayerManager _playerManager = default!; // DeltaV
+    private readonly SharedTransformSystem _xform; // DeltaV
+
     public NetEntity? Focus;
     public Dictionary<NetEntity, string> LocalizedNames = new();
 
@@ -15,6 +19,9 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
 
     public CrewMonitoringNavMapControl() : base()
     {
+        IoCManager.InjectDependencies(this); // DeltaV - Gotta inject!
+        _xform = EntManager.System<SharedTransformSystem>(); // DeltaV - Gotta inject!
+
         WallColor = new Color(192, 122, 196);
         TileColor = new(71, 42, 72);
         BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
@@ -77,4 +84,27 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
         _trackedEntityLabel.Text = string.Empty;
         _trackedEntityPanel.Visible = false;
     }
+
+    /// <summary>
+    /// DeltaV - Do some things before the base NavMap Draw and also force the redraw of the map
+    /// after if the MapUid was null when the CrewMonitor UI was opened.
+    /// </summary>
+    /// <param name="handle"></param>
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        // MapUid will not have a value if the crew monitor UI was activated off-grid.
+        var forceMapUpdate = false;
+        if (!MapUid.HasValue && _playerManager.LocalEntity is { } player)
+        {
+            MapUid = _xform.GetGrid(player);
+            forceMapUpdate = true;
+        }
+
+        base.Draw(handle);
+
+        // We need to call this after Draw() because UpdateNavMap has functions that uses variables
+        // set in Draw()
+        if (forceMapUpdate)
+            UpdateNavMap();
+    }
 }

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs

@@ -69,7 +69,16 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
         base.FrameUpdate(args);
 
         // Begin DeltaV - handle navmap visibility based on current position
-        if (_station.GetOwningStation(ShuttleMap.Owner) is not null)
+        var ent = ShuttleMap.Owner;
+
+        // If an entity is being tracked, use them as the focus, since they may be off-station
+        // and we want to use the nav map if they are.
+        if (_trackedEntity is { } trackedEntity)
+            ent = _entManager.GetEntity(trackedEntity);
+
+        // We need to make sure the entity is valid because for some reason, it *could* be an 
+        // invalid entity and GetOwningStation will throw an exception.
+        if (ent.HasValue && ent.Value.IsValid() && _station.GetOwningStation(ent) is not null)
         {
             NavMap.Visible = true;
             ShuttleMap.Visible = false;
@@ -343,6 +352,14 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                     if (_trackedEntity == sensor.SuitSensorUid)
                     {
                         _trackedEntity = null;
+                        // BEGIN DeltaV - center on crew monitor user if deselecting
+                        // This fixes some weird bug where if you deselect a tracked entity, it will
+                        // just not draw the map at all in some cases.
+                        if (ShuttleMap.Owner is { } handheld &&
+                            _transformSystem.TryGetMapOrGridCoordinates(handheld, out var userCoords) &&
+                            userCoords is { } coords)
+                            NavMap.CenterToCoordinates(coords);
+                        // END DeltaV
                     }
 
                     else

Resources/Audio/_DV/Machines/attributions.yml

@@ -6,3 +6,8 @@
   license: "CC0-1.0"
   copyright: "by Darklyac"
   source: "https://github.com/DeltaV-Station/Delta-v/pull/5621"
+
+- files: ["robotwilhelm.ogg"]
+  license: "CC0-1.0"
+  copyright: 'Remixed by BasedUser from beep1.wav. (see https://github.com/Simple-Station/Einstein-Engines/pull/811#discussion_r1865418764). beep1.wav by thisusernameis of Freesound.org. Mixed from stereo to mono.'
+  source: "https://freesound.org/people/thisusernameis/sounds/426891/"

Resources/Changelog/DeltaVChangelog.yml

@@ -1,28 +1,4 @@
 Entries:
-- author: verybigman311
-  changes:
-  - message: Metal Pipes now make a cooler sound when you throw them at the floor.
-    type: Tweak
-  id: 1975
-  time: '2025-12-20T00:29:28.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5003
-- author: SirSmith148
-  changes:
-  - message: Nanotrasen has found scientists inflating their research evaluations.
-      These scientists have been reprimanded by the company and re-educated on the
-      proper way to fill out the research logs
-    type: Fix
-  id: 1976
-  time: '2025-12-20T05:13:27.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4995
-- author: IAmNotGray
-  changes:
-  - message: Epistemics now has their own EVA suit. Try not to loose your arms while
-      wearing it.
-    type: Add
-  id: 1977
-  time: '2025-12-21T00:35:52.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4908
 - author: Velcrobot
   changes:
   - message: 'Division/Chibi/Shoukou/Edge: Adds the Yule Tide'
@@ -4424,4 +4400,38 @@
   id: 2475
   time: '2026-06-29T09:45:57.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6122
+- author: MantasDab360
+  changes:
+  - message: The borgs have a wilhelm scream. Again.
+    type: Add
+  id: 2476
+  time: '2026-06-29T13:27:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6126
+- author: portfiend, Stxcking
+  changes:
+  - message: Thirteen colors of lounge chairs can be constructed out of steel and
+      cloth.
+    type: Add
+  - message: Two new pool tiles can be produced at the cutter machine.
+    type: Add
+  - message: Logistics can now order a crate of bulk (6) swim rings, in 11 possible
+      colors!
+    type: Add
+  - message: New pool water tiles for mappers! Watch out, the pool does contain a
+      bit of chlorine!
+    type: Add
+  id: 2477
+  time: '2026-06-29T13:39:23.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6113
+- author: ShepardToTheStars
+  changes:
+  - message: The crew monitor's UI should properly draw the map when changing grids,
+      deselecting tracked people, and switch the long-range view when tracking someone
+      off station.
+    type: Fix
+  - message: Fixed the admin and borg crew monitors.
+    type: Fix
+  id: 2478
+  time: '2026-06-29T14:06:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6139
 Order: 1

Resources/Locale/en-US/_DV/paper/paper-misc.ftl

@@ -68,3 +68,33 @@ paper-viral-care-package-manual = [color=#134975]░░██░░ [head=2]Vira
       This instructions pamphlet will be used as "Exhibit A" if you sue [color=darkblue][bolditalic]Nanotrasen™[/bolditalic][/color].
 
 paper-hitman-business-card = [color=#FFFFFF]Its just business[/color]
+
+paper-misc-hydroco-notice = [head=1]HydroCo - Hydrate Tastefully[/head][bold]
+      Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products blabla
+
+      Always mix with water according to package instructions before consuming.
+
+      Thank you for choosing HydroCo!
+      Enjoy your drinks!
+
+paper-misc-hydroco-trial = [head=1]HydroCo - Hydrate Tastefully[/head][bold]
+
+      Dear Recipient,[/bold]
+      You have been selected among thousands of potential
+      beneficiaries to receive a full-size trial tin of HydroCo
+      powdered juice!
+
+      We think you will enjoy the flavor and hope to see you
+      as a returning customer.[bold]
+
+      Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products
+      are NOT meant for direct consumption. Attempting to eat
+      the powder directly is a choking hazard and may result in
+      severe discomfort.
+
+      Always mix with water according to package instructions
+      before consuming.
+
+      Enjoy your drinks!

Resources/Locale/en-US/_DV/tiles/tiles.ftl

@@ -5,3 +5,6 @@ tiles-mowed-astro-snow = mowed astro-snow
 
 tiles-astro-snow-dug = astro dug snow
 tiles-mowed-astro-snow-dug = mowed astro dug snow
+
+tiles-pool = pool
+tiles-pool-dark = dark pool

Resources/Migrations/deltaMigrations.yml

@@ -239,5 +239,11 @@ HatSpawner: RandomHatSpawner
 # 2026-05-16
 ClothingUniformJumpsuitSecBlue : ClothingUniformJumpsuitSecWhite
 
+# 2026-06-22
+PaperStickyNoteStack : PaperStickyNoteStackFilled
+PaperStickyNoteStackPink : PaperStickyNoteStackFilledPink
+PaperStickyNoteStackGreen : PaperStickyNoteStackFilledGreen
+PaperStickyNoteStackBlue : PaperStickyNoteStackFilledBlue
+
 # 2026-06-09
 BoxPerformer: BoxPerformerDV

Resources/Prototypes/Catalog/Fills/Boxes/heads.yml

@@ -83,7 +83,7 @@
 - type: entity
   parent: ToteBase
   id: BoxQMCircuitboards
-  name: cargo circuit tote
+  name: logistics circuit tote # DeltaV - Logistics Department replacing Cargo
   components:
   - type: EntityTableContainerFill
     containers:
@@ -120,7 +120,7 @@
 - type: entity
   parent: ToteBase
   id: BoxRDCircuitboards
-  name: science circuit tote
+  name: epistemics circuit tote # DeltaV - Epistemics Department replacing Science
   components:
   - type: EntityTableContainerFill
     containers:

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -302,7 +302,7 @@
 - type: entity
   parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatRD
-  name: research director lab coat
+  name: mystagogue lab coat # DeltaV - Epistemics Department replacing Science
   description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit.
   components:
   - type: Sprite
@@ -318,7 +318,7 @@
 - type: entity
   parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRD]
   id: ClothingOuterCoatRDOpened
-  name: research director lab coat
+  name: mystagogue lab coat # DeltaV - Science > Epistemics
 
 - type: entity
   parent: ClothingOuterStorageBase

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -147,7 +147,7 @@
 - type: entity
   parent: ClothingShoesBaseWinterBoots
   id: ClothingShoesBootsWinterSci
-  name: science winter boots
+  name: epistemics winter boots # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/winterbootssci.rsi

Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml

@@ -2,7 +2,7 @@
   parent: MarkerBase
   id: SpawnMobAlexander
   name: Alexander Spawner
-  suffix: Chef Pet
+  suffix: Botany Pet # DeltaV - Change from chef pet to botany pet
   components:
   - type: Sprite
     layers:
@@ -16,7 +16,7 @@
   parent: MarkerBase
   id: SpawnMobBandito
   name: Bandito Spawner
-  suffix: RD Pet
+  suffix: Perma Pet # DeltaV - Change from RD pet to perma pet
   components:
   - type: Sprite
     layers:
@@ -30,7 +30,7 @@
   parent: MarkerBase
   id: SpawnMobCat
   name: Random Cat Spawner
-  suffix: CMO Pet
+  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
   components:
   - type: Sprite
     layers:
@@ -47,7 +47,7 @@
   parent: MarkerBase
   id: SpawnMobCatBingus
   name: Bingus Spawner
-  suffix: CMO Pet
+  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
   components:
   - type: Sprite
     layers:
@@ -61,7 +61,7 @@
   parent: MarkerBase
   id: SpawnMobCatException
   name: Exception Spawner
-  suffix: CMO Pet
+  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
   components:
   - type: Sprite
     layers:
@@ -75,7 +75,7 @@
   parent: MarkerBase
   id: SpawnMobCatFloppa
   name: Floppa Spawner
-  suffix: CMO Pet
+  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
   components:
   - type: Sprite
     layers:
@@ -89,7 +89,7 @@
   parent: MarkerBase
   id: SpawnMobCatRuntime
   name: Runtime Spawner
-  suffix: CMO Pet
+  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
   components:
   - type: Sprite
     layers:
@@ -162,7 +162,7 @@
   parent: MarkerBase
   id: SpawnMobMcGriff
   name:  McGriff Spawner
-  suffix: Warden Pet
+  suffix: Warden or Detective Pet # DeltaV - Change from Warden pet to Warden or Detective pet
   components:
   - type: Sprite
     layers:
@@ -252,7 +252,7 @@
   parent: MarkerBase
   id: SpawnMobRaccoonMorticia
   name: Raccoon Morticia Spawner
-  suffix: QM Pet
+  suffix: QM or Disposals Pet # DeltaV - Change from QM pet to QM or Disposals pet
   components:
   - type: Sprite
     layers:
@@ -266,7 +266,7 @@
   parent: MarkerBase
   id: SpawnMobShiva
   name: Shiva Spawner
-  suffix: Security Pet
+  suffix: HoS Pet # DeltaV - Change from Security pet to HoS pet
   components:
   - type: Sprite
     layers:
@@ -295,7 +295,7 @@
   parent: MarkerBase
   id: SpawnMobSmile
   name: Smile Spawner
-  suffix: Science Pet
+  suffix: Epistemics Pet # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     layers:

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

@@ -166,6 +166,7 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSilicon
+    wilhelm: "/Audio/_DV/Machines/robotwilhelm.ogg" # DeltaV - "There seems to be someone among us".
     wilhelmProbability: 0.001 # DeltaV
   - type: DamagedSiliconAccent
   - type: UnblockableSpeech

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

@@ -114,8 +114,8 @@
     receiveFrequencyId: NTNet # DeltaV - NTNet
     transmitFrequencyId: ShuttleTimer
   - type: WirelessNetworkConnection
-    range: 500
-  - type: StationLimitedNetwork
+    range: 10000 # DeltaV
+  #- type: StationLimitedNetwork # DeltaV - Off-station coordinates 
   - type: Thieving
     stripTimeReduction: 9999
     stealthy: true

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -127,7 +127,7 @@
 - type: entity
   parent: BaseComputerCircuitboard
   id: CargoRequestScienceComputerCircuitboard
-  name: science request computer board
+  name: epistemics request computer board # DeltaV - Epistemics Department replacing Science
   description: A computer printed circuit board for a science request computer.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml

@@ -116,7 +116,7 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsQuartermaster
-  suffix: Quartermaster, Locked
+  suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
@@ -132,7 +132,7 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsCargo
-  suffix: Cargo, Locked
+  suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   components:
   - type: AccessReader
     access: [["Cargo"]]
@@ -174,7 +174,7 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsResearchDirector
-  suffix: ResearchDirector, Locked
+  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
@@ -182,7 +182,7 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsMedicalResearch
-  suffix: Medical/Science, Locked
+  suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
@@ -190,7 +190,7 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsResearch
-  suffix: Research, Locked
+  suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["Research"]]

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

@@ -144,7 +144,7 @@
 - type: entity
   parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteResearch
-  name: research door remote
+  name: epistemics door remote # DeltaV - Science > Epistemics
   components:
   - type: Sprite
     layers:

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

@@ -48,7 +48,7 @@
 - type: entity
   parent: PaperAcquisitionSlip
   id: PaperAcquisitionSlipScience
-  suffix: Science
+  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     layers:

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

@@ -404,7 +404,7 @@
 - type: entity
   parent: IDCardStandard
   id: ResearchIDCard
-  name: research ID card
+  name: epistemics ID card # DeltaV - Science > Epistemics
   components:
   - type: Sprite
     layers:
@@ -830,7 +830,7 @@
 - type: entity
   parent: IDCardStandard
   id: CargoIDCard
-  name: cargo ID card
+  name: logistics ID card # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Structures/Decoration/showcase.yml

@@ -55,8 +55,8 @@
 - type: entity
   id: ShowcaseRobotAntique
   parent: BaseShowcaseRobot
-  name: cargo robot showcase
-  description: A non-functional replica of an old cargo robot.
+  name: logistics robot showcase # DeltaV - Logistics Department replacing Cargo
+  description: A non-functional replica of an old logistics robot. # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
     sprite: Structures/Decoration/showcase.rsi

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -360,7 +360,7 @@
 - type: entity
   parent: AirlockCommand
   id: AirlockResearchDirectorLocked
-  suffix: ResearchDirector, Locked
+  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: ContainerFill
     containers:
@@ -776,7 +776,7 @@
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockResearchDirectorGlassLocked
-  suffix: ResearchDirector, Locked
+  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: ContainerFill
     containers:

Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -21,7 +21,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargo
-  suffix: Cargo
+  suffix: Logistics # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Standard/cargo.rsi # DeltaV - Resprite Doors
@@ -30,7 +30,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargoGlass
-  suffix: Cargo, Glass
+  suffix: Logistics, Glass # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Glass/cargo.rsi # DeltaV - Resprite Doors
@@ -218,7 +218,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScience
-  suffix: Science
+  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Standard/science.rsi # DeltaV - Resprite Doors
@@ -227,7 +227,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScienceGlass
-  suffix: Science, Glass
+  suffix: Epistemics, Glass # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Glass/science.rsi # DeltaV - Resprite Doors

Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml

@@ -94,7 +94,7 @@
 - type: entity
   id: BlastDoorScience
   parent: BlastDoor
-  suffix: Autolink, Science
+  suffix: Autolink, Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["Command"], ["Research"]]
@@ -104,7 +104,7 @@
 - type: entity
   id: BlastDoorScienceOpen
   parent: BlastDoorOpen
-  suffix: Open, Autolink, Science
+  suffix: Open, Autolink, Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["Command"], ["Research"]]

Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml

@@ -415,7 +415,7 @@
 - type: entity
   parent: WindoorSecureCommandLocked
   id: WindoorSecureResearchDirectorLocked
-  suffix: ResearchDirector, Locked
+  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
   components:
   - type: ContainerFill
     containers:
@@ -466,7 +466,7 @@
 - type: entity
   parent: WindoorSecurePlasma
   id: PlasmaWindoorSecureScienceLocked
-  suffix: Science, Locked, Plasma
+  suffix: Epistemics, Locked, Plasma # DeltaV - Epistemics Department replacing Science
   components:
   - type: ContainerFill
     containers:

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -1015,7 +1015,7 @@
 - type: entity
   id: ComputerCargoOrdersScience
   parent: ComputerCargoOrders
-  name: science request computer
+  name: epistemics request computer # DeltaV - Epistemics Department replacing Science
   description: Used by the science department to order supplies.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Structures/Machines/holopad.yml

@@ -129,7 +129,7 @@
     - Map
     - Unlimited
     ignoreTelephonesOnSameGrid: true
-    
+
 - type: entity
   name: quantum entangling holopad
   description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances."
@@ -419,7 +419,7 @@
 - type: entity
   parent: HolopadEpistemics # DeltaV
   id: HolopadScienceRnd
-  suffix: R&D
+  suffix: Epistemics # DeltaV - Science > Epistemics
   components:
   - type: Label
     currentLabel: holopad-epistemics-rnd # DeltaV - Science > Epistemics

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -151,6 +151,7 @@
     # Begin DeltaV Additions
     - RingsStatic
     - ReportingStatic
+    - CutterMachineStaticDen
     # End DeltaV Additions
     - ToolsStatic
     - PartsStatic

Resources/Prototypes/Entities/Structures/Machines/telecomms.yml

@@ -219,7 +219,7 @@
 - type: entity
   parent: TelecomServer
   id: TelecomServerFilledCargo
-  suffix: Cargo
+  suffix: Logistics # DeltaV - Logistics Department replacing Cargo
   components:
   - type: ContainerFill
     containers:
@@ -249,7 +249,7 @@
 - type: entity
   parent: TelecomServer
   id: TelecomServerFilledScience
-  suffix: Science
+  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: ContainerFill
     containers:

Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

@@ -572,7 +572,7 @@
 - type: entity
   id: CrateLockBoxScience
   parent: CrateBaseLockBox
-  name: science lock box
+  name: epistemics lock box # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml

@@ -231,7 +231,7 @@
 - type: entity
   parent: LockableButton
   id: LockableButtonResearchDirector
-  suffix: ResearchDirector
+  suffix: Mystagogue # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
@@ -327,7 +327,7 @@
 - type: entity
   parent: LockableButton
   id: LockableButtonCargo
-  suffix: Cargo
+  suffix: Logistics # DeltaV - Logistics Department replacing Cargo
   components:
   - type: AccessReader
     access: [["Cargo"]]
@@ -335,7 +335,7 @@
 - type: entity
   parent: LockableButton
   id: LockableButtonResearch
-  suffix: Research
+  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: AccessReader
     access: [["Research"]]

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml

@@ -157,6 +157,7 @@
   id: AirAlarmXeno
   parent: AirAlarm
   name: air alarm
+  suffix: Xeno # DeltaV - Add suffix for clarity
   description: An alien air alarm. Hopefully they didn't breathe poison.
   components:
   - type: Sprite
@@ -174,6 +175,7 @@
   id: AirAlarmAssemblyXeno
   parent: AirAlarmAssembly
   name: air alarm assembly
+  suffix: Xeno # DeltaV - Add suffix for clarity
   description: An alien air alarm. Why are the wires pulsating?...
   components:
   - type: Sprite

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml

@@ -163,7 +163,7 @@
   parent: SurveillanceCameraBase
   id: SurveillanceCameraSupply
   name: camera
-  suffix: Supply
+  suffix: Logistics # DeltaV - Epistemics Department replacing Science
   components:
   - type: DeviceNetwork
     deviceNetId: Wired

Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml

@@ -0,0 +1,10 @@
+
+- type: cargoProduct
+  id: FunSwimRings
+  icon:
+    sprite: _DEN/Structures/Furniture/pool_ring.rsi
+    state: rainbow
+  product: CrateFunSwimRings
+  cost: 1200
+  category: cargoproduct-category-name-fun
+  group: market

Resources/Prototypes/_DEN/Catalog/Fills/Crates/fun.yml

@@ -0,0 +1,33 @@
+
+- type: entity
+  parent: CratePlastic
+  id: CrateFunSwimRings
+  name: swim ring crate
+  description: A crate containing eight swim rings, for your beach party occasions!
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: SwimRingRainbow
+        - id: SwimRingTrans
+        - !type:NestedSelector
+          tableId: RandomSwimRingTable
+          rolls: !type:ConstantNumberSelector
+            value: 6
+
+- type: entityTable
+  id: RandomSwimRingTable
+  table: !type:GroupSelector
+    children:
+    - id: SwimRingBlack
+    - id: SwimRingBlue
+    - id: SwimRingCyan
+    - id: SwimRingGreen
+    - id: SwimRingMagenta
+    - id: SwimRingPink
+    - id: SwimRingPurple
+    - id: SwimRingRainbow
+    - id: SwimRingRed
+    - id: SwimRingTrans
+    - id: SwimRingYellow

Resources/Prototypes/_DEN/Entities/Objects/Misc/tiles.yml

@@ -0,0 +1,30 @@
+- type: entity
+  parent: FloorTileItemSteel
+  id: FloorTileItemPool
+  name: pool tile
+  components:
+  - type: Sprite
+    sprite: _DEN/Objects/Tiles/pool.rsi
+    state: pool
+  - type: Item
+    sprite: _DEN/Objects/Tiles/pool.rsi
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorTilePool
+  - type: Stack
+    stackType: FloorTilePool
+
+- type: entity
+  parent: FloorTileItemPool
+  id: FloorTileItemPoolDark
+  name: dark pool tile
+  components:
+  - type: Sprite
+    state: pool-dark
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorTilePoolDark
+  - type: Stack
+    stackType: FloorTilePoolDark

Resources/Prototypes/_DEN/Entities/Structures/furniture/chairs.yml

@@ -0,0 +1,143 @@
+# beach lounge chairs
+
+- type: entity
+  abstract: true
+  parent: ChairBase
+  id: BaseChairBeachLounge
+  name: lounge chair
+  description: For sitting back, relaxing, and soaking in the solar lamp radiation.
+  components:
+  - type: Sprite
+    sprite: _DEN/Structures/Furniture/lounge_chair.rsi
+  - type: Construction
+    graph: ChairBeachLounge
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeBeige
+  suffix: beige
+  components:
+  - type: Sprite
+    state: beige
+  - type: Construction
+    node: beige
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeBlack
+  suffix: black
+  components:
+  - type: Sprite
+    state: black
+  - type: Construction
+    node: black
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeBlue
+  suffix: blue
+  components:
+  - type: Sprite
+    state: blue
+  - type: Construction
+    node: blue
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeBrown
+  suffix: brown
+  components:
+  - type: Sprite
+    state: brown
+  - type: Construction
+    node: brown
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeGray
+  suffix: gray
+  components:
+  - type: Sprite
+    state: gray
+  - type: Construction
+    node: gray
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeGreen
+  suffix: green
+  components:
+  - type: Sprite
+    state: green
+  - type: Construction
+    node: green
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeOrange
+  suffix: orange
+  components:
+  - type: Sprite
+    state: orange
+  - type: Construction
+    node: orange
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungePink
+  suffix: pink
+  components:
+  - type: Sprite
+    state: pink
+  - type: Construction
+    node: pink
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungePurple
+  suffix: purple
+  components:
+  - type: Sprite
+    state: purple
+  - type: Construction
+    node: purple
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeRed
+  suffix: red
+  components:
+  - type: Sprite
+    state: red
+  - type: Construction
+    node: red
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeTeal
+  suffix: teal
+  components:
+  - type: Sprite
+    state: teal
+  - type: Construction
+    node: teal
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeWhite
+  suffix: white
+  components:
+  - type: Sprite
+    state: white
+  - type: Construction
+    node: white
+
+- type: entity
+  parent: BaseChairBeachLounge
+  id: ChairBeachLoungeYellow
+  suffix: yellow
+  components:
+  - type: Sprite
+    state: yellow
+  - type: Construction
+    node: yellow

Resources/Prototypes/_DEN/Entities/Structures/furniture/pool_ring.yml

@@ -0,0 +1,148 @@
+- type: entity
+  abstract: true
+  parent: [SeatBase, BaseItem]
+  id: BaseSwimRing
+  name: swim ring
+  description: Also known as a floatie, or inner tube, or water donut. An inflatable rubber toy for resting on top of the water.
+  components:
+  - type: Sprite
+    sprite: _DEN/Structures/Furniture/pool_ring.rsi
+  - type: Item
+    size: Normal # should probably be "large" instead, but eh
+  - type: Clothing # DeltaV
+    slots:
+    - belt
+  - type: Strap
+    buckleOffset: "0,0.1"
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingBlack
+  name: black swim ring
+  components:
+  - type: Sprite
+    state: black
+  - type: Item  # DeltaV
+    heldPrefix: black
+  - type: Clothing # DeltaV
+    equippedPrefix: black
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingBlue
+  name: blue swim ring
+  components:
+  - type: Sprite
+    state: blue
+  - type: Item  # DeltaV
+    heldPrefix: blue
+  - type: Clothing # DeltaV
+    equippedPrefix: blue
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingCyan
+  name: cyan swim ring
+  components:
+  - type: Sprite
+    state: cyan
+  - type: Item  # DeltaV
+    heldPrefix: cyan
+  - type: Clothing # DeltaV
+    equippedPrefix: cyan
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingGreen
+  name: green swim ring
+  components:
+  - type: Sprite
+    state: green
+  - type: Item  # DeltaV
+    heldPrefix: green
+  - type: Clothing # DeltaV
+    equippedPrefix: green
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingMagenta
+  name: magenta swim ring
+  components:
+  - type: Sprite
+    state: magenta
+  - type: Item  # DeltaV
+    heldPrefix: magenta
+  - type: Clothing # DeltaV
+    equippedPrefix: magenta
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingPink
+  name: pink swim ring
+  components:
+  - type: Sprite
+    state: pink
+  - type: Item  # DeltaV
+    heldPrefix: pink
+  - type: Clothing # DeltaV
+    equippedPrefix: pink
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingPurple
+  name: purple swim ring
+  components:
+  - type: Sprite
+    state: purple
+  - type: Item  # DeltaV
+    heldPrefix: purple
+  - type: Clothing # DeltaV
+    equippedPrefix: purple
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingRainbow
+  name: rainbow swim ring
+  components:
+  - type: Sprite
+    state: rainbow
+  - type: Item  # DeltaV
+    heldPrefix: rainbow
+  - type: Clothing # DeltaV
+    equippedPrefix: rainbow
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingRed
+  name: red swim ring
+  components:
+  - type: Sprite
+    state: red
+  - type: Item  # DeltaV
+    heldPrefix: red
+  - type: Clothing # DeltaV
+    equippedPrefix: red
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingTrans
+  name: pastel swim ring
+  components:
+  - type: Sprite
+    state: trans
+  - type: Item  # DeltaV
+    heldPrefix: trans
+  - type: Clothing # DeltaV
+    equippedPrefix: trans
+
+- type: entity
+  parent: BaseSwimRing
+  id: SwimRingYellow
+  name: yellow swim ring
+  components:
+  - type: Sprite
+    state: yellow
+  - type: Item  # DeltaV
+    heldPrefix: yellow
+  - type: Clothing # DeltaV
+    equippedPrefix: yellow

Resources/Prototypes/_DEN/Entities/Tiles/water.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: FloorWaterEntity
+  id: FloorWaterEntityPool
+  name: pool water
+  description: You do NOT want to drink this.
+  components:
+  - type: Sprite
+    sprite: _DEN/Tiles/Planet/water.rsi
+    layers:
+    - state: pool_water
+  - type: FishingSpot
+    fishList: !type:NestedSelector
+      tableId: ToiletFishingLootTable # TODO: Make a unique loot pool for pool water
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 10000
+        reagents:
+        - ReagentId: Water
+          Quantity: 9900
+        - ReagentId: Chlorine
+          Quantity: 100 # about 1/100 chlorine
+  # chlorinated pool water is actually supposed to be 1-5 ppm of chlorine but solution
+  # transfers and metabolism in ss14 round to the nearest 0.01 and the idea of poisoning
+  # yourself by drinking pool water is fucking hysterical.
+  # for the record, a full human stomach of this stuff is 2 toxin damage. its not much
+  - type: SolutionRegeneration
+    solution: pool
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 99
+      - ReagentId: Chlorine
+        Quantity: 1
+  - type: Edible # DeltaV - Drink Refactor into Edible
+    edible: Drink
+    solution: pool
+    transferAmount: 1
+    destroyOnEmpty: false

Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/chairs.yml

@@ -0,0 +1,295 @@
+- type: constructionGraph
+  id: ChairBeachLounge
+  start: start
+  graph:
+  - node: start
+    actions:
+    - !type:DestroyEntity {}
+    edges:
+    - to: beige
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: black
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: blue
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: brown
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: gray
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: green
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: orange
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: pink
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: purple
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: red
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: teal
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: white
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+    - to: yellow
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 1
+      - material: Cloth
+        amount: 2
+        doAfter: 1
+
+  - node: beige
+    entity: ChairBeachLoungeBeige
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: black
+    entity: ChairBeachLoungeBlack
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: blue
+    entity: ChairBeachLoungeBlue
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: brown
+    entity: ChairBeachLoungeBrown
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: gray
+    entity: ChairBeachLoungeGray
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: green
+    entity: ChairBeachLoungeGreen
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: orange
+    entity: ChairBeachLoungeOrange
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: pink
+    entity: ChairBeachLoungePink
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: purple
+    entity: ChairBeachLoungePurple
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: red
+    entity: ChairBeachLoungeRed
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: teal
+    entity: ChairBeachLoungeTeal
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: white
+    entity: ChairBeachLoungeWhite
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1
+  - node: yellow
+    entity: ChairBeachLoungeYellow
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: MaterialCloth1
+        amount: 2
+      steps:
+      - tool: Screwing
+        doAfter: 1

Resources/Prototypes/_DEN/Recipes/Construction/furniture.yml

@@ -0,0 +1,158 @@
+
+# lounge chairs
+
+- type: construction
+  id: ChairBeachLoungeBeige
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: beige
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeBlack
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: black
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeBlue
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: blue
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeBrown
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: brown
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeGray
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: gray
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeGreen
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: green
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeOrange
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: orange
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungePink
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: pink
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungePurple
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: purple
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeRed
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: red
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeTeal
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: teal
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeWhite
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: white
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: ChairBeachLoungeYellow
+  graph: ChairBeachLounge
+  startNode: start
+  targetNode: yellow
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked

Resources/Prototypes/_DEN/Recipes/Lathes/cutter_machine.yml

@@ -0,0 +1,5 @@
+- type: latheRecipePack
+  id: CutterMachineStaticDen
+  recipes:
+  - FloorTileItemPool
+  - FloorTileItemPoolDark

Resources/Prototypes/_DEN/Recipes/Lathes/tiles.yml

@@ -0,0 +1,9 @@
+- type: latheRecipe
+  parent: BaseTileRecipe
+  id: FloorTileItemPool
+  result: FloorTileItemPool
+
+- type: latheRecipe
+  parent: BaseTileRecipe
+  id: FloorTileItemPoolDark
+  result: FloorTileItemPoolDark

Resources/Prototypes/_DEN/Stacks/floor_tile.yml

@@ -0,0 +1,13 @@
+- type: stack
+  id: FloorTilePool
+  name: tiles-pool # DeltaV
+  spawn: FloorTileItemPool
+  maxCount: 30
+#  itemSize: 5 # DeltaV
+
+- type: stack
+  id: FloorTilePoolDark
+  name: tiles-pool-dark # DeltaV
+  spawn: FloorTileItemPoolDark
+  maxCount: 30
+#  itemSize: 5 # DeltaV

Resources/Prototypes/_DEN/Tiles/floor.yml

@@ -0,0 +1,35 @@
+- type: tile
+  id: FloorTilePool
+  name: pool tile
+  sprite: /Textures/_DEN/Tiles/pool.rsi/pool.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemPool
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorTilePoolDark
+  name: dark pool tile
+  sprite: /Textures/_DEN/Tiles/pool.rsi/pool-dark.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemPoolDark
+  heatCapacity: 10000

Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/chairs.yml

@@ -23,3 +23,31 @@
       - id: ComfyChairSkyBlue
       - id: ComfyChairCyan
       - id: ComfyChairPurple
+
+- type: entity
+  parent: MarkerBase
+  id: RandomBeachLoungeSpawner
+  name: random lounge chair spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: _DEN/Structures/Furniture/lounge_chair.rsi
+      state: white
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:GroupSelector
+      children:
+      - id: ChairBeachLoungeBeige
+      - id: ChairBeachLoungeBlack
+      - id: ChairBeachLoungeBlue
+      - id: ChairBeachLoungeBrown
+      - id: ChairBeachLoungeGray
+      - id: ChairBeachLoungeGreen
+      - id: ChairBeachLoungeOrange
+      - id: ChairBeachLoungePink
+      - id: ChairBeachLoungePurple
+      - id: ChairBeachLoungeRed
+      - id: ChairBeachLoungeTeal
+      - id: ChairBeachLoungeWhite
+      - id: ChairBeachLoungeYellow

Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/clothing.yml

@@ -179,6 +179,20 @@
       tableId: RandomSchoolgirlTable
       prob: 0.85
 
+- type: entity
+  parent: MarkerBase
+  id: SwimRingSpawner
+  name: random swim ring spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: _DEN/Structures/Furniture/pool_ring.rsi
+      state: rainbow
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomSwimRingTable
+
 #Tables
 - type: entityTable
   id: RandomClothingTable

Resources/Prototypes/_DV/Entities/Markers/Spawners/mobs.yml

@@ -2,6 +2,7 @@
   name: Arctic Fox Siobhan Spawner
   id: SpawnMobArcticFoxSiobhan
   parent: MarkerBase
+  suffix: Mystagogue Pet
   components:
   - type: Sprite
     layers:
@@ -12,9 +13,10 @@
       - MobArcticFoxSiobhan
 
 - type: entity
-  name: Sec Dog Laika Spawner
+  name: Laika Spawner
   id: SpawnMobSecDogLaika
   parent: MarkerBase
+  suffix: HoS Pet
   components:
   - type: Sprite
     layers:
@@ -41,6 +43,7 @@
   name: Sec Animal Spawner
   id: SpawnMobSecLaikaOrShiva
   parent: MarkerBase
+  suffix: HoS Pet, Laika or Shiva
   components:
   - type: Sprite
     layers:
@@ -54,7 +57,8 @@
 - type: entity
   parent: MarkerBase
   id: SpawnMobJusticePet
-  name: Justice Pet Spawner
+  name: Carpy Spawner
+  suffix: Justice Pet
   components:
   - type: Sprite
     layers:
@@ -69,6 +73,7 @@
   name: Silvia Spawner
   id: SpawnMobCMOPetSilvia
   parent: MarkerBase
+  suffix: Medical Pet
   components:
   - type: Sprite
     layers:
@@ -83,6 +88,7 @@
   parent: MarkerBase
   id: SpawnMobEngiPossumPoppy
   name: Poppy Spawner
+  suffix: Engineering Pet
   components:
   - type: Sprite
     layers:

Resources/Prototypes/_DV/Entities/Markers/Spawners/pets.yml

@@ -2,7 +2,7 @@
   parent: MarkerBase
   id: SpawnMobSmileCore
   name: Smile Core Spawner
-  suffix: Science Pet, Delta V
+  suffix: Epistemics Pet, Delta V
   components:
   - type: Sprite
     layers:

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

@@ -425,23 +425,9 @@
   - type: Paper
     stampState: paper_stamp-generic
     stampedBy:
-    - stampedColor: '#8F99D6FF'
+    - stampedColor: "#8F99D6FF"
       stampedName: HydroCo
-    content: |2
-
-      [head=1]HydroCo - Hydrate Tastefully[/head]
-
-      [bold]Consumption Notice[/bold]
-      HydroCo reminds all customers that powdered products
-      are NOT meant for direct consumption. Attempting to eat
-      the powder directly is a choking hazard and may result
-      in severe discomfort.
-
-      Always mix with water according to package instructions
-      before consuming.
-
-      Thank you for choosing HydroCo!
-      Enjoy your drinks!
+    content: paper-hydroco-notice
 
 - type: entity
   parent: Paper
@@ -452,30 +438,9 @@
   - type: Paper
     stampState: paper_stamp-generic
     stampedBy:
-    - stampedColor: '#8F99D6FF'
+    - stampedColor: "#8F99D6FF"
       stampedName: HydroCo
-    content: |2
-
-      [head=1]HydroCo - Hydrate Tastefully[/head]
-
-      [bold]Dear Recipient,[/bold]
-      you have been selected among thousands of potential
-      beneficiaries to receive a full-size trial tin of HydroCo
-      powdered juice!
-
-      We think you will enjoy the flavor and hope to see you
-      as a returning customer.
-
-      [bold]Consumption Notice[/bold]
-      HydroCo reminds all customers that powdered products
-      are NOT meant for direct consumption. Attempting to eat
-      the powder directly is a choking hazard and may result in
-      severe discomfort.
-
-      Always mix with water according to package instructions
-      before consuming.
-
-      Enjoy your drinks!
+    content: paper-misc-hydroco-trial
 
 - type: entity
   parent: Paper

Resources/Prototypes/_DV/Entities/Objects/Misc/sticky_notes.yml

@@ -131,6 +131,7 @@
   id: PaperStickyNoteStack
   name: sticky note stack
   suffix: yellow
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _DV/Objects/Misc/stickies.rsi
@@ -179,6 +180,7 @@
   id: PaperStickyNoteStackPink
   name: sticky note stack
   suffix: pink
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: "#ff8cba"
@@ -192,6 +194,7 @@
   id: PaperStickyNoteStackGreen
   name: sticky note stack
   suffix: green
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: "#9fd4a3"
@@ -205,6 +208,7 @@
   id: PaperStickyNoteStackBlue
   name: sticky note stack
   suffix: blue
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: "#00c2e7"

Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

@@ -25,6 +25,5 @@
     deviceNetId: Wireless
     receiveFrequencyId: NTNet # DeltaV - NTNet
   - type: WirelessNetworkConnection
-    range: 500
-  - type: StationLimitedNetwork
+    range: 3600
   - type: Appearance

Resources/Prototypes/_DV/Entities/Objects/Tools/lighters.yml

@@ -2,6 +2,7 @@
   parent: FlippoLighter
   id: SyndicateFlippoDV
   name: Blood-red flippo
+  suffix: Gun, Regenerates Fuel
   description: "A 'Valid' choice in lighters. Contains no copper. This one seems to have a few extra features."
   components:
   - type: Sprite

Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml

@@ -412,7 +412,7 @@
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineResearchDirector
-  suffix: Research Director
+  suffix: Mystagogue
   components:
   - type: PageSender
     autoLinkJobs: [ResearchDirector]
@@ -503,6 +503,7 @@
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineHitman
+  suffix: Hitman
   components:
   - type: FaxMachine
     name: "Unknown?"

Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/reinforced_surveillance_camera.yml

@@ -109,7 +109,7 @@
 - type: entity
   parent: [ReinforcedSurveillanceCameraBase, SurveillanceCameraSupply]
   id: ReinforcedSurveillanceCameraSupply
-  suffix: Supply
+  suffix: Logistics
   components:
   - type: DeviceNetwork
     deviceNetId: Wired

Resources/Textures/_DEN/Objects/Tiles/pool.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Sprites by portfiend (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pool"
+    },
+    {
+      "name": "pool-dark"
+    }
+  ]
+}

Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/meta.json

@@ -0,0 +1,63 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Sprites by portfiend (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "beige",
+            "directions": 4
+        },
+        {
+            "name": "black",
+            "directions": 4
+        },
+        {
+            "name": "blue",
+            "directions": 4
+        },
+        {
+            "name": "brown",
+            "directions": 4
+        },
+        {
+            "name": "gray",
+            "directions": 4
+        },
+        {
+            "name": "green",
+            "directions": 4
+        },
+        {
+            "name": "orange",
+            "directions": 4
+        },
+        {
+            "name": "pink",
+            "directions": 4
+        },
+        {
+            "name": "purple",
+            "directions": 4
+        },
+        {
+            "name": "red",
+            "directions": 4
+        },
+        {
+            "name": "teal",
+            "directions": 4
+        },
+        {
+            "name": "white",
+            "directions": 4
+        },
+        {
+            "name": "yellow",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/meta.json

@@ -0,0 +1,176 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Sprites by portfiend (GitHub), equipped-BELT and Inhands Sprites by @Stxcking (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "black"
+        },
+        {
+            "name": "blue"
+        },
+        {
+            "name": "cyan"
+        },
+        {
+            "name": "green"
+        },
+        {
+            "name": "magenta"
+        },
+        {
+            "name": "pink"
+        },
+        {
+            "name": "purple"
+        },
+        {
+            "name": "rainbow"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "trans"
+        },
+        {
+            "name": "yellow"
+        },
+        {
+            "name": "black-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "black-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "black-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "blue-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cyan-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "cyan-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cyan-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "green-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "magenta-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "magenta-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "magenta-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pink-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "pink-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pink-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rainbow-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "rainbow-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "rainbow-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "red-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "red-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "red-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "trans-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "trans-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "trans-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "yellow-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "yellow-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "yellow-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "purple-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "purple-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "purple-inhand-right",
+            "directions": 4
+        }
+    ]
+}