Обновление режима крушения (#547)

* pinpointer code * more time for tts speak * rand commit * tag system on unlocks * oops * commit-weh * upd * upd-shuttles-and-someother * pinpointer --------- Co-authored-by: Kirillcas <[email protected]>
Rxup · Apr 6, 2024 · a57092c · a57092c
1 parent ef2b00c
commit a57092c
Show file tree

Hide file tree

Showing 30 changed files with 1,333 additions and 1,346 deletions.
diff --git a/Content.Client/Backmen/HardPacifiedModeSystem.cs b/Content.Client/Backmen/HardPacifiedModeSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Backmen;
+
+namespace Content.Client.Backmen;
+
+public sealed class HardPacifiedModeSystem : SharedHardPacifiedModeSystem
+{
+
+}
diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Bible.Components;
 using Content.Server.Popups;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -63,6 +64,11 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component
 
     private void OnPowerUsed(DispelPowerActionEvent args)
     {
+        if (HasComp<PsionicallyInvisibleComponent>(args.Performer))
+        {
+            _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer);
+            return;
+        }
         if (HasComp<PsionicInsulationComponent>(args.Target))
             return;
 

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Backmen.Psionics;
 using Content.Shared.Actions;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Content.Shared.Backmen.Species.Shadowkin.Components;
 using Content.Shared.Eye;

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Backmen.Abilities.Psionics;
 using Content.Shared.Backmen.Blob;
 using Content.Shared.Backmen.Blob.Components;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mindshield.Components;

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -3,7 +3,9 @@
 using Content.Shared.StatusEffect;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
+using Content.Server.Popups;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -12,7 +14,7 @@ namespace Content.Server.Backmen.Abilities.Psionics;
 
 public sealed class NoosphericZapPowerSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
     [Dependency] private readonly StunSystem _stunSystem = default!;
@@ -49,6 +51,11 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co
 
     private void OnPowerUsed(NoosphericZapPowerActionEvent args)
     {
+        if (HasComp<PsionicallyInvisibleComponent>(args.Performer))
+        {
+            _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer);
+            return;
+        }
         if (!HasComp<PotentialPsionicComponent>(args.Target))
             return;
 

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Audio.Systems;

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Backmen.Psionics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -46,6 +47,13 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp
 
     private void OnPowerUsed(PyrokinesisPowerActionEvent args)
     {
+        if (HasComp<PsionicallyInvisibleComponent>(args.Performer))
+        {
+            _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer);
+            return;
+        }
+        if (HasComp<PsionicInsulationComponent>(args.Target))
+            return;
         if (!TryComp<FlammableComponent>(args.Target, out var flammableComponent))
             return;
 

diff --git a/Content.Server/Backmen/HardPacifiedModeSystem.cs b/Content.Server/Backmen/HardPacifiedModeSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Backmen;
+
+namespace Content.Server.Backmen;
+
+public sealed class HardPacifiedModeSystem : SharedHardPacifiedModeSystem
+{
+
+}
diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Backmen.Eye;
 using Content.Server.NPC.Systems;
 using Content.Shared.Backmen.Abilities.Psionics;
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Eye;
 using Content.Shared.Interaction.Events;
@@ -35,14 +36,6 @@ public override void Initialize()
         // PVS Stuff
         SubscribeLocalEvent<PsionicallyInvisibleComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
         SubscribeLocalEvent<PsionicallyInvisibleComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
-
-        SubscribeLocalEvent<PsionicallyInvisibleComponent, AttackAttemptEvent>(OnAttackAttempt);
-    }
-
-    private void OnAttackAttempt(Entity<PsionicallyInvisibleComponent> ent, ref AttackAttemptEvent args)
-    {
-        if(HasComp<PacifiedComponent>(ent))
-            args.Cancel();
     }
 
     private void OnInit(EntityUid uid, PotentialPsionicComponent component, ComponentInit args)

diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Backmen.Psionics;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
 using Robust.Shared.Physics.Events;

diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs
diff --git a/Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs b/Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Backmen.Shipwrecked.Components;
+
+[RegisterComponent]
+public sealed partial class ShipwreckPinPointerComponent : Component
+{
+    [ViewVariables(VVAccess.ReadOnly)]
+    public ShipwreckedRuleComponent? Rule;
+}
diff --git a/Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs b/Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs