- fix: Bugfixes (#18)

* - fix: Fix huds.

* - fix: Cult icon fix

* - fix: Fix terminator missing dead threshold

* - fix: Fix clown ComicSans font

* - fix: Fix airlock missing rsi states

* - fix: Fix double storage removal sound

* - fix: Fix emote

Content.Client/_White/Cult/ShowCultHudSystem.cs

@@ -25,25 +25,35 @@ public sealed class ShowCultHudSystem : EntitySystem
 
     private void OnComponentInit(EntityUid uid, CultistComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid) return;
+        if (_player.LocalSession?.AttachedEntity != uid)
+            return;
+
         _overlayManager.AddOverlay(_overlay);
 
     }
 
     private void OnComponentRemoved(EntityUid uid, CultistComponent component, ComponentRemove args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid) return;
+        if (_player.LocalSession?.AttachedEntity != uid)
+            return;
+
         _overlayManager.RemoveOverlay(_overlay);
 
     }
 
     private void OnPlayerAttached(EntityUid uid, CultistComponent component, PlayerAttachedEvent args)
     {
+        if (_player.LocalSession != args.Player)
+            return;
+
         _overlayManager.AddOverlay(_overlay);
     }
 
     private void OnPlayerDetached(EntityUid uid, CultistComponent component, PlayerDetachedEvent args)
     {
+        if (_player.LocalSession != args.Player)
+            return;
+
         _overlayManager.RemoveOverlay(_overlay);
     }
 }

Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs

@@ -27,30 +27,36 @@ namespace Content.Client._White.EntityHealthBar
 
         private void OnInit(EntityUid uid, ShowWhiteHealthBarsComponent component, ComponentInit args)
         {
-            if (_player.LocalPlayer?.ControlledEntity == uid)
+            if (_player.LocalSession?.AttachedEntity != uid)
-            {
+                return;
-                _overlayMan.AddOverlay(_overlay);
+
-                _overlay.DamageContainers = component.DamageContainers;
+            _overlayMan.AddOverlay(_overlay);
-            }
+            _overlay.DamageContainers = component.DamageContainers;
 
 
         }
         private void OnRemove(EntityUid uid, ShowWhiteHealthBarsComponent component, ComponentRemove args)
         {
-            if (_player.LocalPlayer?.ControlledEntity == uid)
+            if (_player.LocalSession?.AttachedEntity != uid)
-            {
+                return;
-                _overlayMan.RemoveOverlay(_overlay);
+
-            }
+            _overlayMan.RemoveOverlay(_overlay);
         }
 
         private void OnPlayerAttached(EntityUid uid, ShowWhiteHealthBarsComponent component, PlayerAttachedEvent args)
         {
+            if (_player.LocalSession != args.Player)
+                return;
+
             _overlayMan.AddOverlay(_overlay);
             _overlay.DamageContainers = component.DamageContainers;
         }
 
         private void OnPlayerDetached(EntityUid uid, ShowWhiteHealthBarsComponent component, PlayerDetachedEvent args)
         {
+            if (_player.LocalSession != args.Player)
+                return;
+
             _overlayMan.RemoveOverlay(_overlay);
         }
 

Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

@@ -172,7 +172,7 @@ public sealed partial class AdminVerbSystem
         {
             Text = "Сделать культистом.",
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Texture(new("/Textures//White/Cult/interface.rsi/icon.png")),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Cult/interface.rsi"), "icon"),
             Act = () =>
             {
                 if (!_minds.TryGetSession(targetMindComp.Mind, out var session))

Content.Server/Chat/Systems/ChatSystem.cs

@@ -508,14 +508,14 @@ public sealed partial class ChatSystem : SharedChatSystem
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
             ("fontType", speech.FontId),
             ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("message", message));
 
         //WD-EDIT
         if (TryComp<VoiceOfGodComponent>(source, out var comp))
         {
             wrappedMessage = Loc.GetString(comp.ChatLoc,
                 ("entityName", name),
-                ("message", FormattedMessage.EscapeText(message)),
+                ("message", message),
                 ("color", comp.ChatColor)
             );
         }

Content.Shared/Sound/SharedEmitSoundSystem.cs

@@ -6,7 +6,6 @@ using Content.Shared.Popups;
 using Content.Shared.Sound.Components;
 using Content.Shared.Throwing;
 using Content.Shared._White.EndOfRoundStats.EmitSoundStatSystem;
-using Content.Shared._White.Sounds;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -44,9 +43,6 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         SubscribeLocalEvent<EmitSoundOnPickupComponent, GotEquippedHandEvent>(OnEmitSoundOnPickup);
         SubscribeLocalEvent<EmitSoundOnDropComponent, DroppedEvent>(OnEmitSoundOnDrop);
 
-        // WD edit
-        SubscribeLocalEvent<EmitSoundOnPickupComponent, GotRemovedEvent>(EmitSoundOnGotRemoved);
-
         SubscribeLocalEvent<EmitSoundOnCollideComponent, EntityUnpausedEvent>(OnEmitSoundUnpaused);
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
     }
@@ -103,12 +99,6 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         TryEmitSound(uid, component, args.User);
     }
 
-    // WD edit
-    private void EmitSoundOnGotRemoved(EntityUid uid, EmitSoundOnPickupComponent component, GotRemovedEvent args)
-    {
-        TryEmitSound(uid, component, args.User, false);
-    }
-
     private void OnEmitSoundOnDrop(EntityUid uid, EmitSoundOnDropComponent component, DroppedEvent args)
     {
         TryEmitSound(uid, component, args.User);

Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

@@ -17,7 +17,6 @@ using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
-using Content.Shared._White.Sounds;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -431,13 +430,6 @@ public abstract class SharedStorageSystem : EntitySystem
                 && storageComp.StorageRemoveSound != null)
                 Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player);
             {
-                // WD edit
-                if (hands.ActiveHand != null)
-                {
-                    var gotRemoved = new GotRemovedEvent(player, entity, hands.ActiveHand);
-                    RaiseLocalEvent(entity, gotRemoved, false);
-                }
-
                 return;
             }
         }

Content.Shared/_White/Sounds/GotRemovedEvent.cs

@@ -1,10 +0,0 @@
-using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
-
-namespace Content.Shared._White.Sounds;
-
-
-public sealed class GotRemovedEvent : EquippedHandEvent
-{
-    public GotRemovedEvent(EntityUid user, EntityUid unequipped, Hand hand) : base(user, unequipped, hand) { }
-}

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -77,6 +77,7 @@
       120: Dead
     stateAlertDict:
       Alive: BorgHealth
+      Dead: BorgDead
     showOverlays: false
   - type: Stamina
     critThreshold: 120

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -95,6 +95,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -103,6 +105,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -113,6 +117,8 @@
     sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -121,6 +127,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -129,6 +137,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
+  - type: Airlock
+    openUnlitVisible: false
 
 # Glass
 
@@ -284,6 +294,8 @@
     sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
   - type: PaintableAirlock
     group: Glass
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: AirlockGlass
@@ -292,6 +304,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/mining.rsi
+  - type: Airlock
+    openUnlitVisible: false
 
 - type: entity
   parent: AirlockGlass
@@ -302,4 +316,6 @@
     sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
+  - type: Airlock
+    openUnlitVisible: false
 

Resources/Prototypes/Voice/speech_emotes.yml

@@ -1,4 +1,4 @@
-# vocal emotes
+# vocal emotes
 - type: emote
   id: Scream
   category: Vocal
@@ -76,7 +76,7 @@
   id: Crying
   category: Vocal
   buttonText: Плакать
-  chatMessages: [ плакать ]
+  chatMessages: [ плачет ]
   chatTriggers:
   - плачет
   - заплакал

Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json

@@ -10,6 +10,15 @@
     {
       "name": "bolted_unlit"
     },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closed"
     },

Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json

@@ -10,6 +10,15 @@
     {
       "name": "bolted_unlit"
     },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closed"
     },