diff --git a/Content.IntegrationTests/Tests/StackTest.cs b/Content.IntegrationTests/Tests/StackTest.cs index a34dd7e53d..f991a5a5e5 100644 --- a/Content.IntegrationTests/Tests/StackTest.cs +++ b/Content.IntegrationTests/Tests/StackTest.cs @@ -19,7 +19,7 @@ public sealed class StackTest Assert.Multiple(() => { - foreach (var entity in PoolManager.GetPrototypesWithComponent(server)) + foreach (var entity in pair.GetPrototypesWithComponent()) { if (!entity.TryGetComponent(out var stackComponent, compFact) || !entity.TryGetComponent(out var itemComponent, compFact)) diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs index a164a19746..647667ef64 100644 --- a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs +++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs @@ -228,13 +228,13 @@ namespace Content.Server.Psionics.Glimmer public void BeamRandomNearProber(EntityUid prober, int targets, float range = 10f) { List targetList = new(); - foreach (var target in _entityLookupSystem.GetComponentsInRange(Transform(prober).Coordinates, range)) + foreach (var target in _entityLookupSystem.GetComponentsInRange(_transformSystem.GetMapCoordinates(prober), range)) { if (target.AllowedEffects.Contains("Electrocution")) targetList.Add(target.Owner); } - foreach(var reactive in _entityLookupSystem.GetComponentsInRange(Transform(prober).Coordinates, range)) + foreach(var reactive in _entityLookupSystem.GetComponentsInRange(_transformSystem.GetMapCoordinates(prober), range)) { targetList.Add(reactive.Owner); } diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index f2e40ad9c6..3c99036be5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -577,7 +577,7 @@ defaultRotation: 0 horizontalRotation: 0 - type: Item - size: Ginormous + size: 100 # Did I randomly decide this? Yes. Yes I did. - type: GhostRole prob: 1 name: ghost-role-information-Cak-name diff --git a/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml b/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml index 2e19d0ba19..6427cc81eb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml @@ -62,5 +62,5 @@ paper_label: !type:ContainerSlot - type: ItemSlots - type: Item - size: Ginormous - sprite: Objects/Storage/petcarrier.rsi \ No newline at end of file + size: 9999 + sprite: Objects/Storage/petcarrier.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 99274e9904..a99677e0db 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -117,8 +117,6 @@ whitelist: components: - Hands # no use giving a mouse a storage implant, but a monkey is another story... - - type: Item - size: 9999 - type: Storage capacity: 20 #10-20 should be more than enough for this - type: ContainerContainer