diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 1bd5d6b71e..cc2b16ea1a 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -50,7 +50,7 @@ namespace Content.IntegrationTests.Tests
             "Dev",
             "TestTeg",
             "CentCommMain",
-            "CentCommHarmony",
+            // "CentCommHarmony",
             "MeteorArena",
             "Core", // No current maintainer. In need of a rework...
             "Pebble", // Maintained by Plyushune
diff --git a/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs b/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs
index 76c46ade03..df75cbc216 100644
--- a/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs
+++ b/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs
@@ -8,22 +8,18 @@ namespace Content.Server.DeltaV.Weapons.Ranged.Components;
 /// Allows for energy gun to switch between three modes. This also changes the sprite accordingly.
 /// </summary>
 /// <remarks>This is BatteryWeaponFireModesSystem with additional changes to allow for different sprites.</remarks>
-[RegisterComponent]
-[Access(typeof(EnergyGunSystem))]
-[AutoGenerateComponentState]
+[RegisterComponent, Access(typeof(EnergyGunSystem)), AutoGenerateComponentState]
 public sealed partial class EnergyGunComponent : Component
 {
     /// <summary>
     /// A list of the different firing modes the energy gun can switch between
     /// </summary>
-    [DataField("fireModes", required: true)]
-    [AutoNetworkedField]
+    [DataField(required: true), AutoNetworkedField]
     public List<EnergyWeaponFireMode> FireModes = new();
 
     /// <summary>
     /// The currently selected firing mode
     /// </summary>
-    //[DataField("currentFireMode")] // WWDP EDIT - It just doesn't make much sense to make this a datafield. Just put the default firemode first in the FireModes list.
     [AutoNetworkedField]
     public EnergyWeaponFireMode? CurrentFireMode = default!;
 }
@@ -40,7 +36,7 @@ public sealed partial class EnergyWeaponFireMode
     /// <summary>
     /// The battery cost to fire the projectile associated with this firing mode
     /// </summary>
-    [DataField("fireCost")]
+    [DataField]
     public float FireCost = 100;
 
     // WWDP EDIT START
@@ -54,12 +50,12 @@ public sealed partial class EnergyWeaponFireMode
     /// <summary>
     /// The name of the selected firemode
     /// </summary>
-    [DataField("name")]
+    [DataField]
     public string Name = string.Empty;
 
     /// <summary>
     /// What RsiState we use for that firemode if it needs to change.
     /// </summary>
-    [DataField("state")]
+    [DataField]
     public string State = string.Empty;
 }
diff --git a/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs b/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs
index f81828aaf8..c1fa20dab6 100644
--- a/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs
+++ b/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs
@@ -8,11 +8,10 @@ using Content.Shared.Item;
 using Content.Shared.DeltaV.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Prototypes;
-using System.Linq;
-using Content.Shared.Weapons.Ranged.Systems;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared._White.Guns;
 
+// Basically everything in the file was touched by me so no point in WWDP Edit ig
 namespace Content.Server.DeltaV.Weapons.Ranged.Systems;
 
 public sealed class EnergyGunSystem : EntitySystem
@@ -21,66 +20,48 @@ public sealed class EnergyGunSystem : EntitySystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedItemSystem _item = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly GunSystem _gun = default!; // WWDP EDIT
+    [Dependency] private readonly GunSystem _gun = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EnergyGunComponent, ComponentInit>(OnComponentInit); // WWDP EDIT
+        SubscribeLocalEvent<EnergyGunComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<EnergyGunComponent, ActivateInWorldEvent>(OnInteractHandEvent);
         SubscribeLocalEvent<EnergyGunComponent, GetVerbsEvent<Verb>>(OnGetVerb);
         SubscribeLocalEvent<EnergyGunComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(EntityUid uid, EnergyGunComponent component, ExaminedEvent args)
+    private void OnExamined(Entity<EnergyGunComponent> entity, ref ExaminedEvent args)
     {
-        if (component.FireModes == null || component.FireModes.Count < 2)
+        if (entity.Comp.FireModes.Count < 2 ||
+            entity.Comp.CurrentFireMode?.Prototype == null ||
+            !_prototypeManager.TryIndex<EntityPrototype>(entity.Comp.CurrentFireMode.Prototype, out var proto))
             return;
 
-        if (component.CurrentFireMode == null)
-        {
-            SetFireMode(uid, component, component.FireModes.First());
-        }
+        var fireMode = "battery-fire-mode-" + entity.Comp.CurrentFireMode.Name;
+        var mode = Loc.GetString(fireMode);
 
-        if (component.CurrentFireMode?.Prototype == null)
-            return;
-
-        if (!_prototypeManager.TryIndex<EntityPrototype>(component.CurrentFireMode.Prototype, out var proto))
-            return;
-
-        // WWDP edit start - locale
-        var firemode = "battery-fire-mode-" + component.CurrentFireMode.Name;
-        var mode = Loc.GetString(firemode);
-
-        if (component.CurrentFireMode.Name == string.Empty)
+        if (entity.Comp.CurrentFireMode.Name == string.Empty)
             mode = proto.Name;
 
-        var color = "crimson";
-        if (component.CurrentFireMode.Name == "disable")
-            color = "lightblue";
-
-        if (component.CurrentFireMode.Name == "ion")
-            color = "blue";
+        var color = entity.Comp.CurrentFireMode.Name switch
+        {
+            "disable" => "lightblue",
+            "ion" => "blue",
+            _ => "crimson"
+        };
 
         args.PushMarkup(Loc.GetString("energygun-examine-fire-mode", ("mode", mode), ("color", color)));
-        // WWDP edit end
     }
 
-    private void OnGetVerb(EntityUid uid, EnergyGunComponent component, GetVerbsEvent<Verb> args)
+    private void OnGetVerb(Entity<EnergyGunComponent> entity, ref GetVerbsEvent<Verb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.FireModes.Count < 2)
             return;
 
-        if (component.FireModes == null || component.FireModes.Count < 2)
-            return;
-
-        if (component.CurrentFireMode == null)
-        {
-            SetFireMode(uid, component, component.FireModes.First());
-        }
-
-        foreach (var fireMode in component.FireModes)
+        var user = args.User;
+        foreach (var fireMode in entity.Comp.FireModes)
         {
             var entProto = _prototypeManager.Index<EntityPrototype>(fireMode.Prototype);
 
@@ -89,12 +70,12 @@ public sealed class EnergyGunSystem : EntitySystem
                 Priority = 1,
                 Category = VerbCategory.SelectType,
                 Text = entProto.Name,
-                Disabled = fireMode == component.CurrentFireMode,
+                Disabled = fireMode == entity.Comp.CurrentFireMode,
                 Impact = LogImpact.Low,
                 DoContactInteraction = true,
                 Act = () =>
                 {
-                    SetFireMode(uid, component, fireMode, args.User);
+                    SetFireMode(entity, fireMode, user);
                 }
             };
 
@@ -102,100 +83,82 @@ public sealed class EnergyGunSystem : EntitySystem
         }
     }
 
-    // WWDP EDIT START
-    private void OnComponentInit(EntityUid uid, EnergyGunComponent component, ComponentInit args)
+    private void OnComponentStartup(Entity<EnergyGunComponent> entity, ref ComponentStartup args)
     {
-        if(component.FireModes.Count > 0)
-            SetFireMode(uid, component, component.FireModes[0]);
-    }
-    // WWDP EDIT END
-
-    private void OnInteractHandEvent(EntityUid uid, EnergyGunComponent component, ActivateInWorldEvent args)
-    {
-        if (component.FireModes == null || component.FireModes.Count < 2)
-            return;
-
-        CycleFireMode(uid, component, args.User);
-    }
-
-    private void CycleFireMode(EntityUid uid, EnergyGunComponent component, EntityUid user)
-    {
-        int index = (component.CurrentFireMode != null) ?
-            Math.Max(component.FireModes.IndexOf(component.CurrentFireMode), 0) + 1 : 1;
-
-        EnergyWeaponFireMode? fireMode;
-
-        if (index >= component.FireModes.Count)
-        {
-            fireMode = component.FireModes.FirstOrDefault();
-        }
-
+        if (entity.Comp.FireModes.Count == 0)
+            Del(entity); // we can't have energy gun with 0 fire mods
         else
-        {
-            fireMode = component.FireModes[index];
-        }
-
-        SetFireMode(uid, component, fireMode, user);
+            SetFireMode(entity, entity.Comp.FireModes[0]);
     }
 
-    private void SetFireMode(EntityUid uid, EnergyGunComponent component, EnergyWeaponFireMode? fireMode, EntityUid? user = null)
+    private void OnInteractHandEvent(Entity<EnergyGunComponent> entity, ref ActivateInWorldEvent args)
+    {
+        if (entity.Comp.FireModes.Count >= 2)
+            CycleFireMode(entity, args.User);
+    }
+
+    private void CycleFireMode(Entity<EnergyGunComponent> entity, EntityUid user)
+    {
+        var index = entity.Comp.CurrentFireMode != null
+            ? Math.Max(entity.Comp.FireModes.IndexOf(entity.Comp.CurrentFireMode), 0) + 1
+            : 1;
+
+        var fireMode = index >= entity.Comp.FireModes.Count
+            ? entity.Comp.FireModes[0]
+            : entity.Comp.FireModes[index];
+
+        SetFireMode(entity, fireMode, user);
+    }
+
+    private void SetFireMode(Entity<EnergyGunComponent> entity, EnergyWeaponFireMode? fireMode, EntityUid? user = null)
     {
         if (fireMode?.Prototype == null)
             return;
 
-        component.CurrentFireMode = fireMode;
+        entity.Comp.CurrentFireMode = fireMode;
 
-        if (TryComp(uid, out ProjectileBatteryAmmoProviderComponent? projectileBatteryAmmoProvider))
+        if (!TryComp(entity, out ProjectileBatteryAmmoProviderComponent? projectileBatteryAmmoProvider) ||
+            !_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var prototype))
+            return;
+
+        projectileBatteryAmmoProvider.Prototype = fireMode.Prototype;
+        projectileBatteryAmmoProvider.FireCost = fireMode.FireCost;
+        if (TryComp<GunFluxComponent>(entity, out var overheat))
         {
-            if (!_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var prototype))
-                return;
+            overheat.HeatCost = fireMode.HeatCost;
+            Dirty(entity, overheat);
+        }
 
-            projectileBatteryAmmoProvider.Prototype = fireMode.Prototype;
-            projectileBatteryAmmoProvider.FireCost = fireMode.FireCost;
-            // WWDP EDIT START
-            if (TryComp<GunFluxComponent>(uid, out var overheat))
-            {
-                overheat.HeatCost = fireMode.HeatCost;
-                Dirty(uid, overheat);
-            }
-            _gun.UpdateShots(uid, projectileBatteryAmmoProvider);
+        _gun.UpdateShots(entity, projectileBatteryAmmoProvider);
 
-            if (user != null)
-            {
-                var firemode = "battery-fire-mode-" + fireMode.Name;
-                var mode = Loc.GetString(firemode);
+        if (user != null)
+        {
+            var fireModeName = "battery-fire-mode-" + fireMode.Name;
+            var mode = Loc.GetString(fireModeName);
 
-                if (fireMode.Name == string.Empty)
-                    mode = prototype.Name;
+            if (fireMode.Name == string.Empty)
+                mode = prototype.Name;
 
-                _popupSystem.PopupEntity(Loc.GetString("gun-set-fire-mode", ("mode", mode)), uid, user.Value);
-            }
-            // WWDP EDIT END
+            _popupSystem.PopupEntity(Loc.GetString("gun-set-fire-mode", ("mode", mode)), entity, user.Value);
+        }
 
-            if (component.CurrentFireMode.State == string.Empty)
-                return;
+        if (entity.Comp.CurrentFireMode.State == string.Empty ||
+            !HasComp<AppearanceComponent>(entity) ||
+            !TryComp<ItemComponent>(entity, out var item))
+            return;
 
-            if (TryComp<AppearanceComponent>(uid, out var _) && TryComp<ItemComponent>(uid, out var item))
-            {
-                _item.SetHeldPrefix(uid, component.CurrentFireMode.State, false, item);
-                switch (component.CurrentFireMode.State)
-                {
-                    case "disabler":
-                        UpdateAppearance(uid, EnergyGunFireModeState.Disabler);
-                        break;
-                    case "lethal":
-                        UpdateAppearance(uid, EnergyGunFireModeState.Lethal);
-                        break;
-                    case "special":
-                        UpdateAppearance(uid, EnergyGunFireModeState.Special);
-                        break;
-                }
-            }
+        _item.SetHeldPrefix(entity, entity.Comp.CurrentFireMode.State, false, item);
+        switch (entity.Comp.CurrentFireMode.State)
+        {
+            case "disabler":
+                _appearance.SetData(entity, EnergyGunFireModeVisuals.State, EnergyGunFireModeState.Disabler);
+                break;
+            case "lethal":
+                _appearance.SetData(entity, EnergyGunFireModeVisuals.State, EnergyGunFireModeState.Lethal);
+                break;
+            case "special":
+                _appearance.SetData(entity, EnergyGunFireModeVisuals.State, EnergyGunFireModeState.Special);
+                break;
         }
     }
-
-    private void UpdateAppearance(EntityUid uid, EnergyGunFireModeState state)
-    {
-        _appearance.SetData(uid, EnergyGunFireModeVisuals.State, state);
-    }
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 1b68338eca..556bbd37f6 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -291,7 +291,7 @@ public sealed partial class ExplosionSystem
 
             // finally check if the new tile is itself an edge tile
             if (IsEdge(grid, change.GridIndices, out var spaceDir))
-                edges.Add(change.GridIndices, spaceDir);
+                edges.TryAdd(change.GridIndices, spaceDir);
         }
     }
 
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index e7e530fa5d..8b89d23c4c 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -220,19 +220,19 @@ public abstract class SharedStationSpawningSystem : EntitySystem
             foreach (var (slot, entProtoId) in subGearProto.Equipment)
             {
                 // Don't remove items in pockets, instead put them in the backpack or hands
-                if ((slot == "pocket1" || slot == "pocket2") &&
-                    newStartingGear.Equipment.TryGetValue(slot, out var pocketValue))
-                {
-                    var pocketProtoId = pocketValue;
 
+                if (slot is "pocket1" or "pocket2" && newStartingGear.Equipment.TryGetValue(slot, out var pocket))
+                {
                     if (string.IsNullOrEmpty(newStartingGear.GetGear("back")))
-                        newStartingGear.Inhand.Add(pocketProtoId);
+                        newStartingGear.Inhand.Add(pocket);
                     else
                     {
                         if (!newStartingGear.Storage.ContainsKey("back"))
                             newStartingGear.Storage["back"] = new();
-                        newStartingGear.Storage["back"].Add(pocketProtoId);
+                        newStartingGear.Storage["back"].Add(pocket);
                     }
+
+                    continue;
                 }
 
                 newStartingGear.Equipment[slot] = entProtoId;
diff --git a/Content.Shared/_White/Guns/GunTemperatureRegulatorComponent.cs b/Content.Shared/_White/Guns/GunTemperatureRegulatorComponent.cs
index 6cb6f434bc..7fd4398a19 100644
--- a/Content.Shared/_White/Guns/GunTemperatureRegulatorComponent.cs
+++ b/Content.Shared/_White/Guns/GunTemperatureRegulatorComponent.cs
@@ -1,6 +1,3 @@
-using Content.Shared.Atmos;
-using Content.Shared.Traits.Assorted.Components;
-using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
@@ -9,15 +6,9 @@ namespace Content.Shared._White.Guns;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
 public sealed partial class GunFluxComponent : Component
 {
-    /// <summary>
-    /// If enabled, prevents the gun from shooting if its hotter than <see cref="TemperatureLimit"/>
-    /// </summary>
     [DataField, AutoNetworkedField]
     public bool SafetyEnabled = true;
 
-    /// <summary>
-    /// If enabled, allows the user to change <see cref="TemperatureLimit"/> and <see cref="SafetyEnabled"/> via altverbs.
-    /// </summary>
     [DataField, AutoNetworkedField]
     public bool CanChangeSafety = true;
 
diff --git a/Resources/Maps/_White/DryDock.yml b/Resources/Maps/_White/DryDock.yml
index c0262f130e..e4fdf3ca85 100644
--- a/Resources/Maps/_White/DryDock.yml
+++ b/Resources/Maps/_White/DryDock.yml
@@ -48,7 +48,7 @@ tilemap:
   62: FloorPlastic
   9: FloorRGlass
   19: FloorReinforced
-  38: FloorReinforcedGlassFrame
+  38: FloorReinforcedGlassFrameDark
   27: FloorShuttleBlack
   25: FloorShuttleBlue
   45: FloorShuttleGrey
diff --git a/Resources/Maps/_White/WonderBox.yml b/Resources/Maps/_White/WonderBox.yml
index 6c26de30d8..a43b190266 100644
--- a/Resources/Maps/_White/WonderBox.yml
+++ b/Resources/Maps/_White/WonderBox.yml
@@ -59,7 +59,7 @@ tilemap:
   107: FloorSteelOffset
   108: FloorSteelPavement
   110: FloorSteelPavementVertical
-  7: FloorTileSterileWhite
+  7: FloorSterileWhite
   8: FloorSterile
   114: FloorTechMaint3
   21: FloorTechMaintDark
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 614a69f290..26d3d5f23d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -64,6 +64,8 @@
           Disabler: { state: mode-disabler }
           Lethal: { state: mode-lethal }
           Special: { state: mode-stun } # Unused
+  - type: GunFlux
+    heatCost: 20
 
 - type: entity
   name: x-01 multiphase energy gun
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
index 90ae852372..7d7661bd5d 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
@@ -79,13 +79,14 @@
     outerClothing: ClothingOuterArmorBasicSlim
     id: PassengerPDA
     belt: ClothingBeltHolster
+  inhand:
+    - BaseBallBat
   storage:
     back:
-    - DrinkWhiskeyBottleFull # WD EDIT: BoxSurvival -> DrinkWhiskeyBottleFull
+    - DrinkWhiskeyBottleFullMobster # WD EDIT: BoxSurvival -> DrinkWhiskeyBottleFullMobster
     - WeaponSubMachineGunTypewriter
     - WeaponPistolViperWood
     - MagazinePistol
-    - BaseBallBat
 
 - type: startingGear
   id: MobsterGearAlt
@@ -99,10 +100,11 @@
     id: PassengerPDA
     belt: ClothingBeltSuspendersBlack
     pocket1: CombatKnife
+  inhand:
+  - BaseBallBat
   storage:
     back:
-    - DrinkWhiskeyBottleFull # WD EDIT: BoxSurvival -> DrinkWhiskeyBottleFull
+    - DrinkWhiskeyBottleFullMobster # WD EDIT: BoxSurvival -> DrinkWhiskeyBottleFullMobster
     - WeaponSubMachineGunTypewriter
     - WeaponPistolViperWood
     - MagazinePistol
-    - BaseBallBat
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index ffdb74c73d..c38adf75cd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -134,12 +134,12 @@
         sizeMaps:
           32:
             sprite: _White/Mobs/Species/Reptilian/displacement.rsi
-            state: jumpsuit
+            state: jumpsuit-digi
       shoes:
         sizeMaps:
           32:
             sprite: _White/Mobs/Species/Reptilian/displacement.rsi
-            state: shoes
+            state: shoes-digi
     # WD EDIT END
 
 - type: entity
@@ -203,12 +203,12 @@
         sizeMaps:
           32:
             sprite: _White/Mobs/Species/Reptilian/displacement.rsi
-            state: jumpsuit
+            state: jumpsuit-digi
       shoes:
         sizeMaps:
           32:
             sprite: _White/Mobs/Species/Reptilian/displacement.rsi
-            state: shoes
+            state: shoes-digi
     # WD EDIT END
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index f219f46fe0..196519e8a6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -505,6 +505,15 @@
     sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
   - type: Sealable
 
+- type: entity
+  parent: DrinkWhiskeyBottleFull
+  id: DrinkWhiskeyBottleFullMobster
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
   id: DrinkWineBottleFull
diff --git a/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml b/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
index 930b9c4926..73a2e35855 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
@@ -25,6 +25,7 @@
   - type: ProximityDetector
     range: 12
     criteria:
+      requireAll: true
       components:
       - Spectral # reacts to AI eye, intentional
   - type: Beeper
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index 4cb910e044..7b9209d5b4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -53,6 +53,7 @@
   - type: ProximityDetector
     range: 20
     criteria:
+      requireAll: true
       components:
       - Anomaly
   - type: Beeper
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index da64eda2b4..420eb68c8d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -273,9 +273,7 @@
     startingCharge: 500
   # WD EDIT START
   - type: GunFlux #eee
-    requiresLamp: false
     canChangeSafety: false
-    temperatureLimit: 125
   - type: Construction
     graph: MakeshiftLaserGraph
     node: laser
@@ -491,7 +489,6 @@
     startingCharge: 40000
   # WD EDIT START
   - type: GunFlux #eee
-    temperatureLimit: 4500
     heatCost: 100
   - type: Item # Guns resize
     size: Huge
@@ -624,7 +621,6 @@
   - type: Appearance
   # WD EDIT START
   - type: GunFlux #eee
-    temperatureLimit: 650
     heatCost: 100
   - type: Item # Guns resize
     size: Huge
@@ -962,7 +958,6 @@
     weight: 0.0002 # 5,000 times less likely than 1 regular animal
     # not putting a BlockMovement component here cause that's funny.
   - type: GunFlux #eee # wwdp
-    temperatureLimit: 200
     heatCost: 35
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index dc16fd78af..95df47e97d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -965,9 +965,6 @@
     # .35 Caseless (Civilian) Rifle
     # - MagazineCaselessRifleShortPractice # EE
     # - MagazineCaselessRifleShort # EE
-    # .35 Caseless (Military) Rifle
-    # - MagazineCaselessRiflePractice # EE
-    # - MagazineCaselessRifle # EE
     # .35 Caseless (Box Mag) Rifle
     # - MagazineBoxCaselessRiflePractice # EE
     # - MagazineBoxCaselessRifle # EE
@@ -1032,6 +1029,8 @@
     - MagazineLightRifleMarkOneEmpty
     - MagazineLightRifleMarkOne
     dynamicRecipes:
+    - MagazineCaselessRiflePractice
+    - MagazineCaselessRifle
     - Truncheon
     - Terminus
     - BoxShotgunIncendiary
@@ -1181,7 +1180,9 @@
     - BoxBreach
     - ShellShotgunBreach
     - WeaponSecurityRiotLauncher
+    - SmallBasicFluxCore
     - BasicFluxCore
+    - SmallAdvancedFluxCore
     - AdvancedFluxCore
     # WD EDIT END
   - type: MaterialStorage
@@ -1252,15 +1253,16 @@
     # .35 Caseless (Civilian) Rifle
     # - MagazineCaselessRifleShortPractice # EE
     # - MagazineCaselessRifleShort # EE
-    # .35 Caseless (Military) Rifle
-    # - MagazineCaselessRiflePractice # EE
-    # - MagazineCaselessRifle # EE
     # .35 Caseless (Box Mag) Rifle
     # - MagazineBoxCaselessRiflePractice # EE
     # - MagazineBoxCaselessRifle # EE
     # WD EDIT END
     - MagazineLightRifleMarkOneEmpty
     - MagazineLightRifleMarkOne
+    dynamicRecipes:
+    # .35 Caseless (Military) Rifle
+    - MagazineCaselessRiflePractice # EE
+    - MagazineCaselessRifle # EE
   - type: MaterialStorage
     whitelist:
       tags:
diff --git a/Resources/Prototypes/Maps/Wonderbox.yml b/Resources/Prototypes/Maps/Wonderbox.yml
index 45bb348e27..a18d6e4312 100644
--- a/Resources/Prototypes/Maps/Wonderbox.yml
+++ b/Resources/Prototypes/Maps/Wonderbox.yml
@@ -68,6 +68,3 @@
             Musician: [ 1, 1 ]
             Reporter: [ 2, 2 ]
             Passenger: [ -1, -1 ]
-            Hobo: [ 1, 1 ]
-
-
diff --git a/Resources/Prototypes/Maps/gaxstation.yml b/Resources/Prototypes/Maps/gaxstation.yml
index dd4aa772d0..c90c4c025c 100644
--- a/Resources/Prototypes/Maps/gaxstation.yml
+++ b/Resources/Prototypes/Maps/gaxstation.yml
@@ -44,7 +44,6 @@
             ResearchDirector: [ 1, 1 ]
             ForensicMantis: [ 1, 1 ]
             Scientist: [ 4, 4 ]
-            Roboticist: [ 1, 2 ]
             Librarian: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             ResearchAssistant: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 02204d6e85..6c42a0d068 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -49,7 +49,6 @@
           Scientist: [ 5, 7 ]
           ResearchAssistant: [ 3, 6 ]
           Chaplain: [ 1, 1 ]
-          Roboticist: [ 1, 2 ]
           ForensicMantis: [ 1, 1 ]
           # SeniorResearcher: [ 1, 1 ] - WD EDIT
           #security
@@ -62,7 +61,7 @@
           # Brigmedic: [ 1, 1 ] - WD EDIT
           Prisoner: [ 1, 2 ]
           # PrisonGuard: [ 1, 1 ] # EE: Disabled
-          SeniorOfficer: [ 1, 1 ]
+          # SeniorOfficer: [ 1, 1 ]  - WD EDIT
           #supply
           Quartermaster: [ 1, 1 ]
           SalvageSpecialist: [ 3, 3 ]
diff --git a/Resources/Prototypes/_White/Body/Parts/prosthetic.yml b/Resources/Prototypes/_White/Body/Parts/prosthetic.yml
index 89825b83c2..7ba81705fb 100644
--- a/Resources/Prototypes/_White/Body/Parts/prosthetic.yml
+++ b/Resources/Prototypes/_White/Body/Parts/prosthetic.yml
@@ -12,7 +12,7 @@
     node: makeshiftrightleg
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
+      Steel: 300
       Cloth: 300
       Wood: 300
       Copper: 300
@@ -20,7 +20,7 @@
       Iron: 36
       Carbon: 4
       Copper: 30
-      Fiber: 60
+      Fiber: 40
 
 - type: entity
   parent: LeftLegCybernetic
@@ -36,7 +36,7 @@
     node: makeshiftleftleg
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
+      Steel: 300
       Cloth: 300
       Wood: 300
       Copper: 300
@@ -44,7 +44,7 @@
       Iron: 36
       Carbon: 4
       Copper: 30
-      Fiber: 60
+      Fiber: 40
 
 - type: entity
   parent: RightArmCybernetic
@@ -57,9 +57,9 @@
     node: makeshiftrightarm
   - type: PhysicalComposition
     materialComposition:
-      Steel: 600
-      Cloth: 500
-      Copper: 450
+      Steel: 400
+      Cloth: 400
+      Copper: 250
     chemicalComposition:
       Iron: 54
       Carbon: 6
@@ -77,9 +77,9 @@
     node: makeshiftleftarm
   - type: PhysicalComposition
     materialComposition:
-      Steel: 600
-      Cloth: 500
-      Copper: 450
+      Steel: 400
+      Cloth: 300
+      Copper: 250
     chemicalComposition:
       Iron: 54
       Carbon: 6