space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Arch PR two electric boogaloo (#4388)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
metalgearsloth
2023-11-23 14:29:37 +11:00
committed by GitHub
parent d9b0f3a227
commit 7dce51e2cf
74 changed files with 1852 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Robust.Shared.Scripting/Robust.Shared.Scripting.csproj
View File

@@ -8,9 +8,9 @@
<ItemGroup>
<PackageReference Include="ILReader.Core" Version="1.0.0.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
</ItemGroup>

8
Robust.Shared.Scripting/ScriptGlobalsShared.cs
View File

@@ -51,7 +51,7 @@ namespace Robust.Shared.Scripting
public EntityCoordinates gpos(double x, double y, int gridId)
{
return gpos(x, y, new EntityUid(gridId));
return gpos(x, y, new EntityUid(gridId, -1));
}
public EntityCoordinates gpos(double x, double y, EntityUid gridId)
@@ -61,12 +61,12 @@ namespace Robust.Shared.Scripting
public EntityUid eid(int i)
{
return new(i);
return new(i, -1);
}
public MapGridComponent getgrid(int i)
{
return map.GetGrid(new EntityUid(i));
return map.GetGrid(new EntityUid(i, -1));
}
public MapGridComponent getgrid(EntityUid mapId)
@@ -193,7 +193,7 @@ namespace Robust.Shared.Scripting
public bool TryComp<T>(EntityUid uid, out T? comp) where T : IComponent
=> ent.TryGetComponent(uid, out comp);
public bool HasComp<T>(EntityUid uid)
public bool HasComp<T>(EntityUid uid) where T : IComponent
=> ent.HasComponent<T>(uid);
public EntityUid Spawn(string? prototype, EntityCoordinates position)