fixiki

WWhiteDreamProject · Dec 22, 2024 · 4ca5ef1 · 4ca5ef1
1 parent ee3c37d
commit 4ca5ef1
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 24 deletions.
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -340,7 +340,7 @@ public void TrySendXenoHivemindMessage(
     {
         if (!CanSendInGame(message, shell, player))
             return;
-        if (player != null && !_chatManager.HandleRateLimit(player))
+        if (player != null && _chatManager.HandleRateLimit(player) != RateLimitStatus.Allowed)
             return;
         // It doesn't make any sense for a non-player to send in-game OOC messages, whereas non-players may be sending
         // in-game IC messages.

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Popups;
 using Content.Shared.Pulling.Events;
+using Content.Shared.Bed.Sleep; // WWDP
 using Content.Shared.Rotation;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
@@ -404,7 +405,9 @@ public bool TryUnbuckle(Entity<BuckleComponent?> buckle, EntityUid? user, bool p
         if (!Resolve(buckle.Owner, ref buckle.Comp))
             return false;
 
+        if (!CanUnbuckle(buckle, user, popup, out var strap)) // WWDP - Remove this after fix shit under it
     // WWDP START
+/*
         if (CompOrNull<StrapComponent>(strapUid) != null && Comp<StrapComponent>(strapUid).Delay > buckleComp.Delay)
             buckleComp.Delay = Comp<StrapComponent>(strapUid).Delay;
 
@@ -442,6 +445,7 @@ public bool TryUnbuckle(Entity<BuckleComponent?> buckle, EntityUid? user, bool p
         SetBuckledTo(buckleUid, null, null, buckleComp);
 
         if (!TryComp<StrapComponent>(strapUid, out var strapComp))
+*/
     // WWDP END
             return false;
 

diff --git a/Content.Shared/Chat/ChatChannelExtensions.cs b/Content.Shared/Chat/ChatChannelExtensions.cs
@@ -15,7 +15,7 @@ public static Color TextColor(this ChatChannel channel)
             ChatChannel.AdminAlert => Color.Red,
             ChatChannel.AdminChat => Color.HotPink,
             ChatChannel.Whisper => Color.DarkGray,
-            ChatChannel.XenoHivemind => Color.FromHex("#600a91"), // WWDP
+//            ChatChannel.XenoHivemind => Color.FromHex("#600a91"), // WWDP
             _ => Color.LightGray
         };
     }

diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -52,12 +52,12 @@ public enum ChatSelectChannel : ushort
         Admin = ChatChannel.AdminChat,
 
         /// <summary>
-        ///     Nyano - Summary:. Telepathic channel for all psionic entities. 
+        ///     Nyano - Summary:. Telepathic channel for all psionic entities.
         /// </summary>
         Telepathic = ChatChannel.Telepathic,
 
         /// <summary>
-        ///     WWDP - Xenomorph Hivemind 
+        ///     WWDP - Xenomorph Hivemind
         /// </summary>
         XenoHivemind = ChatChannel.XenoHivemind,
 

diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
@@ -57,7 +57,7 @@ protected void OnDevourAction(EntityUid uid, DevourerComponent component, Devour
             {
                 _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
                 {
-                    BreakOnMove = true,
+                    BreakOnUserMove = true,
                 });
             }
             else

diff --git a/Content.Shared/_White/Xenomorphs/Systems/AlienJumpSystem.cs b/Content.Shared/_White/Xenomorphs/Systems/AlienJumpSystem.cs
@@ -74,7 +74,7 @@ private void OnHit(EntityUid uid, AlienJumpComponent comp, ThrowDoHitEvent args)
 
         if (HasComp<StandingStateComponent>(args.Target))
         {
-            _standing.TryLieDown(args.Target, null, StandingStateSystem.DropHeldItemsBehavior.NoDrop);
+            _standing.Down(args.Target, false, dropHeldItems:false);
         }
     }
 

diff --git a/Content.Shared/_White/Xenomorphs/Systems/SharedPlasmaVesselSystem.cs b/Content.Shared/_White/Xenomorphs/Systems/SharedPlasmaVesselSystem.cs
@@ -21,6 +21,9 @@ public sealed class SharedPlasmaVesselSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     private IGameTiming? _gameTiming;
 
+    [ValidatePrototypeId<AlertPrototype>]
+    public const string PlasmaCounterAlert = "PlasmaCounter";
+
     public override void Initialize()
     {
         _gameTiming = IoCManager.Resolve<IGameTiming>();
@@ -106,7 +109,7 @@ public bool ChangePlasmaAmount(EntityUid uid, FixedPoint2 amount, PlasmaVesselCo
 
                 if (currentTime - component.LastAlertUpdateTime >= PlasmaVesselComponent.AlertUpdateInterval)
                 {
-                    _alerts.ShowAlert(uid, AlertType.PlasmaCounter, (short)newAlertValue);
+                    _alerts.ShowAlert(uid, PlasmaCounterAlert, (short)newAlertValue);
                     component.AlertValue = newAlertValue;
                     component.LastAlertUpdateTime = currentTime;
                 }

diff --git a/Content.Shared/_White/Xenomorphs/Systems/SharedResinSpinnerSystem.cs b/Content.Shared/_White/Xenomorphs/Systems/SharedResinSpinnerSystem.cs
@@ -69,7 +69,7 @@ private void OnStructureMaking(EntityUid uid, float cost, float productionLength
             BlockDuplicate = true,
             BreakOnDamage = true,
             CancelDuplicate = true,
-            BreakOnMove = true
+            BreakOnUserMove = true
         };
 
         _doAfterSystem.TryStartDoAfter(doAfter);

diff --git a/Content.Shared/_White/Xenomorphs/Systems/TailLashSystem.cs b/Content.Shared/_White/Xenomorphs/Systems/TailLashSystem.cs
@@ -40,7 +40,7 @@ private void OnLash(EntityUid uid, TailLashComponent component, TailLashActionEv
         {
             if (HasComp<StandingStateComponent>(entity))
             {
-                _standing.TryLieDown(entity, null, DropHeldItemsBehavior.NoDrop);
+                _standing.Down(entity, playSound: false, dropHeldItems:false);
             }
         }
         _actions.SetCooldown(component.TailLashActionEntity, TimeSpan.FromSeconds(component.Cooldown));

diff --git a/Resources/Locale/ru-RU/_white/aliens/xenomorph_actions.ftl b/Resources/Locale/ru-RU/_white/aliens/xenomorph_actions.ftl
@@ -42,7 +42,6 @@ action-transfer-plasma-alien-desc = Передайте 50 плазмы ближ
 alien-transfer-fail = Вы не можете передать плазму прямо сейчас.
 
 alien-plasma-left = Осталось {$value} плазмы.
-alien-create-structure-failed = Вы не можете создать структуру здесь.
 alien-action-fail-plasma = Недостаточно плазмы.
 
 action-larva-grow = Рости

diff --git a/Resources/Prototypes/_White/Entities/Mobs/Aliens/Xenomorphs/base_xenomorph.yml b/Resources/Prototypes/_White/Entities/Mobs/Aliens/Xenomorphs/base_xenomorph.yml
@@ -212,8 +212,6 @@
   description: Little and harmless alien
   components:
     - type: ShowInfectedIcons
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: Body
       prototype: Xeno
     - type: Speech

diff --git a/Resources/Prototypes/_White/Entities/Mobs/Aliens/Xenomorphs/xenomorphs.yml b/Resources/Prototypes/_White/Entities/Mobs/Aliens/Xenomorphs/xenomorphs.yml
@@ -52,8 +52,6 @@
   components:
     - type: MindContainer
       showExamineInfo: true
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
@@ -185,8 +183,6 @@
   components:
     - type: MindContainer
       showExamineInfo: true
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
@@ -328,8 +324,6 @@
   components:
     - type: MindContainer
       showExamineInfo: true
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
@@ -480,8 +474,6 @@
       showExamineInfo: true
     - type: Alien
       caste: praetorian
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
@@ -647,8 +639,6 @@
       showExamineInfo: true
     - type: Alien
       caste: queen
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
@@ -761,8 +751,6 @@
   components:
     - type: MindContainer
       showExamineInfo: true
-    - type: GlobalAntagonist
-      antagonistPrototype: globalAntagonistXenomorphs
     - type: GhostTakeoverAvailable
     - type: GhostRole
       allowMovement: true
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
                     {
-                        BreakOnMove = true,
+                        BreakOnUserMove = true,
                     });
                 }
                 else
@@ Expand Down @@