tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove IContainer and move functions to the container system.… (#19975)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-10 21:46:36 +10:00
committed by GitHub
parent 24810d916b
commit 4d1c3ae66a
19 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Shared.Interaction.Helpers
public static bool InRangeUnOccluded(
this EntityUid origin,
BaseContainer other,
IContainer other,
float range = InteractionRange,
Ignored? predicate = null,
bool ignoreInsideBlocker = true)
@@ -90,7 +90,7 @@ namespace Content.Shared.Interaction.Helpers
public static bool InRangeUnOccluded(
this IComponent origin,
BaseContainer other,
IContainer other,
float range = InteractionRange,
Ignored? predicate = null,
bool ignoreInsideBlocker = true)
@@ -130,7 +130,7 @@ namespace Content.Shared.Interaction.Helpers
#region Containers
public static bool InRangeUnOccluded(
this BaseContainer origin,
this IContainer origin,
EntityUid other,
float range = InteractionRange,
Ignored? predicate = null,
@@ -143,7 +143,7 @@ namespace Content.Shared.Interaction.Helpers
}
public static bool InRangeUnOccluded(
this BaseContainer origin,
this IContainer origin,
IComponent other,
float range = InteractionRange,
Ignored? predicate = null,
@@ -155,8 +155,8 @@ namespace Content.Shared.Interaction.Helpers
}
public static bool InRangeUnOccluded(
this BaseContainer origin,
BaseContainer other,
this IContainer origin,
IContainer other,
float range = InteractionRange,
Ignored? predicate = null,
bool ignoreInsideBlocker = true)
@@ -169,7 +169,7 @@ namespace Content.Shared.Interaction.Helpers
}
public static bool InRangeUnOccluded(
this BaseContainer origin,
this IContainer origin,
EntityCoordinates other,
float range = InteractionRange,
Ignored? predicate = null,
@@ -181,7 +181,7 @@ namespace Content.Shared.Interaction.Helpers
}
public static bool InRangeUnOccluded(
this BaseContainer origin,
this IContainer origin,
MapCoordinates other,
float range = InteractionRange,
Ignored? predicate = null,
@@ -226,7 +226,7 @@ namespace Content.Shared.Interaction.Helpers
public static bool InRangeUnOccluded(
this EntityCoordinates origin,
BaseContainer other,
IContainer other,
float range = InteractionRange,
Ignored? predicate = null,
bool ignoreInsideBlocker = true)
@@ -304,7 +304,7 @@ namespace Content.Shared.Interaction.Helpers
public static bool InRangeUnOccluded(
this MapCoordinates origin,
BaseContainer other,
IContainer other,
float range = InteractionRange,
Ignored? predicate = null,
bool ignoreInsideBlocker = true)