Skip to content

Commit

Permalink
Revert "Adds the thermo-electric generator (space-wizards#18840)"
Browse files Browse the repository at this point in the history
This reverts commit a242af5.
  • Loading branch information
metalgearsloth committed Aug 13, 2023
1 parent fcef5c7 commit 4cd832c
Show file tree
Hide file tree
Showing 74 changed files with 22 additions and 5,546 deletions.
9 changes: 0 additions & 9 deletions Content.Client/Computer/ComputerBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ protected override void Dispose(bool disposing)
_window?.Dispose();
}
}

protected override void ReceiveMessage(BoundUserInterfaceMessage message)
{
_window?.ReceiveMessage(message);
}
}

/// <summary>
Expand Down Expand Up @@ -84,10 +79,6 @@ void SetupComputerWindow(ComputerBoundUserInterfaceBase cb)
void UpdateState(TState state)
{
}

void ReceiveMessage(BoundUserInterfaceMessage message)
{
}
}
}

25 changes: 0 additions & 25 deletions Content.Client/Examine/ExamineSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,6 @@ public void DoExamine(EntityUid entity, bool centeredOnCursor = true, EntityUid?
_idCounter = 0;
RaiseNetworkEvent(new ExamineSystemMessages.RequestExamineInfoMessage(entity, _idCounter, true));
}

RaiseLocalEvent(entity, new ClientExaminedEvent(entity, playerEnt.Value));

_lastExaminedEntity = entity;
}

Expand All @@ -387,26 +384,4 @@ private void CloseTooltip()
}
}
}

/// <summary>
/// An entity was examined on the client.
/// </summary>
public sealed class ClientExaminedEvent : EntityEventArgs
{
/// <summary>
/// The entity performing the examining.
/// </summary>
public readonly EntityUid Examiner;

/// <summary>
/// Entity being examined, for broadcast event purposes.
/// </summary>
public readonly EntityUid Examined;

public ClientExaminedEvent(EntityUid examined, EntityUid examiner)
{
Examined = examined;
Examiner = examiner;
}
}
}
29 changes: 2 additions & 27 deletions Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Linq;
using System.Numerics;
using Content.Client.ContextMenu.UI;
using Content.Client.Examine;
Expand All @@ -16,7 +15,6 @@
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Input;
using Robust.Shared.Map;
using Robust.Shared.Utility;

namespace Content.Client.Guidebook.Controls;

Expand Down Expand Up @@ -171,17 +169,10 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out

if (args.TryGetValue("Rotation", out var rotation))
{
View.OverrideDirection = Angle.FromDegrees(double.Parse(rotation)).GetDir();
Sprite.Rotation = Angle.FromDegrees(double.Parse(rotation));
}

if (args.TryGetValue("Margin", out var margin))
{
Margin = ParseThickness(margin);
}
else
{
Margin = new Thickness(4, 8);
}
Margin = new Thickness(4, 8);

// By default, we will map-initialize guidebook entities.
if (!args.TryGetValue("Init", out var mapInit) || !bool.Parse(mapInit))
Expand All @@ -190,20 +181,4 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
control = this;
return true;
}

private static Thickness ParseThickness(string value)
{
if (string.IsNullOrWhiteSpace(value))
return default;

var split = value.Split(" ", StringSplitOptions.RemoveEmptyEntries).Select(x => Parse.Float(x)).ToArray();
if (split.Length == 1)
return new Thickness(split[0]);
if (split.Length == 2)
return new Thickness(split[0], split[1]);
if (split.Length == 4)
return new Thickness(split[0], split[1], split[2], split[3]);

throw new Exception("Invalid Thickness format!");
}
}
8 changes: 0 additions & 8 deletions Content.Client/Power/Generation/Teg/TegCirculatorComponent.cs

This file was deleted.

26 changes: 0 additions & 26 deletions Content.Client/Power/Generation/Teg/TegSystem.cs

This file was deleted.

10 changes: 0 additions & 10 deletions Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml

This file was deleted.

Loading

0 comments on commit 4cd832c

Please sign in to comment.