Update4

AdventureTimeSS14 · Nov 8, 2023 · dd4f9a0 · dd4f9a0
1 parent 4081a04
commit dd4f9a0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -13,7 +13,8 @@ public enum SpeechType : byte
         {
             Emote,
             Say,
-            Whisper
+            Whisper,
+            Looc
         }
 
         /// <summary>
@@ -60,6 +61,9 @@ public static SpeechBubble CreateSpeechBubble(SpeechType type, string text, Enti
                 case SpeechType.Whisper:
                     return new TextSpeechBubble(text, senderEntity, eyeManager, chatManager, entityManager, "whisperBox");
 
+                case SpeechType.Looc:
+                    return new TextSpeechBubble(text, senderEntity, eyeManager, chatManager, entityManager, "emoteBox");
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -369,7 +369,7 @@ private void OnAttachedChanged(EntityUid uid)
         UpdateChannelPermissions();
     }
 
-    private void AddSpeechBubble(ChatMessage msg, SpeechBubble.SpeechType speechType)
+    private void AddSpeechBubble(ChatMessage msg, SpeechBubble.SpeechType speechType, string? prefixText = null, string? prefixEndText = null)
     {
         var ent = EntityManager.GetEntity(msg.SenderEntity);
 
@@ -379,8 +379,11 @@ private void AddSpeechBubble(ChatMessage msg, SpeechBubble.SpeechType speechType
             return;
         }
 
+        // Kind of shitty way to add prefixes but hey it works!
+        string Message = prefixText + msg.Message + prefixEndText;
+
         // msg.Message should be the string that a user sent over text, without any added markup.
-        var messages = SplitMessage(msg.Message);
+        var messages = SplitMessage(Message);
 
         foreach (var message in messages)
         {
@@ -843,7 +846,14 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
             case ChatChannel.Emotes:
                 AddSpeechBubble(msg, SpeechBubble.SpeechType.Emote);
                 break;
+
+            case ChatChannel.LOOC:
+                const string prefixText = "(LOOC: ";
+                const string prefixEndText = ")";
+                AddSpeechBubble(msg, SpeechBubble.SpeechType.Looc, prefixText, prefixEndText);
+                break;
         }
+
     }
 
     public void OnDeleteChatMessagesBy(MsgDeleteChatMessagesBy msg)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
@@ -64,6 +64,8 @@ ent-PillTricordrazine = таблетка трикордразина (10ед)
     .desc = { ent-Pill.desc }
 ent-PillBicaridine = таблетка бикаридина (10ед)
     .desc = { ent-Pill.desc }
+ent-PillCharcoal = таблетка угля (10ед)
+    .desc = { ent-Pill.desc }
 ent-PillRomerol = таблетка ромерола
     .desc = { ent-Pill.desc }
 ent-PillAmbuzol = таблетка амбузола
@@ -88,3 +90,11 @@ ent-SyringeAmbuzol = шприц амбузола
     .desc = { ent-BaseSyringe.desc }
 ent-SyringeRomerol = шприц ромерола
     .desc = { ent-BaseSyringe.desc }
+ent-SyringeSigynate = шприц сигината
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringeEthylredoxrazine = шприц этилредоксразина
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringePhalanximine = шприц фалангимина
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringeSaline = шприц физраствора
+    .desc = { ent-BaseSyringe.desc }