Fix merge issues.

cosmatic-drift-14 · Oct 30, 2024 · 3772f17 · 3772f17
1 parent 7c3a54b
commit 3772f17
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 44 deletions.
diff --git a/Content.IntegrationTests/Tests/StackTest.cs b/Content.IntegrationTests/Tests/StackTest.cs
@@ -26,8 +26,8 @@ await Assert.MultipleAsync(async () =>
                 ItemComponent? itemComponent = null;
                 await server.WaitPost(() =>
                 {
-                    entity.TryGetComponent(out stackComponent, compFact);
-                    entity.TryGetComponent(out itemComponent, compFact);
+                    entity.Item1.TryGetComponent(out itemComponent, compFact);
+                    entity.Item1.TryGetComponent(out itemComponent, compFact);
                 });
                 if (stackComponent == null || itemComponent == null)
                     continue;
@@ -37,7 +37,7 @@ await server.WaitPost(() =>
                     continue;
 
                 var expectedSize = stackProto.ItemSize * stackComponent.Count;
-                Assert.That(itemComponent.Size, Is.EqualTo(expectedSize), $"Prototype id: {entity.ID} has an item size of {itemComponent.Size} but expected size of {expectedSize}.");
+                Assert.That(itemComponent.Size, Is.EqualTo(expectedSize), $"Prototype id: {entity.Item1.ID} has an item size of {itemComponent.Size} but expected size of {expectedSize}.");
             }
         });
 

diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -62,7 +62,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
-        SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnEmoteAttempt);
+        // SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnEmoteAttempt); CD: Disable
     }
 
     private void OnUnbuckleAttempt(Entity<SleepingComponent> ent, ref UnbuckleAttemptEvent args)
@@ -316,10 +316,10 @@ public bool TryWaking(Entity<SleepingComponent?> ent, bool force = false, Entity
     /// <summary>
     /// Prevents the use of emote actions while sleeping
     /// </summary>
-    public void OnEmoteAttempt(Entity<SleepingComponent> ent, ref EmoteAttemptEvent args)
-    {
-        args.Cancel();
-    }
+    // public void OnEmoteAttempt(Entity<SleepingComponent> ent, ref EmoteAttemptEvent args)
+    // {
+    //     args.Cancel();
+    // }
 }
 
 

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -986,7 +986,7 @@ public void InteractUsing(
             bool checkCanUse = true)
         {
             if (IsDeleted(user) || IsDeleted(used) || IsDeleted(target))
-                return false;
+                return;
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
                 return;
@@ -1000,7 +1000,7 @@ public void InteractUsing(
                 $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target} using {ToPrettyString(used):used}");
 
             if (RangedInteractDoBefore(user, used, target, clickLocation, canReach: true, checkDeletion: false))
-                return true;
+                return;
 
             DebugTools.Assert(!IsDeleted(user) && !IsDeleted(used) && !IsDeleted(target));
             // all interactions should only happen when in range / unobstructed, so no range check is needed
@@ -1013,10 +1013,10 @@ public void InteractUsing(
                 return;
 
             if (InteractDoAfter(user, used, target, clickLocation, canReach: true, checkDeletion: false))
-                return true;
+                return;
 
             DebugTools.Assert(!IsDeleted(user) && !IsDeleted(used) && !IsDeleted(target));
-            return false;
+            return;
         }
 
         /// <summary>
@@ -1045,10 +1045,10 @@ public bool InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, E
             }
 
             if (afterInteractEvent.Handled)
-                return;
+                return false;
 
             if (target == null)
-                return;
+                return false;
 
             DebugTools.Assert(!IsDeleted(user) && !IsDeleted(used) && !IsDeleted(target));
             var afterInteractUsingEvent = new AfterInteractUsingEvent(user, used, target, clickLocation, canReach);

diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -61,7 +61,6 @@
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Item
-    size: Small
     heldPrefix: lungs
 
 - type: entity
@@ -90,7 +89,6 @@
     - id: Food
     - id: Drink
   - type: Item
-    size: Small
     heldPrefix: stomach
 
 - type: entity
@@ -104,7 +102,6 @@
       stomach:
         maxVol: 30
   - type: Item
-    size: Small
     heldPrefix: stomach
 
 - type: entity
@@ -123,7 +120,6 @@
     - id: Alcohol
       rateModifier: 0.1
   - type: Item
-    size: Small
     heldPrefix: liver
 
 - type: entity
@@ -143,7 +139,6 @@
     - id: Poison
     - id: Narcotic
   - type: Item
-    size: Small
     heldPrefix: heart
 
 - type: entity
@@ -162,5 +157,4 @@
     metabolizerTypes: [ Animal ]
     removeEmpty: true
   - type: Item
-    size: Small
     heldPrefix: kidneys
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -35,7 +35,6 @@
     sprite: Mobs/Species/Arachnid/organs.rsi
     state: stomach
   - type: Item
-    size: Small
     heldPrefix: stomach
   - type: Stomach
     updateInterval: 1.5
@@ -95,7 +94,6 @@
   - type: Sprite
     state: heart-on
   - type: Item
-    size: Small
     heldPrefix: heart
   - type: Metabolizer
     updateInterval: 1.5
@@ -114,7 +112,6 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Item
-    size: Small
     heldPrefix: liver
   - type: Sprite
     state: liver
@@ -139,7 +136,6 @@
       - state: kidney-r
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Item
-    size: Small
     heldPrefix: kidneys
   - type: Metabolizer
     updateInterval: 1.5
@@ -158,7 +154,6 @@
       - state: eyeball-l
       - state: eyeball-r
   - type: Item
-    size: Small
     heldPrefix: eyeballs
 
 - type: entity

diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
@@ -32,7 +32,6 @@
   description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
   components:
   - type: Item
-    size: Small
     heldPrefix: brain
   - type: Sprite
     state: brain
@@ -94,7 +93,6 @@
       - id: Alcohol
         rateModifier: 0.1
   - type: Item
-    size: Small
     heldPrefix: stomach
 
 - type: entity
@@ -106,7 +104,6 @@
   - type: Sprite
     state: lungs
   - type: Item
-    size: Small
     heldPrefix: lungs
   - type: Lung 
   - type: Metabolizer

diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
@@ -72,7 +72,6 @@
       Burger: Brain
       Taco: Brain
   - type: Item
-    size: Small
     heldPrefix: brain
 
 - type: entity
@@ -86,7 +85,6 @@
       - state: eyeball-l
       - state: eyeball-r
   - type: Item
-    size: Small
     heldPrefix: eyeballs
 
 - type: entity
@@ -129,7 +127,6 @@
       - state: lung-l
       - state: lung-r
   - type: Item
-    size: Small
     heldPrefix: lungs
   - type: Lung
   - type: Metabolizer
@@ -174,7 +171,6 @@
     - id: Poison
     - id: Narcotic
   - type: Item
-    size: Small
     heldPrefix: heart
 
 - type: entity
@@ -186,7 +182,6 @@
   - type: Sprite
     state: stomach
   - type: Item
-    size: Small
     heldPrefix: stomach
   - type: SolutionContainerManager
     solutions:
@@ -218,7 +213,6 @@
   - type: Sprite
     state: liver
   - type: Item
-    size: Small
     heldPrefix: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     maxReagents: 1
@@ -238,7 +232,6 @@
       - state: kidney-l
       - state: kidney-r
   - type: Item
-    size: Small
     heldPrefix: kidneys
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer

diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
@@ -34,7 +34,6 @@
           - ReagentId: Slime
             Quantity: 10
     - type: Item
-      size: Small
       heldPrefix: brain
 
 
@@ -74,5 +73,4 @@
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Item
-    size: Small
     heldPrefix: lungs
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
@@ -11,5 +11,4 @@
   - type: Lung
     alert: LowNitrogen
   - type: Item
-    size: Small
     heldPrefix: lungs
diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
@@ -33,7 +33,6 @@
     fiberColor: fibers-white
   - type: DnaSubstanceTrace
   - type: Item
-    size: Small
 
 - type: entity
   id: TowelColorWhite

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -111,9 +111,7 @@
     layers:
     - state: syringe_gun
   - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,2,0
+    capacity: 20
     whitelist:
       tags:
       - SyringeGunAmmo
@@ -131,7 +129,7 @@
   - type: ContainerAmmoProvider
     container: storagebase
   - type: Item
-    size: Normal
+    size: 30
   - type: ContainerContainer
     containers:
       storagebase: !type:Container

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -78,7 +78,7 @@
     - BoxDonkSoftBox
     - BoxCartridgeCap
     - BeachBall
-    - CandyBucket
+    # - CandyBucket
     - CrayonBox
     - ClothingHeadHatCowboyRed
     - FoamCrossbow