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

Fixed examine things (#308)

Browse Source
This commit is contained in:
DamianX
2019-08-19 22:27:25 +02:00
committed by Pieter-Jan Briers
parent 4dcbf28714
commit be4197351a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs
View File

@@ -161,6 +161,7 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools
message.AddText("Fuel: "); message.AddText("Fuel: ");
message.PushColor(Fuel < FuelCapacity / 4f ? Color.DarkOrange : Color.Orange); message.PushColor(Fuel < FuelCapacity / 4f ? Color.DarkOrange : Color.Orange);
message.AddText($"{Math.Round(Fuel)}/{FuelCapacity}"); message.AddText($"{Math.Round(Fuel)}/{FuelCapacity}");
message.AddText(".");
message.Pop(); message.Pop();
} }
} }

2
Content.Server/GameObjects/Components/Power/PowerDevice.cs
View File

@@ -182,7 +182,7 @@ namespace Content.Server.GameObjects.Components.Power
{ {
if (!Powered) if (!Powered)
{ {
message.AddText("The device is not powered"); message.AddText("The device is not powered.");
} }
} }

7
Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs
View File

@@ -62,20 +62,19 @@ namespace Content.Server.GameObjects.EntitySystems
message.PushColor(Color.DarkGray); message.PushColor(Color.DarkGray);
var subMessage = new FormattedMessage();
//Add component statuses from components that report one //Add component statuses from components that report one
foreach (var examineComponents in entity.GetAllComponents<IExamine>()) foreach (var examineComponents in entity.GetAllComponents<IExamine>())
{ {
var subMessage = new FormattedMessage();
examineComponents.Examine(subMessage); examineComponents.Examine(subMessage);
if (subMessage.Tags.Count == 0) if (subMessage.Tags.Count == 0)
continue; continue;
if (doNewline) if (doNewline)
{
message.AddText("\n"); message.AddText("\n");
doNewline = false;
}
message.AddMessage(subMessage); message.AddMessage(subMessage);
doNewline = true;
} }
message.Pop(); message.Pop();