Merge branch 'master' into expl_int_analyzer

2021-02-08 22:46:28 +01:00
parent 856b293d87 3025449d5d
commit c4fe0c904c
140 changed files with 3622 additions and 1208 deletions
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs
+++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs
@@ -1,9 +1,11 @@
-using Robust.Shared.Interfaces.Serialization;
+using System;
+using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;

 namespace Content.Server.GameObjects.Components.Destructible.Thresholds
 {
+    [Serializable]
    public struct MinMax : IExposeData
    {
        [ViewVariables]