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

Merge branch 'master' into 2020-04-28-tool-component

Browse Source 
# Conflicts:
#	Content.Server/GameObjects/Components/AnchorableComponent.cs
#	Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
#	Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
#	Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
#	Content.Server/GameObjects/Components/WiresComponent.cs
#	Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
#	Resources/Prototypes/Entities/Items/tools.yml
This commit is contained in:
zumorica
2020-05-23 12:02:34 +02:00
parent 6daa1bcf27 6a4d78cfac
commit 3029e31e4a
305 changed files with 33490 additions and 982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
View File

@@ -2,6 +2,7 @@
using Content.Server.GameObjects.Components.Sound;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects;
using Content.Server.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components;
using Content.Shared.Interfaces;
@@ -250,14 +251,17 @@ namespace Content.Server.GameObjects.Components.Interactable
[Verb]
public sealed class EjectCellVerb : Verb<HandheldLightComponent>
{
protected override string GetText(IEntity user, HandheldLightComponent component)
protected override void GetData(IEntity user, HandheldLightComponent component, VerbData data)
{
return component.Cell == null ? "Eject cell (cell missing)" : "Eject cell";
}
protected override VerbVisibility GetVisibility(IEntity user, HandheldLightComponent component)
{
return component.Cell == null ? VerbVisibility.Disabled : VerbVisibility.Visible;
if (component.Cell == null)
{
data.Text = "Eject cell (cell missing)";
data.Visibility = VerbVisibility.Disabled;
}
else
{
data.Text = "Eject cell";
}
}
protected override void Activate(IEntity user, HandheldLightComponent component)