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.Shared/Prototypes/Tag/TagPrototype.cs
+++ b/Content.Shared/Prototypes/Tag/TagPrototype.cs
@@ -17,7 +17,7 @@ namespace Content.Shared.Prototypes.Tag
    {
        public string ID { get; [UsedImplicitly] private set; } = default!;

-        public void ExposeData(ObjectSerializer serializer)
+        void IExposeData.ExposeData(ObjectSerializer serializer)
        {
            serializer.DataField(this, x => x.ID, "id", "");
        }