diff --git a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs index 9bddb28577..98b8fa1bd5 100644 --- a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs @@ -42,7 +42,7 @@ namespace Content.Client.GameObjects.EntitySystems var sprite = senderEnt.GetComponent(); var grid = _mapManager.GetGrid(senderEnt.Transform.GridID); var position = senderEnt.Transform.GridPosition; - var tileRef = grid.GetTile(position); + var tileRef = grid.GetTileRef(position); var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId]; sprite.Visible = tileDef.IsSubFloor; } @@ -62,7 +62,7 @@ namespace Content.Client.GameObjects.EntitySystems private void UpdateTile(IMapGrid grid, MapIndices position) { - var tile = grid.GetTile(position); + var tile = grid.GetTileRef(position); var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId]; foreach (var snapGridComponent in grid.GetSnapGridCell(position, SnapGridOffset.Center)) { diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs index 6732437a47..3b7c0af218 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs @@ -24,12 +24,12 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools public void AfterAttack(AfterAttackEventArgs eventArgs) { var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GridID); - var tile = mapGrid.GetTile(eventArgs.ClickLocation); + var tile = mapGrid.GetTileRef(eventArgs.ClickLocation); var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId]; if (tileDef.CanCrowbar) { var underplating = _tileDefinitionManager["underplating"]; - mapGrid.SetTile(eventArgs.ClickLocation, underplating.TileId); + mapGrid.SetTile(eventArgs.ClickLocation, new Tile(underplating.TileId)); _entitySystemManager.GetEntitySystem().Play("/Audio/items/crowbar.ogg", Owner); } } diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index e505f7c446..7d3624d81c 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -191,7 +191,7 @@ namespace Content.Server.GameObjects.EntitySystems { // Step one: figure out sound collection prototype. var grid = _mapManager.GetGrid(coordinates.GridID); - var tile = grid.GetTile(coordinates); + var tile = grid.GetTileRef(coordinates); // If the coordinates have a catwalk, it's always catwalk. string soundCollectionName; diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index db411a0f21..555541861c 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -10,6 +10,8 @@ UI UTF UV + <data /> + <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="*.UnitTesting" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /></ExcludeFilters></data> True True True