Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 13:37:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Submodule to 219.2.0 (#536)

Browse Source 
Uses the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26994
https://github.com/space-wizards/space-station-14/pull/26518
https://github.com/space-wizards/space-station-14/pull/26279
https://github.com/space-wizards/space-station-14/pull/24946
https://github.com/space-wizards/space-station-14/pull/27188

Requires:
https://github.com/Simple-Station/Einstein-Engines/pull/535
https://github.com/Simple-Station/Einstein-Engines/pull/534

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jake Huxell <JakeHuxell@pm.me>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com>
This commit is contained in:
VMSolidus
2024-07-11 20:40:02 -04:00
committed by GitHub
parent 50ec3cd5d7
commit 30fa1207b2
162 changed files with 1354 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Administration;
using Content.Shared.Explosion;
using Content.Shared.Explosion.Components;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;
@@ -56,7 +57,7 @@ public sealed partial class ExplosionSystem : EntitySystem
else if (referenceGrid != null)
{
// reference grid defines coordinate system that the explosion in space will use
initialTile = _mapManager.GetGrid(referenceGrid.Value).WorldToTile(epicenter.Position);
initialTile = Comp<MapGridComponent>(referenceGrid.Value).WorldToTile(epicenter.Position);
}
else
{
@@ -87,7 +88,7 @@ public sealed partial class ExplosionSystem : EntitySystem
var spaceAngle = Angle.Zero;
if (referenceGrid != null)
{
var xform = Transform(_mapManager.GetGrid(referenceGrid.Value).Owner);
var xform = Transform(Comp<MapGridComponent>(referenceGrid.Value).Owner);
spaceMatrix = xform.WorldMatrix;
spaceAngle = xform.WorldRotation;
}
@@ -102,7 +103,7 @@ public sealed partial class ExplosionSystem : EntitySystem
airtightMap = new();
var initialGridData = new ExplosionGridTileFlood(
_mapManager.GetGrid(epicentreGrid.Value),
Comp<MapGridComponent>(epicentreGrid.Value),
airtightMap,
maxIntensity,
stepSize,
@@ -191,7 +192,7 @@ public sealed partial class ExplosionSystem : EntitySystem
airtightMap = new();
data = new ExplosionGridTileFlood(
_mapManager.GetGrid(grid),
Comp<MapGridComponent>(grid),
airtightMap,
maxIntensity,
stepSize,