Merge pull request #582 from Ratyyy/weh

респрайты под ТГ + смерть корваксных лоупол карт + kilostation
AdventureTimeSS14 · Apr 10, 2024 · c79d05e · c79d05e
2 parents 95968ca + e6c102f
commit c79d05e
Show file tree

Hide file tree

Showing 199 changed files with 106,977 additions and 572,989 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -74,13 +74,6 @@ public sealed class PostMapInitTest
             // Corvax-Start
             "CorvaxAvrite",
             "CorvaxDelta",
-            "CorvaxAstra",
-            "CorvaxGelta",
-            "CorvaxOutpost",
-            "CorvaxSilly",
-            //"CorvaxIshimura",
-			//"CorvaxSpectrum",
-            //"CorvaxGate",
             // Corvax-End
 
             "Dev",
@@ -100,7 +93,8 @@ public sealed class PostMapInitTest
             "Marathon",
             "MeteorArena",
             "Atlas",
-            "Reach"
+            "Reach",
+            "Kilo"
         };
 
         /// <summary>

diff --git a/Content.Shared/Mech/Components/MechComponent.cs b/Content.Shared/Mech/Components/MechComponent.cs
@@ -3,6 +3,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Content.Shared.Damage;
 
 namespace Content.Shared.Mech.Components;
 
@@ -13,6 +14,11 @@ namespace Content.Shared.Mech.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class MechComponent : Component
 {
+    /// <summary>
+    /// damage modifiers on hit
+    /// </summary>
+    [DataField(required: true)]
+    public DamageModifierSet Modifiers = default!;
     /// <summary>
     /// How much "health" the mech has left.
     /// </summary>

diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1592,3 +1592,11 @@ Entries:
   - {message: "Добавил отображение админ-префикса для Ахелпа и АдминЧата.", type: Add}
   id: 55722
   time: '2024-04-08T08:20:00.0000000+00:00'
+
+- author: Крыса
+  changes:
+  - {message: "НТ поменяли основной тип плитки, используемый на станцияз.", type: Tweak}
+  - {message: "НТ перестали посталять старые модели факсов, заменив на новые.", type: Tweak}
+  - {message: "Все станции типа silly, astra, outpost и gelta были заменены на KiloStation.", type: Tweak}
+  id: 55722
+  time: '2024-04-10T08:20:00.0000000+00:00'
diff --git a/Resources/Maps/CorvaxMaps/corvax_astra.yml → Resources/Maps/ADTMaps/adt_kilostation.yml b/Resources/Maps/CorvaxMaps/corvax_astra.yml → Resources/Maps/ADTMaps/adt_kilostation.yml
diff --git a/Resources/Maps/CorvaxMaps/corvax_gelta.yml b/Resources/Maps/CorvaxMaps/corvax_gelta.yml
diff --git a/Resources/Maps/CorvaxMaps/corvax_outpost.yml b/Resources/Maps/CorvaxMaps/corvax_outpost.yml