API changes, renamed SpawnEntityAt to SpawnEntity.

Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs

@@ -78,7 +78,7 @@ namespace Content.Client.GameObjects.Components.Construction
         public void SpawnGhost(ConstructionPrototype prototype, GridCoordinates loc, Direction dir)
         {
             var entMgr = IoCManager.Resolve<IClientEntityManager>();
-            var ghost = entMgr.SpawnEntityAt("constructionghost", loc);
+            var ghost = entMgr.SpawnEntity("constructionghost", loc);
             var comp = ghost.GetComponent<ConstructionGhostComponent>();
             comp.Prototype = prototype;
             comp.Master = this;

Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs

@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.Components.Mobs;
+using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.GameObjects.Components.Weapons.Melee;
 using Content.Shared.GameObjects.Components.Weapons.Melee;
 using JetBrains.Annotations;
@@ -71,7 +71,7 @@ namespace Content.Client.GameObjects.EntitySystems
             var lunge = attacker.EnsureComponent<MeleeLungeComponent>();
             lunge.SetData(msg.Angle);
 
-            var entity = EntityManager.SpawnEntityAt("WeaponArc", attacker.Transform.GridPosition);
+            var entity = EntityManager.SpawnEntity("WeaponArc", attacker.Transform.GridPosition);
             entity.Transform.LocalRotation = msg.Angle;
 
             var weaponArcAnimation = entity.GetComponent<MeleeWeaponArcAnimationComponent>();

Content.Client/UserInterface/CharacterSetupGui.cs

@@ -209,7 +209,7 @@ namespace Content.Client.UserInterface
                 ButtonGroup group,
                 ICharacterProfile profile)
             {
-                _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
+                _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
                 _previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
                 var humanoid = profile as HumanoidCharacterProfile;
                 if (humanoid != null)

Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs

@@ -28,7 +28,7 @@ namespace Content.Client.UserInterface
             IClientPreferencesManager preferencesManager)
         {
             _preferencesManager = preferencesManager;
-            _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
+            _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
 
             var header = new NanoHeading
             {
@@ -120,7 +120,7 @@ namespace Content.Client.UserInterface
 
             foreach (var (slot, itemType) in gear.Equipment)
             {
-                var item = entityMan.SpawnEntityAt(itemType, MapCoordinates.Nullspace);
+                var item = entityMan.SpawnEntity(itemType, MapCoordinates.Nullspace);
 
                 inventory.SetSlotVisuals(slot, item);
 

Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs

@@ -36,11 +36,11 @@ namespace Content.IntegrationTests.Tests
 
                 var entityMan = IoCManager.Resolve<IEntityManager>();
 
-                human = entityMan.SpawnEntityAt("HumanMob_Content", MapCoordinates.Nullspace);
+                human = entityMan.SpawnEntity("HumanMob_Content", MapCoordinates.Nullspace);
-                uniform = entityMan.SpawnEntityAt("JanitorUniform", MapCoordinates.Nullspace);
+                uniform = entityMan.SpawnEntity("JanitorUniform", MapCoordinates.Nullspace);
-                idCard = entityMan.SpawnEntityAt("IDCardStandard", MapCoordinates.Nullspace);
+                idCard = entityMan.SpawnEntity("IDCardStandard", MapCoordinates.Nullspace);
-                pocketItem = entityMan.SpawnEntityAt("FlashlightLantern", MapCoordinates.Nullspace);
+                pocketItem = entityMan.SpawnEntity("FlashlightLantern", MapCoordinates.Nullspace);
-                var tooBigItem = entityMan.SpawnEntityAt("RedToolboxItem", MapCoordinates.Nullspace);
+                var tooBigItem = entityMan.SpawnEntity("RedToolboxItem", MapCoordinates.Nullspace);
 
                 inventory = human.GetComponent<InventoryComponent>();
 

Content.Server/Administration/AGhost.cs

@@ -3,6 +3,7 @@ using Robust.Server.Interfaces.Console;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 
 namespace Content.Server.Administration
 {
@@ -30,8 +31,7 @@ namespace Content.Server.Administration
             else
             {
                 var entityManager = IoCManager.Resolve<IEntityManager>();
-                var ghost = entityManager.SpawnEntityAt("AdminObserver",
+                var ghost = entityManager.SpawnEntity("AdminObserver", player.AttachedEntity.Transform.GridPosition);
-                    player.AttachedEntity.Transform.GridPosition);
 
                 mind.Visit(ghost);
             }

Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Cargo
 {
@@ -104,7 +105,7 @@ namespace Content.Server.GameObjects.Components.Cargo
                             continue;
                         for (var i = 0; i < order.Amount; i++)
                         {
-                            Owner.EntityManager.SpawnEntityAt(product.Product, Owner.Transform.GridPosition);
+                            Owner.EntityManager.SpawnEntity(product.Product, Owner.Transform.GridPosition);
                         }
                     }
                     break;

Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs

@@ -12,6 +12,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.Construction.ConstructionStepMaterial;
 using static Content.Shared.Construction.ConstructionStepTool;
@@ -54,7 +55,7 @@ namespace Content.Server.GameObjects.Components.Construction
                 {
                     // Oh boy we get to finish construction!
                     var entMgr = IoCManager.Resolve<IServerEntityManager>();
-                    var ent = entMgr.SpawnEntityAt(Prototype.Result, Transform.GridPosition);
+                    var ent = entMgr.SpawnEntity(Prototype.Result, Transform.GridPosition);
                     ent.GetComponent<ITransformComponent>().LocalRotation = Transform.LocalRotation;
                     Owner.Delete();
                     return true;

Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs

@@ -82,12 +82,12 @@ namespace Content.Server.GameObjects.Components.Construction
             if (prototype.Stages.Count == 2)
             {
                 // Exactly 2 stages, so don't make an intermediate frame.
-                var ent = _serverEntityManager.SpawnEntityAt(prototype.Result, loc);
+                var ent = _serverEntityManager.SpawnEntity(prototype.Result, loc);
                 ent.Transform.LocalRotation = angle;
             }
             else
             {
-                var frame = _serverEntityManager.SpawnEntityAt("structureconstructionframe", loc);
+                var frame = _serverEntityManager.SpawnEntity("structureconstructionframe", loc);
                 var construction = frame.GetComponent<ConstructionComponent>();
                 construction.Init(prototype);
                 frame.Transform.LocalRotation = angle;

Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs

@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
@@ -105,7 +106,7 @@ namespace Content.Server.GameObjects.Components.Destructible
         {
             if (!string.IsNullOrWhiteSpace(spawnOnDestroy) && eventArgs.IsSpawnWreck)
             {
-                Owner.EntityManager.SpawnEntityAt(spawnOnDestroy, Owner.Transform.GridPosition);
+                Owner.EntityManager.SpawnEntity(spawnOnDestroy, Owner.Transform.GridPosition);
             }
         }
     }

Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs

@@ -3,6 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 {
@@ -21,7 +22,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 
             void Spawn(string prototype)
             {
-                storage.Insert(_entityManager.SpawnEntityAt(prototype, Owner.Transform.GridPosition));
+                storage.Insert(_entityManager.SpawnEntity(prototype, Owner.Transform.GridPosition));
             }
 
             Spawn("Brutepack");

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs

@@ -3,6 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill
@@ -23,7 +24,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 
             void Spawn(string prototype)
             {
-                storage.Insert(_entityManager.SpawnEntityAt(prototype, Owner.Transform.GridPosition));
+                storage.Insert(_entityManager.SpawnEntity(prototype, Owner.Transform.GridPosition));
             }
 
             Spawn("Screwdriver");

Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs

@@ -235,11 +235,11 @@ namespace Content.Server.GameObjects.Components.Movement
             {
                 // Call Delete here as the teleporter should have control over portal longevity
                 // Departure portal
-                var departurePortal = _serverEntityManager.SpawnEntityAt("Portal", user.Transform.GridPosition);
+                var departurePortal = _serverEntityManager.SpawnEntity("Portal", user.Transform.GridPosition);
                 departurePortal.TryGetComponent<ServerPortalComponent>(out var departureComponent);
 
                 // Arrival portal
-                var arrivalPortal = _serverEntityManager.SpawnEntityAt("Portal", targetGrid);
+                var arrivalPortal = _serverEntityManager.SpawnEntity("Portal", targetGrid);
                 arrivalPortal.TryGetComponent<ServerPortalComponent>(out var arrivalComponent);
 
                 // Connect. TODO: If the OnUpdate in ServerPortalComponent is changed this may need to change as well.

Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs

@@ -4,8 +4,10 @@ using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Power
@@ -140,7 +142,7 @@ namespace Content.Server.GameObjects.Components.Power
             if (eventArgs.AttackWith.TryGetComponent(out WirecutterComponent wirecutter))
             {
                 Owner.Delete();
-                var droppedEnt = Owner.EntityManager.SpawnEntityAt("CableStack", eventArgs.ClickLocation);
+                var droppedEnt = Owner.EntityManager.SpawnEntity("CableStack", eventArgs.ClickLocation);
 
                 if (droppedEnt.TryGetComponent<StackComponent>(out var stackComp))
                     stackComp.Count = 1;

Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs

@@ -4,8 +4,10 @@ using Robust.Server.GameObjects;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Power
 {
@@ -50,7 +52,8 @@ namespace Content.Server.GameObjects.Components.Power
             if (Owner.TryGetComponent(out StackComponent stack) && !stack.Use(1))
                 return;
 
-            var newWire = _entityManager.SpawnEntityAt("Wire", grid.GridTileToLocal(snapPos));
+            GridCoordinates coordinates = grid.GridTileToLocal(snapPos);
+            var newWire = _entityManager.SpawnEntity("Wire", coordinates);
             if (newWire.TryGetComponent(out SpriteComponent wireSpriteComp) && hasItemSpriteComp)
             {
                 wireSpriteComp.Color = itemSpriteComp.Color;

Content.Server/GameObjects/Components/Research/LatheComponent.cs

@@ -12,6 +12,7 @@ using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
 
@@ -103,7 +104,7 @@ namespace Content.Server.GameObjects.Components.Research
             {
                 Producing = false;
                 _producingRecipe = null;
-                Owner.EntityManager.SpawnEntityAt(recipe.Result, Owner.Transform.GridPosition);
+                Owner.EntityManager.SpawnEntity(recipe.Result, Owner.Transform.GridPosition);
                 _userInterface.SendMessage(new LatheStoppedProducingRecipeMessage());
             });
 

Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs

@@ -11,6 +11,7 @@ using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
@@ -167,7 +168,7 @@ namespace Content.Server.GameObjects.Components.VendingMachines
             {
                 TrySetVisualState(VendingMachineVisualState.Normal);
                 _ejecting = false;
-                Owner.EntityManager.SpawnEntityAt(id, Owner.Transform.GridPosition);
+                Owner.EntityManager.SpawnEntity(id, Owner.Transform.GridPosition);
             });
         }
 

Content.Server/GameObjects/EntitySystems/HandsSystem.cs

@@ -170,7 +170,7 @@ namespace Content.Server.GameObjects.EntitySystems
             else
             {
                 stackComp.Use(1);
-                throwEnt = throwEnt.EntityManager.SpawnEntityAt(throwEnt.Prototype.ID, plyEnt.Transform.GridPosition);
+                throwEnt = throwEnt.EntityManager.SpawnEntity(throwEnt.Prototype.ID, plyEnt.Transform.GridPosition);
 
                 // can only throw one item at a time, regardless of what the prototype stack size is.
                 if (throwEnt.TryGetComponent<StackComponent>(out var newStackComp))

Content.Server/GameTicking/GameTicker.cs

@@ -260,7 +260,8 @@ namespace Content.Server.GameTicking
 
         private IEntity _spawnPlayerMob(Job job, bool lateJoin = true)
         {
-            var entity = _entityManager.SpawnEntityAt(PlayerPrototypeName, lateJoin ? _getLateJoinSpawnPoint() : _getJobSpawnPoint(job.Prototype.ID));
+            GridCoordinates coordinates = lateJoin ? _getLateJoinSpawnPoint() : _getJobSpawnPoint(job.Prototype.ID);
+            var entity = _entityManager.SpawnEntity(PlayerPrototypeName, coordinates);
             if (entity.TryGetComponent(out InventoryComponent inventory))
             {
                 var gear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear).Equipment;
@@ -284,7 +285,8 @@ namespace Content.Server.GameTicking
 
         private IEntity _spawnObserverMob()
         {
-            return _entityManager.SpawnEntityAt(ObserverPrototypeName, _getLateJoinSpawnPoint());
+            GridCoordinates coordinates = _getLateJoinSpawnPoint();
+            return _entityManager.SpawnEntity(ObserverPrototypeName, coordinates);
         }
 
         private GridCoordinates _getLateJoinSpawnPoint()