juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

Browse Source 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Tiles/FloorTileSystem.cs
View File

@@ -59,14 +59,14 @@ public sealed class FloorTileSystem : EntitySystem
// this looks a bit sussy but it might be because it needs to be able to place off of grids and expand them
var location = args.ClickLocation.AlignWithClosestGridTile();
var locationMap = location.ToMap(EntityManager, _transform);
var locationMap = _transform.ToMapCoordinates(location);
if (locationMap.MapId == MapId.Nullspace)
return;
var physicQuery = GetEntityQuery<PhysicsComponent>();
var transformQuery = GetEntityQuery<TransformComponent>();
var map = location.ToMap(EntityManager, _transform);
var map = _transform.ToMapCoordinates(location);
// Disallow placement close to grids.
// FTLing close is okay but this makes alignment too finnicky.
@@ -92,7 +92,7 @@ public sealed class FloorTileSystem : EntitySystem
return;
}
var userPos = transformQuery.GetComponent(args.User).Coordinates.ToMapPos(EntityManager, _transform);
var userPos = _transform.ToMapCoordinates(transformQuery.GetComponent(args.User).Coordinates).Position;
var dir = userPos - map.Position;
var canAccessCenter = false;
if (dir.LengthSquared() > 0.01)