PR Review fulfillments

Content.IntegrationTests/Tests/_DV/MappingCategoryTest.cs

@@ -78,11 +78,12 @@ public sealed class MappingCategoryTest : GameTest
                         var ent = (uid, comp);
                         Assert.That(catSys.CanMap(ent, allowed), $"Entity {entMan.ToPrettyString(uid)} cannot be mapped on {rootedPath}");
                     }
-                    //
-                    // foreach (var uid in maps)
-                    // {
-                    //     entMan.DeleteEntity(uid);
-                    // }
+
+                    foreach (var uid in maps)
+                    {
+                        maps.Remove(uid);
+                        entMan.DeleteEntity(uid);
+                    }
                 }
             });
         });

Content.Server/Voting/Managers/VoteManager.cs

@@ -90,11 +90,6 @@ namespace Content.Server.Voting.Managers
 
         private void PlayerManagerOnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
         {
-            // Delta V - Begin checking and blocking Dummy Sessions (or a certain stupid name)
-            if (e.Session.Channel.UserName.Contains("integration_dummy_"))
-                return;
-            // Delta V - End... Yes it's not good looking, but got no access to DummySession
-
             if (e.NewStatus == SessionStatus.InGame)
             {
                 // Send current votes to newly connected players.

Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs

@@ -415,11 +415,6 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool CanOpen(EntityUid user, EntityUid target, bool silent = false, EntityStorageComponent? component = null)
     {
-        // Delta V - Begin premature stop in case we try to open a person or entity
-        if (!HasComp<EntityStorageComponent>(target))
-            return false;
-        // Delta V - End premature stop in case we try to open a person or entity
-
         if (!Resolve(target, ref component))
             return false;
 

Content.Shared/_Goobstation/Fishing/Systems/SharedFishingSystem.cs

@@ -350,7 +350,7 @@ public abstract class SharedFishingSystem : EntitySystem
             var targetCoords = Xform.GetMapCoordinates(Transform(attachedEnt));
             var playerCoords = Xform.GetMapCoordinates(Transform(player));
             // var rand = new System.Random((int) Timing.CurTick.Value); // evil random prediction hack // Delta V - No idea, commenting out for now
-            var rand = SharedRandomExtensions.PredictedRandom(Timing, GetNetEntity(ent));
+            var rand = SharedRandomExtensions.PredictedRandom(Timing, GetNetEntity(ent)); // Delta V - Replaced with SharedRandomExtensions
 
             // Calculate throw direction
             var direction = (playerCoords.Position - targetCoords.Position) * rand.NextFloat(0.2f, 0.85f);

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -372,13 +372,13 @@
           Log:
             min: 2
             max: 8
-            # Delta V Commented out until we need it again (currently tests hate it)
+      # Delta V - Begin Comment out => Causes test fails since they spawn with weapons which upon removal count against the asserts.
 #      - !type:SpawnEntitiesBehavior
 #        spawn:
 #          MobChristmasKobold:
 #            min: 4
 #            max: 8
-      # End Delta V - Spawn Christmas kobold.
+      # End Delta V - End Comment
 
 - type: entity
   parent: FloraTreeChristmas02

Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml

@@ -370,22 +370,22 @@
       shader: unshaded
     - state: refill_sec
 
-#- type: entity
-#  abstract: true # DeltaV: Salvage vendor doesn't have stock anymore
-#  parent: BaseVendingMachineRestock
-#  id: VendingMachineRestockSalvageEquipment
-#  name: Salvage Vendor restock box
-#  description: Strike the earth ere the space carp nip your behind! Slam into a salvage vendor to begin.
-#  components:
-#  - type: VendingMachineRestock
-#    canRestock:
-#    - SalvageEquipmentInventory
-#  - type: Sprite
-#    layers:
-#    - state: base
-#    - state: green_bit
-#      shader: unshaded
-#    - state: refill_salvage
+- type: entity
+  abstract: true # DeltaV: Salvage vendor doesn't have stock anymore
+  parent: BaseVendingMachineRestock
+  id: VendingMachineRestockSalvageEquipment
+  name: Salvage Vendor restock box
+  description: Strike the earth ere the space carp nip your behind! Slam into a salvage vendor to begin.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - SalvageEquipmentInventory
+  - type: Sprite
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_salvage
 
 - type: entity
   parent: BaseVendingMachineRestock

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -167,16 +167,6 @@
     head: ClothingHeadHatGladiator
     shoes: ClothingShoesCult
 
-#Ash Walker
-- type: startingGear
-  id: AshWalker
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitGladiator
-    outerClothing: ClothingOuterArmorBone
-    back: SpearBone
-    head: ClothingHeadHelmetBone
-    shoes: ClothingShoesCult
-
 #Banana Clown
 - type: startingGear
   id: BananaClown

Resources/Prototypes/_DV/Body/Organs/ashwalker.yml

@@ -1,8 +0,0 @@
-#- type: entity
-#  parent: OrganAnimalLungs
-#  id: OrganAshWalkerLungs
-#  name: ashwalker lungs
-#  description: These lungs are adapted from isolation in lavaland, capable of withstanding the low oxygen content and ash storms.
-#  components:
-#  - type: Lung
-#    saturationLoss: 0.5

Resources/Prototypes/_DV/Body/Prototypes/ashwalker.yml

@@ -1,49 +0,0 @@
-#- type: body
-#  name: ashwalker
-#  id: AshWalker
-#  root: torso
-#  slots:
-#    head:
-#      part: HeadReptilian
-#      connections:
-#      - torso
-#      organs:
-#        brain: OrganHumanBrain
-#        eyes: OrganHumanEyes
-#    torso:
-#      part: TorsoReptilian
-#      organs:
-#        heart: OrganAnimalHeart
-#        lungs: OrganAshWalkerLungs
-#        stomach: OrganReptilianStomach
-#        liver: OrganAnimalLiver
-#        kidneys: OrganHumanKidneys
-#      connections:
-#      - right arm
-#      - left arm
-#      - right leg
-#      - left leg
-#    right arm:
-#      part: RightArmReptilian
-#      connections:
-#      - right hand
-#    left arm:
-#      part: LeftArmReptilian
-#      connections:
-#      - left hand
-#    right hand:
-#      part: RightHandReptilian
-#    left hand:
-#      part: LeftHandReptilian
-#    right leg:
-#      part: RightLegReptilian
-#      connections:
-#      - right foot
-#    left leg:
-#      part: LeftLegReptilian
-#      connections:
-#      - left foot
-#    right foot:
-#      part: RightFootReptilian
-#    left foot:
-#      part: LeftFootReptilian

Resources/Prototypes/_DV/Entities/Mobs/Species/ashwalker.yml

@@ -1,10 +0,0 @@
-#- type: entity
-#  save: false
-#  parent: MobReptilian
-#  id: MobAshWalker
-#  name: Urist McAsh
-#  suffix: ""
-#  components:
-#  - type: Body
-#    prototype: AshWalker
-#  - type: AshStormImmune

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

@@ -6,7 +6,7 @@
   components:
   - type: ApcPowerReceiver
     powerLoad: 500
-  # Delta V - Begin Changing PowerState here for Tests. IdlePowerDraw can't be less than APCPowerReceiver.
+  # Delta V - Begin Set idlePowerDraw to initial Powerload
   - type: PowerState
     idlePowerDraw: 500
     workingPowerDraw: 1000
@@ -55,7 +55,7 @@
   components:
   - type: ApcPowerReceiver
     powerLoad: 500
-  # Delta V - Begin Changing PowerState here for Tests. IdlePowerDraw can't be less than APCPowerReceiver.
+  # Delta V - Begin Set idlePowerDraw to initial Powerload
   - type: PowerState
     idlePowerDraw: 500
     workingPowerDraw: 1000