Revert "Merge pull request space-syndicate#168 from AwareFoxy/surg-ho…

…tfix-mood" This reverts commit f6fd496.
desuwatch · Jan 18, 2025 · d1606ee · d1606ee
1 parent 0a30de4
commit d1606ee
Show file tree

Hide file tree

Showing 110 changed files with 373 additions and 2,232 deletions.
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -40,6 +40,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+            SubscribeLocalEvent<InventorySlotsComponent, RefreshInventorySlotsEvent>(OnRefreshInventorySlots); // CorvaxNext: surgery
             SubscribeLocalEvent<InventoryComponent, ComponentShutdown>(OnShutdown);
 
             SubscribeLocalEvent<InventorySlotsComponent, DidEquipEvent>((_, comp, args) =>
@@ -181,6 +182,17 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin
                 EntitySlotUpdate?.Invoke(newData);
         }
 
+        // start-_CorvaxNext: surgery
+        public void OnRefreshInventorySlots(EntityUid owner, InventorySlotsComponent component, RefreshInventorySlotsEvent args)
+        {
+            if (!component.SlotData.TryGetValue(args.SlotName, out var slotData)
+                || _playerManager.LocalEntity != owner)
+                return;
+
+            OnSlotRemoved?.Invoke(slotData);
+        }
+        // end-_CorvaxNext: surgery
+
         public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
         {
             SlotData newSlotData = newSlotDef; //convert to slotData

diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -26,8 +26,8 @@ public DefaultGameScreen()
 
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
+
         MainViewport.OnResized += ResizeActionContainer;
-        MainViewport.OnResized += ResizeAlertsContainer; // Corvax-Next-Surgery
         Inventory.OnResized += ResizeActionContainer;
     }
 
@@ -37,14 +37,6 @@ private void ResizeActionContainer()
         Actions.ActionsContainer.MaxGridHeight = MainViewport.Size.Y - indent;
     }
 
-	// Corvax-Next-Surgery-Start
-    private void ResizeAlertsContainer()
-    {
-        float indent = Chat.Size.Y + Targeting.Size.Y + 120;
-        Alerts.AlertContainer.MaxGridHeight = Math.Max(MainViewport.Size.Y - indent, 1);
-    }
-	// Corvax-Next-Surgery-End
-
     private void ChatOnResizeFinish(Vector2 _)
     {
         var marginBottom = Chat.GetValue<float>(MarginBottomProperty);

diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
@@ -3,8 +3,8 @@
                   xmlns:partStatus="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
     <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
-        <PanelContainer>
-            <GridContainer Name="AlertContainer" Columns="1" HorizontalAlignment="Right" VerticalAlignment="Center" Access="Public" /> <!-- Corvax-Next-Surgery -->
+        <PanelContainer >
+            <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
         </PanelContainer>
         <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/>
     </GridContainer>

diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -20,7 +20,6 @@ public sealed partial class AlertsUI : UIWidget
     public AlertsUI()
     {
         RobustXamlLoader.Load(this);
-        LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin); // Corvax-Next-Surgery
     }
 
     public void SyncControls(AlertsSystem alertsSystem,

diff --git a/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs b/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs
diff --git a/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs b/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
@@ -34,7 +34,7 @@ public async Task DeleteAllThenGhost()
             Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
         }
 
-        Assert.That(pair.Client.EntMan.EntityCount, Is.AtMost(1)); // Corvax-Next-Surgery: Tolerate at most one client entity
+        Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
 
         // Create a new map.
         int mapId = 1;

diff --git a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
@@ -31,11 +31,9 @@ public async Task BananaSlipTest()
     {
         var sys = SEntMan.System<SlipTestSystem>();
         await SpawnTarget("TrashBananaPeel");
-
-		// Corvax-Next-Surgery-Start
-        // var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
-        // Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed."); Yeeting this pointless Assert because it's not actually important.
-		// Corvax-Next-Surgery-End
+
+        var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
+        Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed.");
 
         // Player is to the left of the banana peel and has not slipped.
         Assert.That(Delta(), Is.GreaterThan(0.5f));

diff --git a/Content.Server/Arcade/BlockGame/BlockGame.cs b/Content.Server/Arcade/BlockGame/BlockGame.cs
@@ -2,7 +2,6 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Shared._CorvaxNext.Mood;
 
 namespace Content.Server.Arcade.BlockGame;
 
@@ -83,8 +82,6 @@ private void InvokeGameover()
         {
             _highScorePlacement = _arcadeSystem.RegisterHighScore(meta.EntityName, Points);
             SendHighscoreUpdate();
-            var ev = new MoodEffectEvent("ArcadePlay"); // Corvax-Next-Mood
-            _entityManager.EventBus.RaiseLocalEvent(meta.Owner, ev); // Corvax-Next-Mood
         }
         SendMessage(new BlockGameMessages.BlockGameGameOverScreenMessage(Points, _highScorePlacement?.LocalPlacement, _highScorePlacement?.GlobalPlacement));
     }

diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.Advertise;
 using Content.Server.Advertise.Components;
 using Content.Shared.Power;
-using Content.Shared._CorvaxNext.Mood;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -78,8 +77,6 @@ private void OnSVPlayerAction(EntityUid uid, SpaceVillainArcadeComponent compone
         if (!TryComp<ApcPowerReceiverComponent>(uid, out var power) || !power.Powered)
             return;
 
-        RaiseLocalEvent(msg.Actor, new MoodEffectEvent("ArcadePlay")); // _CorvaxNext: mood
-
         switch (msg.PlayerAction)
         {
             case PlayerAction.Attack:

diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -8,7 +8,6 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -244,16 +243,15 @@ public override void Update(float frameTime)
                         barotrauma.TakingDamage = true;
                         _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking low pressure damage");
                     }
-                    RaiseLocalEvent(uid, new MoodEffectEvent("MobLowPressure")); // Corvax Next
+
                     _alertsSystem.ShowAlert(uid, barotrauma.LowPressureAlert, 2);
                 }
                 else if (pressure >= Atmospherics.HazardHighPressure)
                 {
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // Corvax Next
-                    RaiseLocalEvent(uid, new MoodEffectEvent("MobHighPressure")); // Corvax Next
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // CorvaxNext
 
                     if (!barotrauma.TakingDamage)
                     {

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -24,7 +24,6 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
 using Robust.Server.Audio;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -427,12 +426,10 @@ public override void Update(float frameTime)
                 if (!flammable.OnFire)
                 {
                     _alertsSystem.ClearAlert(uid, flammable.FireAlert);
-                    RaiseLocalEvent(uid, new MoodRemoveEffectEvent("OnFire")); // _CorvaxNext: mood
                     continue;
                 }
 
                 _alertsSystem.ShowAlert(uid, flammable.FireAlert);
-                RaiseLocalEvent(uid, new MoodEffectEvent("OnFire")); // _CorvaxNext: mood
 
                 if (flammable.FireStacks > 0)
                 {

diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
@@ -14,7 +14,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
@@ -154,8 +153,6 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
                 _audio.PlayPvs(component.HealSoundPath, args.User);
                 _delay.TryResetDelay((uid, useDelay));
             }
-
-            RaiseLocalEvent(args.Target.Value, new MoodEffectEvent("GotBlessed")); // _CorvaxNext: mood
         }
 
         private void AddSummonVerb(EntityUid uid, SummonableComponent component, GetVerbsEvent<AlternativeVerb> args)

diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -133,10 +133,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (attachAt == default)
                 attachAt = bodySystem.GetBodyChildren(entity, body).First();
 
-            // Shitmed Change Start
-            var slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
+            var slotId = part.GetHashCode().ToString();
 
             if (!bodySystem.TryCreatePartSlotAndAttach(attachAt.Id, slotId, hand, BodyPartType.Hand, attachAt.Component, part))
             {

diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
@@ -98,15 +98,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            // Shitmed Change Start
-            var slotId = "";
-            if (part.Symmetry != BodyPartSymmetry.None)
-                slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            else
-                slotId = $"{part.GetHashCode().ToString()}";
+            var slotId = $"AttachBodyPartVerb-{partUid}";
 
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
             // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
             if (body.RootContainer.ContainedEntity != null)
             {

diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -17,7 +17,6 @@
 using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using Content.Shared._CorvaxNext.Surgery.Body;
-using Content.Shared._CorvaxNext.Mood;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -295,7 +294,6 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             {
                 _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
             }
-            RaiseLocalEvent(ent, new MoodEffectEvent("Suffocating")); // _CorvaxNext: mood
         }
 
         _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false); // CorvaxNext: surgery

diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -24,7 +24,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Shared._CorvaxNext.Mood;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Store.Components;
 
@@ -479,8 +478,6 @@ private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref After
         var target = (ent.Comp.TargetStation is not null) ? Name(ent.Comp.TargetStation.Value) : "the target";
 
         RemComp<PacifiedComponent>(args.EntityUid); // Corvax-DionaPacifist: Allow dionas nukes to harm
-        RaiseLocalEvent(args.EntityUid, new MoodEffectEvent("NukeopsFocused")); // _CorvaxNext: mood
-
         _antag.SendBriefing(args.Session,
             Loc.GetString("nukeops-welcome",
                 ("station", target),

diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -11,7 +11,6 @@
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
-using Content.Shared._CorvaxNext.Mood;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
@@ -147,7 +146,6 @@ private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Aft
 
         _npcFaction.AddFaction(ev.Target, RevolutionaryNpcFaction);
         var revComp = EnsureComp<RevolutionaryComponent>(ev.Target);
-        RaiseLocalEvent(ev.Target, new MoodEffectEvent("RevolutionFocused")); // _CorvaxNext: mood
 
         if (ev.User != null)
         {