From 357680d27848f60f4df886c3afd8cae26909d640 Mon Sep 17 00:00:00 2001
From: RinKeeper <161238702+RinKeeper@users.noreply.github.com>
Date: Thu, 30 May 2024 17:48:15 +0300
Subject: [PATCH] fixes (#282)

* fix: fixes

* resolve conflicts

* very important commit

* very important gramatical error

* incredible architecture solution
---
 .../Chemistry/EntitySystems/ChemistrySystem.Patch.cs     | 2 +-
 .../_White/ERTRecruitment/ERTRecruitmentRule.cs          | 9 +++++++--
 .../en-US/chemistry/components/patch-component.ftl       | 4 +++-
 .../ru-RU/chemistry/components/patch-component.ftl       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs
index 229890be30..e9b3ffba58 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs
@@ -60,7 +60,7 @@ namespace Content.Server.Chemistry.EntitySystems
             {
                 // Create a pop-up for the target
                 var userName = Identity.Entity(user, EntityManager);
-                _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
+                _popup.PopupEntity(Loc.GetString("patch-component-injecting-target",
                     ("user", userName)), user, target);
             }
 
diff --git a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
index 150604dc2c..8f879bd7e2 100644
--- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
+++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
@@ -121,8 +121,12 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
         var ev = new ERTRecruitedReasonEvent();
         RaiseLocalEvent(uid,ev);
 
-        _chat.DispatchServerMessage(args.PlayerSession,Loc.GetString("ert-description"));
-        _chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-reason", ("reason", ev.Reason)));
+        if (args.PlayerSession != null)
+        {
+
+            _chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-description"));
+            _chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-reason", ("reason", ev.Reason)));
+        }
     }
 
     private void OnStartAttempt(RoundStartAttemptEvent ev)
@@ -186,6 +190,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
             return false;
         }
         */
+
         
         var ertMap = EnsureComp<ERTMapComponent>(outpost);
         ertMap.MapId = mapId;
diff --git a/Resources/Locale/en-US/chemistry/components/patch-component.ftl b/Resources/Locale/en-US/chemistry/components/patch-component.ftl
index f62ab45a35..4a838e9050 100644
--- a/Resources/Locale/en-US/chemistry/components/patch-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/patch-component.ftl
@@ -1,6 +1,5 @@
 ## Entity
 
-patch-component-target-getting-injected = Someone trying to put a patch on you
 patch-component-injecting-user = You are trying to put a patch on {$target}.
 patch-component-inject-other-message = You put a patch on {$other}.
 patch-component-inject-self-message = You put a patch on yourself.
@@ -8,3 +7,6 @@ patch-component-empty-message = It's empty!
 patch-component-feel-prick-message = You feel a little sting
 patch-cant-inject = Can't put a patch on {$target}!
 patch-cant-inject-now = Can't put a patch now
+## mob-inject doafter messages
+
+patch-component-injecting-target = {CAPITALIZE($user)} is trying to put a patch on you!
diff --git a/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl b/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl
index 86c4a12e47..4077093cfd 100644
--- a/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl
@@ -10,4 +10,4 @@ patch-cant-inject-now = Вы не можете наложить пластырь
 
 ## mob-inject doafter messages
 
-injector-component-injecting-target = {CAPITALIZE(THE($user))} пытается приклеить пластырь на вас!
+patch-component-injecting-target = {CAPITALIZE($user)} пытается приклеить пластырь на вас!