Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix chat bubbles (#25643)" (#25645)

Browse Source 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
This commit is contained in:
metalgearsloth
2024-02-28 00:51:20 +11:00
committed by GitHub
parent d204896bf5
commit a9502be29e
154 changed files with 435 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
View File

@@ -11,7 +11,6 @@ public sealed class RehydratableSystem : EntitySystem
{
[Dependency] private readonly SharedPopupSystem _popups = default!;
[Dependency] private readonly SolutionContainerSystem _solutions = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public override void Initialize()
@@ -41,7 +40,7 @@ public sealed class RehydratableSystem : EntitySystem
var target = Spawn(randomMob, Transform(uid).Coordinates);
_xformSystem.AttachToGridOrMap(target);
Transform(target).AttachToGridOrMap();
var ev = new GotRehydratedEvent(target);
RaiseLocalEvent(uid, ref ev);

3
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -28,7 +28,6 @@ namespace Content.Server.Chemistry.EntitySystems
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly ReactiveSystem _reactive = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
private const float ReactTime = 0.125f;
@@ -72,7 +71,7 @@ namespace Content.Server.Chemistry.EntitySystems
_throwing.TryThrow(vapor, dir, speed, user: user);
var distance = (target.Position - _xformSystem.GetWorldPosition(vaporXform)).Length();
var distance = (target.Position - vaporXform.WorldPosition).Length();
var time = (distance / physics.LinearVelocity.Length());
despawn.Lifetime = MathF.Min(aliveTime, time);
}

6
Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
View File

@@ -57,18 +57,16 @@ namespace Content.Server.Chemistry.ReactionEffects
var spreadAmount = (int) Math.Max(0, Math.Ceiling((args.Quantity / OverflowThreshold).Float()));
var splitSolution = args.Source.SplitSolution(args.Source.Volume);
var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
var xformSystem = args.EntityManager.System<SharedTransformSystem>();
var mapManager = IoCManager.Resolve<IMapManager>();
var mapCoordinates = xformSystem.GetMapCoordinates((args.SolutionEntity, transform));
if (!mapManager.TryFindGridAt(mapCoordinates, out _, out var grid) ||
if (!mapManager.TryFindGridAt(transform.MapPosition, out _, out var grid) ||
!grid.TryGetTileRef(transform.Coordinates, out var tileRef) ||
tileRef.Tile.IsSpace())
{
return;
}
var coords = grid.MapToGrid(mapCoordinates);
var coords = grid.MapToGrid(transform.MapPosition);
var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
var smoke = args.EntityManager.System<SmokeSystem>();

2
Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
View File

@@ -34,7 +34,7 @@ public sealed partial class CreateEntityReactionEffect : ReagentEffect
for (var i = 0; i < quantity; i++)
{
var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates((args.SolutionEntity, transform)));
var uid = args.EntityManager.SpawnEntity(Entity, transform.MapPosition);
transformSystem.AttachToGridOrMap(uid);
// TODO figure out how to properly spawn inside of containers

2
Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
View File

@@ -41,7 +41,7 @@ public sealed partial class EmpReactionEffect : ReagentEffect
var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
args.EntityManager.System<EmpSystem>().EmpPulse(
args.EntityManager.System<SharedTransformSystem>().GetMapCoordinates((args.SolutionEntity, transform)),
transform.MapPosition,
range,
EnergyConsumption,
DisableDuration);