Merge pull request #693 from xtray85/revert-681-mech-update-

Revert "ratyy week update 2"
AdventureTimeSS14 · May 14, 2024 · 1dd29c3 · 1dd29c3
2 parents df1f9fa + 3f9f686
commit 1dd29c3
Show file tree

Hide file tree

Showing 83 changed files with 41,131 additions and 282,728 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -71,9 +71,10 @@ public sealed class PostMapInitTest
             "ADTCore",
             "ADTMarathon",
             "ADTAtlas",
-            "ADTDelta",
+
             // Corvax-Start
             "CorvaxAvrite",
+            "CorvaxDelta",
             // Corvax-End
 
             "Dev",

diff --git a/Content.Server/ADT/SecretTrans/SecretTransComponent.cs b/Content.Server/ADT/SecretTrans/SecretTransComponent.cs
@@ -4,6 +4,9 @@
 
 namespace Content.Server.ADT.SecretTrans;
 
+/// <summary>
+///     Lizard specific properties
+/// </summary>
 [RegisterComponent]
 public sealed partial class SecretTransComponent : Component
 {

diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -305,7 +305,7 @@ private bool CheckRevsLose()
             {
                 if (HasComp<HeadRevolutionaryComponent>(uid))
                     continue;
-                if (TryComp<MobStateComponent>(uid, out var mobstate) && mobstate.CurrentState != MobState.Dead)
+                if (TryComp<MobStateComponent>(uid, out var mobstate) && mobstate.CurrentState == MobState.Alive)
                 {
                     AddComp<HeadRevolutionaryComponent>(uid);
                     return false;

diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -11,6 +11,7 @@ namespace Content.Server.Sandbox.Commands
     [AnyCommand]
     public sealed class ColorNetworkCommand : IConsoleCommand
     {
+        [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IEntityManager _entManager = default!;
 
         public string Command => "colornetwork";

diff --git a/Content.Server/Store/Components/StoreComponent.cs b/Content.Server/Store/Components/StoreComponent.cs
@@ -87,12 +87,6 @@ public sealed partial class StoreComponent : Component
     [DataField]
     public EntityUid? StartingMap;
 
-    /// <summary>
-    ///     The map the store was originally from, used to block refunds if the map is changed
-    /// </summary>
-    [ViewVariables, DataField]
-    public bool StoreCordsSpawn = false;
-
     #region audio
     /// <summary>
     /// The sound played to the buyer when a purchase is succesfully made.

diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -181,7 +181,7 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         //spawn entity
         if (listing.ProductEntity != null)
         {
-            var product = component.StoreCordsSpawn ? Spawn(listing.ProductEntity, Transform(uid).Coordinates) : Spawn(listing.ProductEntity, Transform(buyer).Coordinates);
+            var product = Spawn(listing.ProductEntity, Transform(buyer).Coordinates);
             _hands.PickupOrDrop(buyer, product);
 
             HandleRefundComp(uid, component, product);

diff --git a/Resources/Audio/Announcements/welcome.ogg b/Resources/Audio/Announcements/welcome.ogg
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1751,23 +1751,15 @@ Entries:
   - {message: "Синдикат сменил стандартную структуру своих аванпостов.", type: Add}
   id: 55745
   time: '2024-05-07T08:20:00.0000000+00:00'
-
-- author: Крыса
-  changes:
-  - {message: "Для экипажа станции провели брифинг по использованию фазона. Теперь, вы можете использовать фазу.", type: Add}
-  - {message: "СБ получили партию мехов пабби.", type: Add}
-  - {message: "Дельту маштабно перестроили.", type: Tweak}
-  id: 55746
-  time: '2024-05-12T08:20:00.0000000+00:00'
 
 - author: Мудрый дуб
   changes:
   - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix}
-  id: 55747 
+  id: 55746 #костыль отображения в Обновлениях
   time: '2024-05-07T23:25:00.0000000+00:00' 
 
 - author: JustKekc
   changes:
   - {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add}
-  id: 55748 
-  time: '2024-05-10T20:25:00.0000000+00:00' 
+  id: 55747 #костыль отображения в Обновлениях
+  time: '2024-05-10T20:25:00.0000000+00:00' 
diff --git a/Resources/Maps/ADTMaps/adt_bagel.yml b/Resources/Maps/ADTMaps/adt_bagel.yml
diff --git a/Resources/Maps/ADTMaps/adt_box.yml b/Resources/Maps/ADTMaps/adt_box.yml
diff --git a/Resources/Maps/ADTMaps/adt_cluster.yml b/Resources/Maps/ADTMaps/adt_cluster.yml
diff --git a/Resources/Maps/ADTMaps/adt_core.yml b/Resources/Maps/ADTMaps/adt_core.yml
diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml
diff --git a/Resources/Maps/ADTMaps/adt_fland.yml b/Resources/Maps/ADTMaps/adt_fland.yml