From 3772f17c39accb7857136992ec3897df5671e880 Mon Sep 17 00:00:00 2001 From: Timothy Lowe Date: Wed, 30 Oct 2024 13:53:27 -0700 Subject: [PATCH] Fix merge issues. --- Content.IntegrationTests/Tests/StackTest.cs | 6 +++--- Content.Shared/Bed/Sleep/SleepingSystem.cs | 10 +++++----- .../Interaction/SharedInteractionSystem.cs | 12 ++++++------ Resources/Prototypes/Body/Organs/Animal/animal.yml | 6 ------ Resources/Prototypes/Body/Organs/arachnid.yml | 5 ----- Resources/Prototypes/Body/Organs/diona.yml | 3 --- Resources/Prototypes/Body/Organs/human.yml | 7 ------- Resources/Prototypes/Body/Organs/slime.yml | 2 -- Resources/Prototypes/Body/Organs/vox.yml | 1 - .../Prototypes/Entities/Clothing/Multiple/towel.yml | 1 - .../Objects/Weapons/Guns/pneumatic_cannon.yml | 6 ++---- .../Structures/Machines/Computers/arcades.yml | 2 +- 12 files changed, 17 insertions(+), 44 deletions(-) diff --git a/Content.IntegrationTests/Tests/StackTest.cs b/Content.IntegrationTests/Tests/StackTest.cs index dcae089bbb..3d001fdf25 100644 --- 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 index 6a04bfe42d..defb78deb7 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -62,7 +62,7 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnUnbuckleAttempt); - SubscribeLocalEvent(OnEmoteAttempt); + // SubscribeLocalEvent(OnEmoteAttempt); CD: Disable } private void OnUnbuckleAttempt(Entity ent, ref UnbuckleAttemptEvent args) @@ -316,10 +316,10 @@ public bool TryWaking(Entity ent, bool force = false, Entity /// /// Prevents the use of emote actions while sleeping /// - public void OnEmoteAttempt(Entity ent, ref EmoteAttemptEvent args) - { - args.Cancel(); - } + // public void OnEmoteAttempt(Entity ent, ref EmoteAttemptEvent args) + // { + // args.Cancel(); + // } } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 6429867a2a..7e2d310960 100644 --- 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; } /// @@ -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 index e59aad9da3..aff180988b 100644 --- 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 index c7542ae111..64a22c328f 100644 --- 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 index bf865a07fd..6e8197ec39 100644 --- 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 index cb1492b8a6..634e893707 100644 --- 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 index ca22d25423..7ab3de833c 100644 --- 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 index 70e0783271..f99de2c77c 100644 --- 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 index d3f7dc480c..ded0feab77 100644 --- 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 index bf149e5c62..5574bfb263 100644 --- 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 index d7f0297101..83acff60fa 100644 --- 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