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

Adds InRangeUnobstructed method to InteractionSystem (#698)

Browse Source 
* You cannot pickup items across walls, or pickup items when dead/in crit.

* Adds InRangeUnobstructed method to InteractionSystem.
Changes HandsSystem and ItemComponent to use it.
This commit is contained in:
Víctor Aguilera Puerto
2020-02-16 23:04:06 +01:00
committed by GitHub
parent c7a171cf14
commit 70c41f63b0
6 changed files with 88 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/GameObjects/Components/Mobs/DamageStates.cs
View File

@@ -62,7 +62,12 @@ namespace Content.Server.GameObjects
{
return true;
}
bool IActionBlocker.CanPickup()
{
return true;
}
bool IActionBlocker.CanEmote()
{
return true;
@@ -113,7 +118,12 @@ namespace Content.Server.GameObjects
{
return false;
}
bool IActionBlocker.CanPickup()
{
return false;
}
bool IActionBlocker.CanEmote()
{
return false;
@@ -184,7 +194,12 @@ namespace Content.Server.GameObjects
{
return false;
}
bool IActionBlocker.CanPickup()
{
return false;
}
bool IActionBlocker.CanEmote()
{
return false;

5
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -107,6 +107,11 @@ namespace Content.Server.GameObjects
return CurrentDamageState.CanDrop();
}
bool IActionBlocker.CanPickup()
{
return CurrentDamageState.CanPickup();
}
bool IActionBlocker.CanEmote()
{
return CurrentDamageState.CanEmote();