Revert "I hate submodules. Why did it have to be submodules? (#6117 )"

This reverts commit d3b13a6c83.
2026-10-02 00:57:26 +00:00 · 2026-06-28 21:34:20 -04:00
204 changed files with 381 additions and 2492 deletions
@@ -32,7 +32,6 @@ 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
@@ -29,7 +29,6 @@ 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
@@ -23,7 +23,6 @@ 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:
@@ -1,6 +1,5 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
-using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;

@@ -8,9 +7,6 @@ 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();

@@ -19,9 +15,6 @@ 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));
@@ -84,27 +77,4 @@ 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();
-    }
 }
@@ -69,16 +69,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
        base.FrameUpdate(args);

        // Begin DeltaV - handle navmap visibility based on current position
-        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)
+        if (_station.GetOwningStation(ShuttleMap.Owner) is not null)
        {
            NavMap.Visible = true;
            ShuttleMap.Visible = false;
@@ -352,14 +343,6 @@ 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
@@ -415,7 +415,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem

    public bool CanOpen(EntityUid user, EntityUid target, bool silent = false, EntityStorageComponent? component = null)
    {
-        if (!Resolve(target, ref component, false)) // DeltaV - Prevent HTNOperators from failing tests
+        if (!Resolve(target, ref component))
            return false;

        if (!HasComp<HandsComponent>(user))
@@ -6,8 +6,3 @@
  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/"
@@ -1,4 +1,46 @@
 Entries:
+- author: ShepardToTheStars
+  changes:
+  - message: The jukebox, ID card computer, and access config lists are now sorted.
+    type: Tweak
+  id: 1973
+  time: '2025-12-19T10:33:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4998
+- author: Halo3moth
+  changes:
+  - message: Cybersun factories are happy to announce the mass production of saboteur
+      cyborg units. Find them in your uplink!
+    type: Add
+  - message: Saboteur cyborg now actually comes with a cloaking module. Yes, you heard
+      that right.
+    type: Tweak
+  id: 1974
+  time: '2025-12-19T23:13:31.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4919
+- 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'
@@ -4372,66 +4414,4 @@
  id: 2473
  time: '2026-06-29T00:54:09.0000000+00:00'
  url: https://github.com/DeltaV-Station/Delta-v/pull/5830
- author: Apachito, Killer Tamashi, stickycheZ101
-  changes:
-  - message: The paladin armor now makes you move 30% slower and it's now ginormous.
-    type: Tweak
-  - message: The forged vest now makes you move 10% slower.
-    type: Tweak
-  - message: Fully removed the ability to make the plading tower shield since it was
-      too powerful.
-    type: Tweak
-  - message: added a new crafting station used for mass producing forged gear
-    type: Add
-  - message: Made it so the forged and paladin set can only be made in the anvil.
-    type: Tweak
-  - message: Added Repeater Speedloader.
-    type: Add
-  - message: Fixed incorrect contraband tags (certain items being labeled sec contra
-      when it should be minor contra)
-    type: Fix
-  id: 2474
-  time: '2026-06-29T06:05:24.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5818
- author: ManuDemoen
-  changes:
-  - message: Pigs now give bacon when butchered!
-    type: Tweak
-  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
@@ -68,33 +68,3 @@ 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!
@@ -5,6 +5,3 @@ 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
@@ -185,24 +185,3 @@ crafting-menu-name-EXOXY = extended-capacity emergency oxygen tank
 crafting-menu-name-CGREN = green crayon

 crafting-menu-name-CYELO = yellow crayon
-
-crafting-menu-name-IRS = improvised .30/.45 speed loader
-crafting-menu-text-IRS = Little more than a spring-loaded tube that can hold bullets.
-
-crafting-menu-name-ASSFP = assorted forge parts
-crafting-menu-text-ASSFP = A small pile of components for making a forge for an anvil, contains an igniter and valves.
-
-crafting-menu-name-SINF = insulated fabric
-crafting-menu-text-SINF = A bolt of smooth insulated fabric, not much use in it's current form.
-
-crafting-menu-name-FLINS = fingerless insulated gloves
-crafting-menu-text-FLINS = Insulated gloves resistant to shocks, or at least they used to.
-
-crafting-menu-name-TINS = insulated gloves
-crafting-menu-text-TINS = These gloves will protect the wearer from electric shocks.
-
-construction-graph-tag-cheapinsulfabric = cheap insulated fabric
-
-construction-graph-tag-plasteelfilament = plasteel filament
-
-construction-graph-tag-insulthread = insulated thread
@@ -239,11 +239,5 @@ HatSpawner: RandomHatSpawner
 # 2026-05-16
 ClothingUniformJumpsuitSecBlue : ClothingUniformJumpsuitSecWhite

-# 2026-06-22
-PaperStickyNoteStack : PaperStickyNoteStackFilled
-PaperStickyNoteStackPink : PaperStickyNoteStackFilledPink
-PaperStickyNoteStackGreen : PaperStickyNoteStackFilledGreen
-PaperStickyNoteStackBlue : PaperStickyNoteStackFilledBlue
-
 # 2026-06-09
 BoxPerformer: BoxPerformerDV
@@ -83,7 +83,7 @@
 - type: entity
  parent: ToteBase
  id: BoxQMCircuitboards
-  name: logistics circuit tote # DeltaV - Logistics Department replacing Cargo
+  name: cargo circuit tote
  components:
  - type: EntityTableContainerFill
    containers:
@@ -120,7 +120,7 @@
 - type: entity
  parent: ToteBase
  id: BoxRDCircuitboards
-  name: epistemics circuit tote # DeltaV - Epistemics Department replacing Science
+  name: science circuit tote
  components:
  - type: EntityTableContainerFill
    containers:
@@ -25,7 +25,6 @@
    ReagentContainerSalt: 1
    ReagentContainerPepper: 1
    ReagentContainerChocolate: 1
-    FoodMeatBacon: 3
    # End DeltaV Additions
  contrabandInventory:
    EggBoxBroken: 1
@@ -302,7 +302,7 @@
 - type: entity
  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatRD
-  name: mystagogue lab coat # DeltaV - Epistemics Department replacing Science
+  name: research director lab coat
  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: mystagogue lab coat # DeltaV - Science > Epistemics
+  name: research director lab coat

 - type: entity
  parent: ClothingOuterStorageBase
@@ -147,7 +147,7 @@
 - type: entity
  parent: ClothingShoesBaseWinterBoots
  id: ClothingShoesBootsWinterSci
-  name: epistemics winter boots # DeltaV - Epistemics Department replacing Science
+  name: science winter boots
  components:
  - type: Sprite
    sprite: Clothing/Shoes/Boots/winterbootssci.rsi
@@ -2,7 +2,7 @@
  parent: MarkerBase
  id: SpawnMobAlexander
  name: Alexander Spawner
-  suffix: Botany Pet # DeltaV - Change from chef pet to botany pet
+  suffix: Chef Pet
  components:
  - type: Sprite
    layers:
@@ -16,7 +16,7 @@
  parent: MarkerBase
  id: SpawnMobBandito
  name: Bandito Spawner
-  suffix: Perma Pet # DeltaV - Change from RD pet to perma pet
+  suffix: RD Pet
  components:
  - type: Sprite
    layers:
@@ -30,7 +30,7 @@
  parent: MarkerBase
  id: SpawnMobCat
  name: Random Cat Spawner
-  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
+  suffix: CMO Pet
  components:
  - type: Sprite
    layers:
@@ -47,7 +47,7 @@
  parent: MarkerBase
  id: SpawnMobCatBingus
  name: Bingus Spawner
-  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
+  suffix: CMO Pet
  components:
  - type: Sprite
    layers:
@@ -61,7 +61,7 @@
  parent: MarkerBase
  id: SpawnMobCatException
  name: Exception Spawner
-  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
+  suffix: CMO Pet
  components:
  - type: Sprite
    layers:
@@ -75,7 +75,7 @@
  parent: MarkerBase
  id: SpawnMobCatFloppa
  name: Floppa Spawner
-  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
+  suffix: CMO Pet
  components:
  - type: Sprite
    layers:
@@ -89,7 +89,7 @@
  parent: MarkerBase
  id: SpawnMobCatRuntime
  name: Runtime Spawner
-  #suffix: CMO Pet # DeltaV - Change from CMO pet to anybody's pet
+  suffix: CMO Pet
  components:
  - type: Sprite
    layers:
@@ -162,7 +162,7 @@
  parent: MarkerBase
  id: SpawnMobMcGriff
  name:  McGriff Spawner
-  suffix: Warden or Detective Pet # DeltaV - Change from Warden pet to Warden or Detective pet
+  suffix: Warden Pet
  components:
  - type: Sprite
    layers:
@@ -252,7 +252,7 @@
  parent: MarkerBase
  id: SpawnMobRaccoonMorticia
  name: Raccoon Morticia Spawner
-  suffix: QM or Disposals Pet # DeltaV - Change from QM pet to QM or Disposals pet
+  suffix: QM Pet
  components:
  - type: Sprite
    layers:
@@ -266,7 +266,7 @@
  parent: MarkerBase
  id: SpawnMobShiva
  name: Shiva Spawner
-  suffix: HoS Pet # DeltaV - Change from Security pet to HoS pet
+  suffix: Security Pet
  components:
  - type: Sprite
    layers:
@@ -295,7 +295,7 @@
  parent: MarkerBase
  id: SpawnMobSmile
  name: Smile Spawner
-  suffix: Epistemics Pet # DeltaV - Epistemics Department replacing Science
+  suffix: Science Pet
  components:
  - type: Sprite
    layers:
@@ -166,7 +166,6 @@
  - 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
@@ -3809,8 +3809,6 @@
    spawned:
    - id: FoodMeat
      amount: 6
-    - id: FoodMeatBacon # DeltaV #Make Pigs drop bacon as well as meat
-      amount: 6
  - type: Grammar
    attributes:
      gender: epicene
@@ -114,8 +114,8 @@
    receiveFrequencyId: NTNet # DeltaV - NTNet
    transmitFrequencyId: ShuttleTimer
  - type: WirelessNetworkConnection
-    range: 10000 # DeltaV
-  #- type: StationLimitedNetwork # DeltaV - Off-station coordinates 
+    range: 500
+  - type: StationLimitedNetwork
  - type: Thieving
    stripTimeReduction: 9999
    stealthy: true
@@ -127,7 +127,7 @@
 - type: entity
  parent: BaseComputerCircuitboard
  id: CargoRequestScienceComputerCircuitboard
-  name: epistemics request computer board # DeltaV - Epistemics Department replacing Science
+  name: science request computer board
  description: A computer printed circuit board for a science request computer.
  components:
  - type: Sprite
@@ -116,7 +116,7 @@
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsQuartermaster
-  suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
+  suffix: Quartermaster, Locked
  components:
  - type: AccessReader
    access: [["Quartermaster"]]
@@ -132,7 +132,7 @@
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsCargo
-  suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo
+  suffix: Cargo, Locked
  components:
  - type: AccessReader
    access: [["Cargo"]]
@@ -174,7 +174,7 @@
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsResearchDirector
-  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: ResearchDirector, Locked
  components:
  - type: AccessReader
    access: [["ResearchDirector"]]
@@ -182,7 +182,7 @@
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsMedicalResearch
-  suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: Medical/Science, Locked
  components:
  - type: AccessReader
    access: [["Research"], ["Medical"]]
@@ -190,7 +190,7 @@
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsResearch
-  suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: Research, Locked
  components:
  - type: AccessReader
    access: [["Research"]]
@@ -144,7 +144,7 @@
 - type: entity
  parent: [DoorRemoteDefault, BaseCommandContraband]
  id: DoorRemoteResearch
-  name: epistemics door remote # DeltaV - Science > Epistemics
+  name: research door remote
  components:
  - type: Sprite
    layers:
@@ -15,7 +15,6 @@
  - type: Tag
    tags:
    - Sheet
-    - TiderAnvilParts #SL
    - ConstructionMaterial
  - type: Material
  - type: Damageable
@@ -15,7 +15,6 @@
    tags:
    - Sheet
    - Metal
-    - TiderAnvilParts #SL
    - ConstructionMaterial
  - type: Damageable
    damageContainer: Inorganic
@@ -108,11 +108,6 @@
        - ReagentId: Plasma
          Quantity: 10
        canReact: false
-  - type: Tag # DeltaV - Added to include TiderAnvilParts
-    tags:
-    - Sheet
-    - TiderAnvilParts #SL
-    - ConstructionMaterial

 - type: entity
  parent: SheetPlasma
@@ -145,7 +140,6 @@
    tags:
    - Plastic
    - Sheet
-    - TiderAnvilParts #SL
    - ConstructionMaterial
  - type: Material
  - type: PhysicalComposition
@@ -14,7 +14,6 @@
  - type: Tag
    tags:
    - Ingot
-    - TiderAnvilParts #SL
    - ConstructionMaterial
  - type: Damageable
    damageContainer: Inorganic
@@ -147,7 +147,6 @@
      - ClothMade
      - Gauze
      - RawMaterial
-      - TiderAnvilParts #SL
      - ConstructionMaterial
  - type: Construction
    graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
@@ -257,7 +256,6 @@
    tags:
    - Wooden
    - RawMaterial
-    - TiderAnvilParts #SL
    - ConstructionMaterial
  - type: Extractable
    grindableSolutionName: wood
@@ -48,7 +48,7 @@
 - type: entity
  parent: PaperAcquisitionSlip
  id: PaperAcquisitionSlipScience
-  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: Science
  components:
  - type: Sprite
    layers:
@@ -404,7 +404,7 @@
 - type: entity
  parent: IDCardStandard
  id: ResearchIDCard
-  name: epistemics ID card # DeltaV - Science > Epistemics
+  name: research ID card
  components:
  - type: Sprite
    layers:
@@ -830,7 +830,7 @@
 - type: entity
  parent: IDCardStandard
  id: CargoIDCard
-  name: logistics ID card # DeltaV - Logistics Department replacing Cargo
+  name: cargo ID card
  components:
  - type: Sprite
    layers:
@@ -46,9 +46,6 @@
      Steel: 185
  - type: StaticPrice
    price: 30
-  - type: Tag # DeltaV - Rebalance of tide crafting
-    tags:
-    - GasTank

 - type: entity
  abstract: true
@@ -75,7 +72,6 @@
  - type: Tag # Funkystation - Crash Carts
    tags:
    - OxygenTank
-    - GasTank # DeltaV - Added for the Anvil

 - type: entity
  parent: GasTankRoundBase
@@ -55,8 +55,8 @@
 - type: entity
  id: ShowcaseRobotAntique
  parent: BaseShowcaseRobot
-  name: logistics robot showcase # DeltaV - Logistics Department replacing Cargo
-  description: A non-functional replica of an old logistics robot. # DeltaV - Logistics Department replacing Cargo
+  name: cargo robot showcase
+  description: A non-functional replica of an old cargo robot.
  components:
  - type: Sprite
    sprite: Structures/Decoration/showcase.rsi
@@ -360,7 +360,7 @@
 - type: entity
  parent: AirlockCommand
  id: AirlockResearchDirectorLocked
-  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: ResearchDirector, Locked
  components:
  - type: ContainerFill
    containers:
@@ -776,7 +776,7 @@
 - type: entity
  parent: AirlockCommandGlass
  id: AirlockResearchDirectorGlassLocked
-  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: ResearchDirector, Locked
  components:
  - type: ContainerFill
    containers:
@@ -21,7 +21,7 @@
 - type: entity
  parent: AirlockAssembly
  id: AirlockAssemblyCargo
-  suffix: Logistics # DeltaV - Epistemics Department replacing Science
+  suffix: Cargo
  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: Logistics, Glass # DeltaV - Epistemics Department replacing Science
+  suffix: Cargo, Glass
  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: Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: 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: Epistemics, Glass # DeltaV - Epistemics Department replacing Science
+  suffix: Science, Glass
  components:
  - type: Sprite
    sprite: _DV/Structures/Doors/Airlocks/Glass/science.rsi # DeltaV - Resprite Doors
@@ -94,7 +94,7 @@
 - type: entity
  id: BlastDoorScience
  parent: BlastDoor
-  suffix: Autolink, Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: Autolink, Science
  components:
  - type: AccessReader
    access: [["Command"], ["Research"]]
@@ -104,7 +104,7 @@
 - type: entity
  id: BlastDoorScienceOpen
  parent: BlastDoorOpen
-  suffix: Open, Autolink, Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: Open, Autolink, Science
  components:
  - type: AccessReader
    access: [["Command"], ["Research"]]
@@ -415,7 +415,7 @@
 - type: entity
  parent: WindoorSecureCommandLocked
  id: WindoorSecureResearchDirectorLocked
-  suffix: Mystagogue, Locked # DeltaV - Epistemics Department replacing Science
+  suffix: ResearchDirector, Locked
  components:
  - type: ContainerFill
    containers:
@@ -466,7 +466,7 @@
 - type: entity
  parent: WindoorSecurePlasma
  id: PlasmaWindoorSecureScienceLocked
-  suffix: Epistemics, Locked, Plasma # DeltaV - Epistemics Department replacing Science
+  suffix: Science, Locked, Plasma
  components:
  - type: ContainerFill
    containers:
@@ -1011,7 +1011,7 @@
 - type: entity
  id: ComputerCargoOrdersScience
  parent: ComputerCargoOrders
-  name: epistemics request computer # DeltaV - Epistemics Department replacing Science
+  name: science request computer
  description: Used by the science department to order supplies.
  components:
  - type: Sprite
@@ -126,7 +126,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."
@@ -416,7 +416,7 @@
 - type: entity
  parent: HolopadEpistemics # DeltaV
  id: HolopadScienceRnd
-  suffix: Epistemics # DeltaV - Science > Epistemics
+  suffix: R&D
  components:
  - type: Label
    currentLabel: holopad-epistemics-rnd # DeltaV - Science > Epistemics
@@ -146,7 +146,6 @@
    # Begin DeltaV Additions
    - RingsStatic
    - ReportingStatic
-    - CutterMachineStaticDen
    # End DeltaV Additions
    - ToolsStatic
    - PartsStatic
@@ -219,7 +219,7 @@
 - type: entity
  parent: TelecomServer
  id: TelecomServerFilledCargo
-  suffix: Logistics # DeltaV - Logistics Department replacing Cargo
+  suffix: Cargo
  components:
  - type: ContainerFill
    containers:
@@ -249,7 +249,7 @@
 - type: entity
  parent: TelecomServer
  id: TelecomServerFilledScience
-  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: Science
  components:
  - type: ContainerFill
    containers:
@@ -572,7 +572,7 @@
 - type: entity
  id: CrateLockBoxScience
  parent: CrateBaseLockBox
-  name: epistemics lock box # DeltaV - Epistemics Department replacing Science
+  name: science lock box
  components:
  - type: Sprite
    layers:
@@ -231,7 +231,7 @@
 - type: entity
  parent: LockableButton
  id: LockableButtonResearchDirector
-  suffix: Mystagogue # DeltaV - Epistemics Department replacing Science
+  suffix: ResearchDirector
  components:
  - type: AccessReader
    access: [["ResearchDirector"]]
@@ -327,7 +327,7 @@
 - type: entity
  parent: LockableButton
  id: LockableButtonCargo
-  suffix: Logistics # DeltaV - Logistics Department replacing Cargo
+  suffix: Cargo
  components:
  - type: AccessReader
    access: [["Cargo"]]
@@ -335,7 +335,7 @@
 - type: entity
  parent: LockableButton
  id: LockableButtonResearch
-  suffix: Epistemics # DeltaV - Epistemics Department replacing Science
+  suffix: Research
  components:
  - type: AccessReader
    access: [["Research"]]
@@ -157,7 +157,6 @@
  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
@@ -175,7 +174,6 @@
  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
@@ -163,7 +163,7 @@
  parent: SurveillanceCameraBase
  id: SurveillanceCameraSupply
  name: camera
-  suffix: Logistics # DeltaV - Epistemics Department replacing Science
+  suffix: Supply
  components:
  - type: DeviceNetwork
    deviceNetId: Wired
@@ -837,8 +837,7 @@
  group: Savory
  solids:
    FoodRiceBoiled: 1
-    # FoodMeatCutlet: 3 # DeltaV - use bacon since it's the obtainable pork product
-    FoodMeatBacon: 1 # DeltaV
+    FoodMeatCutlet: 3

 - type: microwaveMealRecipe
  id: RecipeRiceGumbo
@@ -1,10 +0,0 @@
-
- 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
@@ -1,33 +0,0 @@
-
- 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
@@ -1,30 +0,0 @@
- 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
@@ -1,143 +0,0 @@
-# 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
@@ -1,148 +0,0 @@
- 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
@@ -1,39 +0,0 @@
- 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
@@ -1,295 +0,0 @@
- 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
@@ -1,158 +0,0 @@
-
-# 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
@@ -1,5 +0,0 @@
- type: latheRecipePack
-  id: CutterMachineStaticDen
-  recipes:
-  - FloorTileItemPool
-  - FloorTileItemPoolDark
@@ -1,9 +0,0 @@
- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemPool
-  result: FloorTileItemPool
-
- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemPoolDark
-  result: FloorTileItemPoolDark
@@ -1,13 +0,0 @@
- 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
@@ -1,35 +0,0 @@
- 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
@@ -14,7 +14,6 @@
    FoodButter: 3
    FoodCheese: 1
    FoodMeat: 6
-    FoodMeatBacon: 3
    FoodMeatChicken: 4
    FoodMeatDuck: 2
    ReagentContainerSalt: 2
@@ -23,31 +23,3 @@
      - 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
@@ -179,20 +179,6 @@
      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
@@ -2,7 +2,6 @@
  name: Arctic Fox Siobhan Spawner
  id: SpawnMobArcticFoxSiobhan
  parent: MarkerBase
-  suffix: Mystagogue Pet
  components:
  - type: Sprite
    layers:
@@ -13,10 +12,9 @@
      - MobArcticFoxSiobhan

 - type: entity
-  name: Laika Spawner
+  name: Sec Dog Laika Spawner
  id: SpawnMobSecDogLaika
  parent: MarkerBase
-  suffix: HoS Pet
  components:
  - type: Sprite
    layers:
@@ -43,7 +41,6 @@
  name: Sec Animal Spawner
  id: SpawnMobSecLaikaOrShiva
  parent: MarkerBase
-  suffix: HoS Pet, Laika or Shiva
  components:
  - type: Sprite
    layers:
@@ -57,8 +54,7 @@
 - type: entity
  parent: MarkerBase
  id: SpawnMobJusticePet
-  name: Carpy Spawner
-  suffix: Justice Pet
+  name: Justice Pet Spawner
  components:
  - type: Sprite
    layers:
@@ -73,7 +69,6 @@
  name: Silvia Spawner
  id: SpawnMobCMOPetSilvia
  parent: MarkerBase
-  suffix: Medical Pet
  components:
  - type: Sprite
    layers:
@@ -88,7 +83,6 @@
  parent: MarkerBase
  id: SpawnMobEngiPossumPoppy
  name: Poppy Spawner
-  suffix: Engineering Pet
  components:
  - type: Sprite
    layers:
@@ -2,7 +2,7 @@
  parent: MarkerBase
  id: SpawnMobSmileCore
  name: Smile Core Spawner
-  suffix: Epistemics Pet, Delta V
+  suffix: Science Pet, Delta V
  components:
  - type: Sprite
    layers:
@@ -425,9 +425,23 @@
  - type: Paper
    stampState: paper_stamp-generic
    stampedBy:
-    - stampedColor: "#8F99D6FF"
+    - stampedColor: '#8F99D6FF'
      stampedName: HydroCo
-    content: paper-hydroco-notice
+    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!

 - type: entity
  parent: Paper
@@ -438,9 +452,30 @@
  - type: Paper
    stampState: paper_stamp-generic
    stampedBy:
-    - stampedColor: "#8F99D6FF"
+    - stampedColor: '#8F99D6FF'
      stampedName: HydroCo
-    content: paper-misc-hydroco-trial
+    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!

 - type: entity
  parent: Paper
@@ -131,7 +131,6 @@
  id: PaperStickyNoteStack
  name: sticky note stack
  suffix: yellow
-  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: _DV/Objects/Misc/stickies.rsi
@@ -180,7 +179,6 @@
  id: PaperStickyNoteStackPink
  name: sticky note stack
  suffix: pink
-  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    color: "#ff8cba"
@@ -194,7 +192,6 @@
  id: PaperStickyNoteStackGreen
  name: sticky note stack
  suffix: green
-  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    color: "#9fd4a3"
@@ -208,7 +205,6 @@
  id: PaperStickyNoteStackBlue
  name: sticky note stack
  suffix: blue
-  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    color: "#00c2e7"
@@ -25,5 +25,6 @@
    deviceNetId: Wireless
    receiveFrequencyId: NTNet # DeltaV - NTNet
  - type: WirelessNetworkConnection
-    range: 3600
+    range: 500
+  - type: StationLimitedNetwork
  - type: Appearance
@@ -2,7 +2,6 @@
  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
@@ -1,18 +1,18 @@
 - type: entity
-  parent: BaseSpeedLoaderMagnum
  id: SpeedLoaderMagnumRubber
  name: "speed loader (.45 magnum rubber)"
+  parent: BaseSpeedLoaderMagnum
  components:
  - type: BallisticAmmoProvider
    proto: CartridgeMagnumRubber
  - type: Sprite
    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
    layers:
-    - state: base
-      map: [ "enum.GunVisualLayers.Base" ]
-    - state: rubber-6
-      sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
-      map: [ "enum.GunVisualLayers.Mag" ]
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-6
+        sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+        map: [ "enum.GunVisualLayers.Mag" ]
  - type: MagazineVisuals
    magState: rubber
    steps: 7
@@ -21,72 +21,29 @@


 - type: entity
-  parent: [ BaseItem, BaseMinorContraband ]
  id: SpeedLoaderMagnumImprovised
  name: "speed loader (.45 magnum)"
+  parent: BaseSpeedLoaderMagnum
  components:
-  - type: Tag
-    tags:
-    - SpeedLoaderMagnum
-  - type: SpeedLoader
  - type: BallisticAmmoProvider
    proto: null
    whitelist:
      tags:
-      - CartridgeMagnum
-      - CartridgeMagnumImprovised
+        - CartridgeMagnum
+        - CartridgeMagnumImprovised
    capacity: 4
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-  - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/improvised_magnum_speed_loader.rsi
-    layers:
-    - state: base
-      map: [ "enum.GunVisualLayers.Base" ]
-    - state: base-4
-      map: [ "enum.GunVisualLayers.Mag" ]
-      # Unshaded tip layer removed to avoid missing state errors (no corresponding 'base-unshaded-*' states in RSI)
  - type: MagazineVisuals
    magState: base
    steps: 5
    zeroVisible: false
-  - type: Appearance
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/improvised_magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-4
+        map: [ "enum.GunVisualLayers.Mag" ]
+      # Unshaded tip layer removed to avoid missing state errors (no corresponding 'base-unshaded-*' states in RSI)
  - type: Construction
    graph: ImprovisedMagnumSpeedLoaderGraph
    node: shell
-
- type: entity
-  parent: [ BaseSpeedLoaderShotgun, BaseMinorContraband ]
-  id: SpeedLoaderMagnumLeverImprovised
-  name: "speed loader (.30 /.45 magnum)"
-  components:
-  - type: BallisticAmmoProvider
-    proto: null
-    whitelist:
-      tags:
-      - CartridgeMagnum
-      - CartridgeMagnumImprovised
-      - CartridgeLightRifle
-      - CartridgeLightRifleImprovised
-    capacity: 8
-  - type: MagazineVisuals
-    magState: base
-    steps: 9
-    zeroVisible: false
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,2,0
-  - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/improvised_lever_action_speed_loader.rsi
-    layers:
-    - state: base
-      map: [ "enum.GunVisualLayers.Base" ]
-    - state: base-8
-      map: [ "enum.GunVisualLayers.Mag" ]
-      # Unshaded tip layer removed to avoid missing state errors (no corresponding 'base-unshaded-*' states in RSI)
-  - type: Construction
-    graph: SpeedLoaderMagnumLeverImprovisedGraph
-    node: shell
@@ -412,7 +412,7 @@
 - type: entity
  parent: FaxMachineBase
  id: FaxMachineResearchDirector
-  suffix: Mystagogue
+  suffix: Research Director
  components:
  - type: PageSender
    autoLinkJobs: [ResearchDirector]
@@ -503,7 +503,6 @@
 - type: entity
  parent: FaxMachineBase
  id: FaxMachineHitman
-  suffix: Hitman
  components:
  - type: FaxMachine
    name: "Unknown?"
@@ -109,7 +109,7 @@
 - type: entity
  parent: [ReinforcedSurveillanceCameraBase, SurveillanceCameraSupply]
  id: ReinforcedSurveillanceCameraSupply
-  suffix: Logistics
+  suffix: Supply
  components:
  - type: DeviceNetwork
    deviceNetId: Wired
@@ -174,7 +174,7 @@

 - type: guideEntry
  id: ResearchDisp
-  name: Epistemics
+  name: Research
  text: /ServerInfo/Guidebook/_DV/SpaceLaw/ControlledISA/DepartmentalDisp/ResearchDisp.xml


@@ -317,7 +317,7 @@
  solids:
    FoodRiceBoiled: 1
    FoodEgg: 2 #FoodMealFriedegg when we can actually fry eggs buh
-    FoodMeatBacon: 1
+    FoodMeatCutlet: 1 #FoodMeatBacon when it's actually findable

 - type: microwaveMealRecipe
  id: RecipeMothCheesyPorridge
@@ -1,60 +0,0 @@
-
-#test
- type: entity
-  abstract: true
-  parent: BaseLathe
-  id: BaseLatheFuel
-  components:
-  - type: ReagentSpeed
-    solution: fuel
-    modifiers:
-      WeldingFuel: 0.2
-  - type: SolutionContainerManager
-    solutions:
-      fuel:
-        maxVol: 500
-  - type: Spillable
-    solution: fuel
-  - type: RefillableSolution
-    solution: fuel
-  - type: ExaminableSolution
-    solution: fuel
-
- type: entity
-  id: TiderLathe
-  parent: BaseLatheFuel
-  name: tider's anvil
-  description: Every maints blacksmith's dream, a forge for producing gear in bulk.
-  components:
-  - type: Sprite
-    sprite: _Starlight/Structures/Machines/tider_anvil.rsi
-    snapCardinals: true
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: inserting
-      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: AssortedForgeParts
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - TiderAnvilMats
-        - TiderAnvilParts
-  - type: OreSiloClient
-  - type: Lathe
-    idleState: icon
-    runningState: building
-    unlitIdleState: unlit
-    unlitRunningState: unlit-building
-    staticPacks:
-    - TiderAnvilStatic
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-      machine_parts: !type:Container
@@ -1,25 +0,0 @@
- type: latheRecipePack
-  id: TiderAnvilStatic
-  recipes:
-  - SwordFlamingTA
-  - HelmetForgedTA
-  - OmnitoolForgedTA
-  - PistolForgedTA
-  - RevolverForgedTA
-  - BucklerForgedTA
-  - TowerForgedTA
-  - ShotgunForgedTA
-  - SMGForgedTA
-  - SniperForgedTA
-  - SwordForgedTA
-  - ArmourForgedTA
-  - MagazineBoxImprovTA
-  - SpeedloaderMagnumImprovTA
-  - MagazinePistolImprovTA
-  - SpeedloaderRifleImprovTA
-  - MagazineSMGImprovTA
-#  - GreatPaladinTA # Delta-V removed ability to make it
-  - HelmetPaladinTA
-  - ShieldPaladinTA
-  - ArmourPaladinTA
-  - GreatSwordTA
@@ -1,206 +0,0 @@
- type: latheRecipe
-  id: SwordFlamingTA
-  result: SwordFlaming
-  completetime: 120
-  materials:
-     Steel: 250
-     Glass: 500
-     Plastic: 350
-     Cloth: 300
-     Plasteel: 1100
-
- type: latheRecipe
-  id: HelmetForgedTA
-  result: UnfinishedClothingHeadHelmetForged
-  completetime: 60
-  materials:
-     Steel: 400
-     Plastic: 150
-     Cloth: 300
-     Plasteel: 200
-
- type: latheRecipe
-  id: OmnitoolForgedTA
-  result: UnfinishedForgedOmnitool
-  completetime: 120
-  materials:
-     Steel: 1400
-     Glass: 50
-     Plastic: 200
-     Plasteel: 350
-
- type: latheRecipe
-  id: PistolForgedTA
-  result: UnfinishedPistolForged
-  completetime: 90
-  materials:
-     Steel: 700
-     Wood: 350
-     Plastic: 50
-     Plasteel: 300
-
- type: latheRecipe
-  id: RevolverForgedTA
-  result: UnfinishedRevolverForged
-  completetime: 120
-  materials:
-     Steel: 800
-     Wood: 350
-     Plastic: 50
-     Plasteel: 400
-
- type: latheRecipe
-  id: BucklerForgedTA
-  result: UnfinishedForgedShieldBuckler
-  completetime: 60
-  materials:
-     Steel: 350
-     Plastic: 300
-     Cloth: 350
-     Plasteel: 300
-
- type: latheRecipe
-  id: TowerForgedTA
-  result: UnfinishedForgedShieldTower
-  completetime: 120
-  materials:
-     Steel: 1300
-     Glass: 300
-     Plastic: 450
-     Cloth: 600
-     Plasteel: 600
-
- type: latheRecipe
-  id: ShotgunForgedTA
-  result: UnfinishedForgedShotgun
-  completetime: 90
-  materials:
-     Steel: 600
-     Wood: 350
-     Plastic: 50
-     Cloth: 200
-     Plasteel: 150
-
- type: latheRecipe
-  id: SMGForgedTA
-  result: UnfinishedSubMachineGunForged
-  completetime: 120
-  materials:
-     Steel: 150
-     Wood: 350
-     Plastic: 50
-     Plasteel: 750
-
- type: latheRecipe
-  id: SniperForgedTA
-  result: UnfinishedSniperForged
-  completetime: 120
-  materials:
-     Steel: 2100
-     Plastic: 50
-     Wood: 350
-     Plasteel: 1150
-
- type: latheRecipe
-  id: SwordForgedTA
-  result: UnfinishedSwordForged
-  completetime: 90
-  materials:
-    Cloth: 300
-    Plasteel: 1100
-
- type: latheRecipe
-  id: ArmourForgedTA
-  result: UnfinishedClothingOuterArmorForged
-  completetime: 120
-  materials:
-    Steel: 750
-    Plastic: 350
-    Cloth: 750
-    Plasteel: 350
-
- type: latheRecipe
-  id: MagazineBoxImprovTA
-  result: BaseMagazineBoxImprovised
-  completetime: 30
-  materials:
-    Steel: 350
-    Cloth: 20
-
- type: latheRecipe
-  id: SpeedloaderMagnumImprovTA
-  result: SpeedLoaderMagnumImprovised
-  completetime: 22
-  materials:
-    Steel: 450
-
- type: latheRecipe
-  id: MagazinePistolImprovTA
-  result: MagazinePistolImprovised
-  completetime: 7
-  materials:
-    Steel: 350
-
- type: latheRecipe
-  id: SpeedloaderRifleImprovTA
-  result: SpeedLoaderMagnumLeverImprovised
-  completetime: 30
-  materials:
-    Steel: 600
-
- type: latheRecipe
-  id: MagazineSMGImprovTA
-  result: MagazinePistolSubMachineGunImprovised
-  completetime: 30
-  materials:
-    Steel: 600
-
-#- type: latheRecipe # DeltaV - Make unobtainable
-#  id: GreatPaladinTA
-#  result: UnfinishedPaladinShieldGreat
-#  completetime: 120
-#  materials:
-#    Steel: 2000
-#    Glass: 300
-#    Plastic: 750
-#   Cloth: 900
-#   Plasteel: 2000
-
- type: latheRecipe
-  id: HelmetPaladinTA
-  result: UnfinishedClothingHeadHelmetPaladin
-  completetime: 120
-  materials:
-    Steel: 500
-    Plastic: 100
-    Cloth: 450
-    Plasteel: 450
-
- type: latheRecipe
-  id: ShieldPaladinTA
-  result: UnfinishedPaladinShield
-  completetime: 120
-  materials:
-    Steel: 1000
-    Plastic: 300
-    Cloth: 300
-    Plasteel: 600
-
- type: latheRecipe
-  id: ArmourPaladinTA
-  result: UnfinishedClothingOuterArmorPaladin
-  completetime: 120
-  materials:
-    Steel: 1100
-    Glass: 300
-    Plastic: 300
-    Cloth: 1100
-    Plasteel: 750
-
- type: latheRecipe
-  id: GreatSwordTA
-  result: UnfinishedClaymoreForged
-  completetime: 120
-  materials:
-    Cloth: 600
-    Plasteel: 1900
@@ -8,7 +8,7 @@
    sprite: _Starlight/Clothing/OuterClothing/Armor/makeshift.rsi
  - type: Clothing
    sprite: _Starlight/Clothing/OuterClothing/Armor/makeshift.rsi
-  - type: Armor
+  - type: Armor 
    modifiers:
      coefficients:
        Blunt: 0.90
@@ -34,7 +34,7 @@
    sprite: _Starlight/Clothing/OuterClothing/Armor/improvised.rsi
  - type: Clothing
    sprite: _Starlight/Clothing/OuterClothing/Armor/improvised.rsi
-  - type: Armor
+  - type: Armor 
    modifiers:
      coefficients:
        Blunt: 0.85
@@ -57,16 +57,13 @@
    sprite: _Starlight/Clothing/OuterClothing/Armor/forged.rsi
  - type: Clothing
    sprite: _Starlight/Clothing/OuterClothing/Armor/forged.rsi
-  - type: Armor
+  - type: Armor 
    modifiers:
      coefficients:
        Blunt: 0.75
        Slash: 0.65
        Piercing: 0.70
        Heat: 0.85
-  - type: ClothingSpeedModifier # DeltaV - Added Speed modifiers
-    walkModifier: 0.90
-    sprintModifier: 0.90
  - type: ExplosionResistance
    damageCoefficient: 0.90

@@ -80,17 +77,15 @@
    sprite: _Starlight/Clothing/OuterClothing/Armor/paladin.rsi
  - type: Clothing
    sprite: _Starlight/Clothing/OuterClothing/Armor/paladin.rsi
-  - type: Item # DeltaV - Made it Ginormous from huge
-    size: Ginormous
-  - type: Armor
+  - type: Armor 
    modifiers:
      coefficients:
        Blunt: 0.70
        Slash: 0.50
        Piercing: 0.55
        Heat: 0.85
-  - type: ClothingSpeedModifier # DeltaV - Changed modifier from 85% to 70%
-    walkModifier: 0.70
-    sprintModifier: 0.70
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.85
  - type: ExplosionResistance
    damageCoefficient: 0.85
@@ -1,21 +0,0 @@
- type: entity
-  parent: BaseMachineCircuitboard
-  id: AssortedForgeParts
-  name: assorted forge parts
-  description: A small pile of components for making a forge for an anvil, contains an igniter and valves.
-  components:
-    - type: MachineBoard
-      prototype: TiderLathe
-      stackRequirements:
-        Plasteel: 20
-        Steel: 10
-      tagRequirements:
-        GasTank:
-          amount: 2
-          defaultPrototype: OxygenTank
-    - type: Sprite
-      sprite: _Starlight/Objects/Devices/assorted_forge_parts.rsi
-      state: icon
-    - type: Construction
-      graph: AssortedForgeParts
-      node: finish
@@ -17,9 +17,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedShotgunGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ForgedShotgunGraph
+    node: shotgun

 - type: entity
  parent: BaseItem
@@ -38,9 +38,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedPistolGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ForgedPistolGraph
+    node: shotgun

 - type: entity
  parent: BaseItem
@@ -59,9 +59,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedRevolverGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ForgedRevolverGraph
+    node: shotgun

 - type: entity
  parent: BaseItem
@@ -80,9 +80,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedSMGGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ForgedSMGGraph
+    node: shotgun

 - type: entity
  parent: BaseItem
@@ -101,9 +101,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedSniperGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ForgedSniperGraph
+    node: shotgun

 - type: entity
  parent: BaseItem
@@ -124,4 +124,4 @@
    - ModularBarrel
  - type: Construction
    graph: ModularBarrelGraph
-    node: shotgun
+    node: shotgun
@@ -141,9 +141,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedOmnitoolGraph
-  #  node: tool
+  - type: Construction
+    graph: ForgedOmnitoolGraph
+    node: tool

 - type: entity
  parent: BaseItem
@@ -234,9 +234,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: SwordForgedGraph
-  #  node: tool
+  - type: Construction
+    graph: SwordForgedGraph
+    node: tool

 - type: entity
  parent: BaseItem
@@ -255,9 +255,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ClaymoreForgedGraph
-  #  node: tool
+  - type: Construction
+    graph: ClaymoreForgedGraph
+    node: tool

 - type: entity
  parent: BaseItem
@@ -297,9 +297,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedShieldBucklerGraph
-  #  node: shield
+  - type: Construction
+    graph: ForgedShieldBucklerGraph
+    node: shield

 - type: entity
  parent: BaseItem
@@ -318,9 +318,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ForgedShieldTowerGraph
-  #  node: shield
+  - type: Construction
+    graph: ForgedShieldTowerGraph
+    node: shield

 - type: entity
  parent: BaseItem
@@ -339,9 +339,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: PaladinShieldGraph
-  #  node: shield
+  - type: Construction
+    graph: PaladinShieldGraph
+    node: shield

 - type: entity
  parent: BaseItem
@@ -360,9 +360,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: PaladinShieldGreatGraph
-  #  node: shield
+  - type: Construction
+    graph: PaladinShieldGreatGraph
+    node: shield

 - type: entity
  parent: BaseItem
@@ -402,9 +402,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ClothingOuterArmorForgedGraph
-  #  node: vest
+  - type: Construction
+    graph: ClothingOuterArmorForgedGraph
+    node: vest

 - type: entity
  parent: BaseItem
@@ -423,9 +423,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ClothingOuterArmorPaladinGraph
-  #  node: vest
+  - type: Construction
+    graph: ClothingOuterArmorPaladinGraph
+    node: vest

 - type: entity
  parent: BaseItem
@@ -465,9 +465,9 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ClothingHeadHelmetForgedGraph
-  #  node: helmet
+  - type: Construction
+    graph: ClothingHeadHelmetForgedGraph
+    node: helmet

 - type: entity
  parent: BaseItem
@@ -486,6 +486,6 @@
  - type: Tag
    tags:
    - Metal
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ClothingHeadHelmetPaladinGraph
-  #  node: helmet
+  - type: Construction
+    graph: ClothingHeadHelmetPaladinGraph
+    node: helmet
@@ -1,36 +0,0 @@
- type: entity
-  id: BaseSpeedLoaderShotgun
-  name: 12 gauge speedloader
-  parent: [ BaseItem ]
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - SpeedLoaderShotgun
-  - type: SpeedLoader
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    fillDelay: 0.1
-    whitelist:
-      tags:
-        - ShellShotgun
-    capacity: 7
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-  - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Shotgun/shotgun_speed_loader.rsi
-    layers:
-      - state: base
-        map: [ "enum.GunVisualLayers.Base" ]
-      - state: base-7
-        map: [ "enum.GunVisualLayers.Mag" ]
-      - state: base-tip-7
-        map: [ "enum.GunVisualLayers.Tip" ]
-        color: "#F4001F"
-  - type: MagazineVisuals
-    magState: base
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
@@ -14,7 +14,7 @@
  - type: Clothing
    sprite: _Starlight/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi
  - type: Item
-    size: Normal
+    size: Normal  
  - type: Gun
    fireRate: 9
    minAngle: 32
@@ -83,7 +83,7 @@
    - state: mag-0
      map: ["enum.GunVisualLayers.Mag"]
  - type: Clothing
-    sprite: _Starlight/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi
+    sprite: _Starlight/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi  
  - type: Item
    size: Large
  - type: Wieldable
@@ -97,9 +97,9 @@
    angleIncrease: 3
    maxAngle: 32
  - type: Appearance
-  #- type: Construction # DeltaV - made it uncraftable
-  #  graph: ImprovisedSMGGraph
-  #  node: shotgun
+  - type: Construction
+    graph: ImprovisedSMGGraph
+    node: shotgun
  - type: WeaponDismantleOnShoot
    dismantleChance: 0.01
    items:
@@ -136,7 +136,7 @@
    - state: mag-0
      map: ["enum.GunVisualLayers.Mag"]
  - type: Clothing
-    sprite: _Starlight/Objects/Weapons/Guns/SMGs/forged_smg.rsi
+    sprite: _Starlight/Objects/Weapons/Guns/SMGs/forged_smg.rsi  
  - type: Wieldable
    unwieldOnUse: false
  - type: GunWieldBonus
@@ -149,4 +149,4 @@
    maxAngle: 32
  - type: Appearance
  - type: WeaponDismantleOnShoot
-    dismantleChance: 0
+    dismantleChance: 0
@@ -96,7 +96,7 @@
  name: Forged Repeater Rifle
  parent: WeaponSniperMakeshift
  id: WeaponSniperForged
-  description: The best a tider can achive, reliable fire-rate and accuracy with a satisfying lever-action system. What more can you ask for? Is fitted to be able to chamber both .35 / .45
+  description: The best a tider can achive, reliable fire-rate and accuracy with a satisfying lever-action system. What more can you ask for?
  components:
  - type: Sprite
    sprite: _Starlight/Objects/Weapons/Guns/Snipers/forged_rifle.rsi
@@ -109,18 +109,11 @@
  - type: GunWieldBonus
    minAngle: -8
    maxAngle: -15
-  - type: Gun # DeltaV - Fire rate was 1.5 lowerd it to 1
-    fireRate: 1 #Should allow for more intuitive cycling while still being balanced, as a lever action's RoF is determined on how fast you can cycle.
+  - type: Gun
    selectedMode: SemiAuto
    availableModes:
    - SemiAuto
  - type: BallisticAmmoProvider
    capacity: 8
-    whitelist:
-      tags:
-      - CartridgeLightRifle
-      - CartridgeLightRifleImprovised
-      - CartridgeMagnum
-      - CartridgeMagnumImprovised
  - type: WeaponDismantleOnShoot
-    dismantleChance: 0
+    dismantleChance: 0
@@ -1,22 +0,0 @@
- type: constructionGraph
-  id: AssortedForgeParts
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: finish
-      steps:
-      - material: Plasteel
-        amount: 5
-        doAfter: 5
-      - material: Cable
-        amount: 10
-        doAfter: 2
-      - tag: Igniter
-        icon:
-          sprite: Objects/Devices/igniter.rsi
-          state: icon
-        name: construction-graph-tag-igniter
-        doAfter: 10
-  - node: finish
-    entity: AssortedForgeParts
@@ -1,13 +0,0 @@
- type: constructionGraph
-  id: SpeedLoaderMagnumLeverImprovisedGraph
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: shell
-          steps:
-            - material: Steel
-              amount: 8
-              doAfter: 8
-    - node: shell
-      entity: SpeedLoaderMagnumLeverImprovised
@@ -1,9 +0,0 @@
- type: construction
-  name: crafting-menu-name-ASSFP
-  id: AssortedForgeParts
-  graph: AssortedForgeParts
-  startNode: start
-  targetNode: finish
-  category: construction-category-structures
-  objectType: Item
-  description: crafting-menu-text-ASSFP
@@ -1,12 +1,12 @@
-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FDB
-#  id: WeaponShotgunForged
-#  graph: ForgedShotgunGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FDB
+- type: construction
+  name: crafting-menu-name-FDB
+  id: WeaponShotgunForged
+  graph: ForgedShotgunGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FDB

 - type: construction
  name: crafting-menu-name-IP
@@ -18,15 +18,15 @@
  objectType: Item
  description: crafting-menu-text-IP

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FP
-#  id: WeaponPistolForged
-#  graph: ForgedPistolGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FP
+- type: construction
+  name: crafting-menu-name-FP
+  id: WeaponPistolForged
+  graph: ForgedPistolGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FP

 - type: construction
  name: crafting-menu-name-IPB
@@ -58,15 +58,15 @@
  objectType: Item
  description: crafting-menu-text-IR

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FR
-#  id: WeaponRevolverForged
-#  graph: ForgedRevolverGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FR
+- type: construction
+  name: crafting-menu-name-FR
+  id: WeaponRevolverForged
+  graph: ForgedRevolverGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FR

 - type: construction
  name: crafting-menu-name-IMB
@@ -98,27 +98,25 @@
  objectType: Item
  description: crafting-menu-text-MB

-# Begin DeltaV removal - made it uncraftable
-#- type: construction
-#  name: crafting-menu-name-IS
-#  id: WeaponSubMachineGunImprovised
-#  graph: ImprovisedSMGGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-IS
+- type: construction
+  name: crafting-menu-name-IS
+  id: WeaponSubMachineGunImprovised
+  graph: ImprovisedSMGGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-IS

-#- type: construction
-#  name: crafting-menu-name-FS
-#  id: WeaponSubMachineGunForged
-#  graph: ForgedSMGGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FS
-# End DeltaV removal
+- type: construction
+  name: crafting-menu-name-FS
+  id: WeaponSubMachineGunForged
+  graph: ForgedSMGGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FS

 - type: construction
  name: crafting-menu-name-ISM
@@ -140,15 +138,15 @@
  objectType: Item
  description: crafting-menu-text-IRR

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FRR
-#  id: WeaponSniperForged
-#  graph: ForgedSniperGraph
-#  startNode: start
-#  targetNode: shotgun
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FRR
+- type: construction
+  name: crafting-menu-name-FRR
+  id: WeaponSniperForged
+  graph: ForgedSniperGraph
+  startNode: start
+  targetNode: shotgun
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FRR

 - type: construction
  name: crafting-menu-name-IRB
@@ -280,15 +278,15 @@
  objectType: Item
  description: crafting-menu-text-IO

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FO
-#  id: OmnitoolForged
-#  graph: ForgedOmnitoolGraph
-#  startNode: start
-#  targetNode: tool
-#  category: construction-category-tools
-#  objectType: Item
-#  description: crafting-menu-text-FO
+- type: construction
+  name: crafting-menu-name-FO
+  id: OmnitoolForged
+  graph: ForgedOmnitoolGraph
+  startNode: start
+  targetNode: tool
+  category: construction-category-tools
+  objectType: Item
+  description: crafting-menu-text-FO

 - type: construction
  name: crafting-menu-name-WH
@@ -350,15 +348,15 @@
  objectType: Item
  description: crafting-menu-text-ISW

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-FSW
-#  id: SwordForged
-#  graph: SwordForgedGraph
-#  startNode: start
-#  targetNode: sword
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FSW
+- type: construction
+  name: crafting-menu-name-FSW
+  id: SwordForged
+  graph: SwordForgedGraph
+  startNode: start
+  targetNode: sword
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FSW

 - type: construction
  name: crafting-menu-name-DSW
@@ -370,15 +368,15 @@
  objectType: Item
  description: crafting-menu-text-DSW

-#- type: construction # DeltaV - made it uncraftable
-#  name: crafting-menu-name-TSW
-#  id: ClaymoreForged
-#  graph: ClaymoreForgedGraph
-# startNode: start
-#  targetNode: sword
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-TSW
+- type: construction
+  name: crafting-menu-name-TSW
+  id: ClaymoreForged
+  graph: ClaymoreForgedGraph
+  startNode: start
+  targetNode: sword
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-TSW

 - type: construction
  name: crafting-menu-name-ISH
@@ -390,47 +388,45 @@
  objectType: Item
  description: crafting-menu-text-ISH

-# Begin DeltaV removal - made it uncraftable
-#- type: construction
-#  name: crafting-menu-name-FSH
-#  id: ForgedShieldBuckler
-#  graph: ForgedShieldBucklerGraph
-#  startNode: start
-#  targetNode: shield
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FSH
+- type: construction
+  name: crafting-menu-name-FSH
+  id: ForgedShieldBuckler
+  graph: ForgedShieldBucklerGraph
+  startNode: start
+  targetNode: shield
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FSH

-#- type: construction
-#  name: crafting-menu-name-FSHT
-#  id: ForgedShieldTower
-#  graph: ForgedShieldTowerGraph
-#  startNode: start
-#  targetNode: shield
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-FSHT
+- type: construction
+  name: crafting-menu-name-FSHT
+  id: ForgedShieldTower
+  graph: ForgedShieldTowerGraph
+  startNode: start
+  targetNode: shield
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-FSHT

-#- type: construction
-#  name: crafting-menu-name-PSH
-#  id: PaladinShield
-#  graph: PaladinShieldGraph
-#  startNode: start
-#  targetNode: shield
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-PSH
+- type: construction
+  name: crafting-menu-name-PSH
+  id: PaladinShield
+  graph: PaladinShieldGraph
+  startNode: start
+  targetNode: shield
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-PSH

-#- type: construction
-#  name: crafting-menu-name-PSHG
-#  id: PaladinShieldGreat
-#  graph: PaladinShieldGreatGraph
-#  startNode: start
-#  targetNode: shield
-#  category: construction-category-weapons
-#  objectType: Item
-#  description: crafting-menu-text-PSHG
-# End DeltaV removal
+- type: construction
+  name: crafting-menu-name-PSHG
+  id: PaladinShieldGreat
+  graph: PaladinShieldGreatGraph
+  startNode: start
+  targetNode: shield
+  category: construction-category-weapons
+  objectType: Item
+  description: crafting-menu-text-PSHG

 - type: construction
  name: crafting-menu-name-MVT
@@ -452,27 +448,25 @@
  objectType: Item
  description: crafting-menu-text-IVT

-# Begin DeltaV removal - made it uncraftable
-#- type: construction
-#  name: crafting-menu-name-FVT
-#  id: ClothingOuterArmorForged
-#  graph: ClothingOuterArmorForgedGraph
-#  startNode: start
-#  targetNode: vest
-#  category: construction-category-clothing
-#  objectType: Item
-#  description: crafting-menu-text-FVT
+- type: construction
+  name: crafting-menu-name-FVT
+  id: ClothingOuterArmorForged
+  graph: ClothingOuterArmorForgedGraph
+  startNode: start
+  targetNode: vest
+  category: construction-category-clothing
+  objectType: Item
+  description: crafting-menu-text-FVT

-#- type: construction
-#  name: crafting-menu-name-PVT
-#  id: ClothingOuterArmorPaladin
-#  graph: ClothingOuterArmorPaladinGraph
-#  startNode: start
-#  targetNode: vest
-#  category: construction-category-clothing
-#  objectType: Item
-#  description: crafting-menu-text-PVT
-# End DeltaV removal
+- type: construction
+  name: crafting-menu-name-PVT
+  id: ClothingOuterArmorPaladin
+  graph: ClothingOuterArmorPaladinGraph
+  startNode: start
+  targetNode: vest
+  category: construction-category-clothing
+  objectType: Item
+  description: crafting-menu-text-PVT

 - type: construction
  name: crafting-menu-name-MVTH
@@ -494,34 +488,22 @@
  objectType: Item
  description: crafting-menu-text-IVTH

-# Begin DeltaV removal - made it uncraftable
-#- type: construction
-#  name: crafting-menu-name-FVTH
-#  id: ClothingHeadHelmetForged
-#  graph: ClothingHeadHelmetForgedGraph
-#  startNode: start
-#  targetNode: helmet
-#  category: construction-category-clothing
-#  objectType: Item
-#  description: crafting-menu-text-FVTH
-
-#- type: construction
-#  name: crafting-menu-name-PVTH
-#  id: ClothingHeadHelmetPaladin
-#  graph: ClothingHeadHelmetPaladinGraph
-#  startNode: start
-#  targetNode: helmet
-#  category: construction-category-clothing
-#  objectType: Item
-#  description: crafting-menu-text-PVTH
-# End DeltaV removal
+- type: construction
+  name: crafting-menu-name-FVTH
+  id: ClothingHeadHelmetForged
+  graph: ClothingHeadHelmetForgedGraph
+  startNode: start
+  targetNode: helmet
+  category: construction-category-clothing
+  objectType: Item
+  description: crafting-menu-text-FVTH

 - type: construction
-  name: crafting-menu-name-IRS
-  id: SpeedLoaderMagnumLeverImprovised
-  graph: SpeedLoaderMagnumLeverImprovisedGraph
+  name: crafting-menu-name-PVTH
+  id: ClothingHeadHelmetPaladin
+  graph: ClothingHeadHelmetPaladinGraph
  startNode: start
-  targetNode: shell
-  category: construction-category-weapons
+  targetNode: helmet
+  category: construction-category-clothing
  objectType: Item
-  description: crafting-menu-text-IRS
+  description: crafting-menu-text-PVTH
@@ -7,26 +7,17 @@
  id: BladeSteel

 - type: Tag
-  id: CartridgeLightRifleImprovised
+  id: CartridgePistolImprovised

 - type: Tag
  id: CartridgeMagnumImprovised

 - type: Tag
-  id: CartridgePistolImprovised
-
- type: Tag
-  id: CheapInsulatedFabric
+  id: CartridgeLightRifleImprovised

 - type: Tag
  id: EmergencyWelder

- type: Tag
-  id: fingerlessinsuls
-
- type: Tag
-  id: GasTank
-
 - type: Tag
  id: HiltPlasteel

@@ -36,12 +27,6 @@
 - type: Tag
  id: ImprovisedAmmoBox

- type: Tag
-  id: InsulatedFabric
-
- type: Tag
-  id: InsulatedThread
-
 - type: Tag
  id: MagazinePistolImprovised

@@ -51,23 +36,14 @@
 - type: Tag
  id: ModularBarrel

- type: Tag
-  id: PlasteelFilament
-
 - type: Tag
  id: SwordForged

- type: Tag
-  id: ShellShotgunImprovised
-
 - type: Tag
  id: SpeedLoaderMagnumImprovised

+- type: Tag
+  id: ShellShotgunImprovised
+
 - type: Tag
  id: SpeedLoaderShotgun
-
- type: Tag
-  id: TiderAnvilMats
-
- type: Tag
-  id: TiderAnvilParts
@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Sprites by portfiend (GitHub)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "pool"
-    },
-    {
-      "name": "pool-dark"
-    }
-  ]
-}
@@ -1,63 +0,0 @@
-{
-    "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
-        }
-    ]
-}
--- a/Show More
+++ b/Show More