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

Rejunevate now satiates hunger and thirst plus code quality (#456)

Browse Source 
* Change Rejunevate to satiate hunger and thirst whenever applicable

* More progress

* One more before rebase

* Shit

* Bop obsolete using

* Verb will not show on non-applicable objects
This commit is contained in:
dylanstrategie
2019-11-23 21:57:02 +01:00
committed by Pieter-Jan Briers
parent 421847e9d3
commit 17b31c417b
5 changed files with 76 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Administration/Rejuvenate.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects;
using Content.Server.GlobalVerbs;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
@@ -39,13 +39,7 @@ namespace Content.Server.Administration
shell.SendText(player, localizationManager.GetString("There's no entity attached to the user."));
return;
}
if (!player.AttachedEntity.TryGetComponent(out DamageableComponent damage))
{
shell.SendText(player, localizationManager.GetString("The user's entity does not have a DamageableComponent."));
return;
}
damage.HealAllDamage();
return;
RejuvenateVerb.PerformRejuvenate(player.AttachedEntity);
}
var entityManager = IoCManager.Resolve<IEntityManager>();
@@ -56,12 +50,7 @@ namespace Content.Server.Administration
shell.SendText(player, localizationManager.GetString("Could not find entity {0}", arg));
continue;
}
if (!entity.TryGetComponent(out DamageableComponent damage))
{
shell.SendText(player, localizationManager.GetString("Entity {0} does not have a DamageableComponent.", arg));
continue;
}
damage.HealAllDamage();
RejuvenateVerb.PerformRejuvenate(entity);
}
}
}