From d1c5cf9607d5098638bc4a4634782f5d4eb495f5 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sat, 8 Feb 2020 02:29:06 -0800
Subject: [PATCH] Fix TemperatureComponent (#620)
* Remove TEMPERATURE Net ID
* Remove Temperature NetID
---
.../GameObjects/Components/Temperature/TemperatureComponent.cs | 3 ---
Content.Shared/GameObjects/ContentNetIDs.cs | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
index 5ab4fbbe4b..0a250f9d3c 100644
--- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
+++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
@@ -19,9 +19,6 @@ namespace Content.Server.GameObjects
///
public override string Name => "Temperature";
- ///
- public override uint? NetID => ContentNetIDs.TEMPERATURE;
-
//TODO: should be programmatic instead of how it currently is
[ViewVariables]
public float CurrentTemperature { get; private set; } = PhysicalConstants.ZERO_CELCIUS;
diff --git a/Content.Shared/GameObjects/ContentNetIDs.cs b/Content.Shared/GameObjects/ContentNetIDs.cs
index c6482cdf62..f47007a8b1 100644
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/GameObjects/ContentNetIDs.cs
@@ -5,7 +5,7 @@
{
public const uint DAMAGEABLE = 1000;
public const uint DESTRUCTIBLE = 1001;
- public const uint TEMPERATURE = 1002;
+ public const uint BALLISTIC_MAGAZINE_WEAPON = 1002;
public const uint HANDS = 1003;
public const uint SOLUTION = 1004;
public const uint STORAGE = 1005;
@@ -39,6 +39,5 @@
public const uint WELDER = 1034;
public const uint STACK = 1035;
public const uint HANDHELD_LIGHT = 1036;
- public const uint BALLISTIC_MAGAZINE_WEAPON = 1037;
}
}