Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixes (#282)

Browse Source 
* fix: fixes

* resolve conflicts

* very important commit

* very important gramatical error

* incredible architecture solution
This commit is contained in:
RinKeeper
2024-05-30 17:48:15 +03:00
committed by GitHub
parent da97732bf0
commit 357680d278
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.Chemistry.EntitySystems
{ {
// Create a pop-up for the target // Create a pop-up for the target
var userName = Identity.Entity(user, EntityManager); 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); ("user", userName)), user, target);
} }

7
Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
View File

@@ -121,9 +121,13 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
var ev = new ERTRecruitedReasonEvent(); var ev = new ERTRecruitedReasonEvent();
RaiseLocalEvent(uid,ev); RaiseLocalEvent(uid,ev);
_chat.DispatchServerMessage(args.PlayerSession,Loc.GetString("ert-description")); if (args.PlayerSession != null)
{
_chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-description"));
_chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-reason", ("reason", ev.Reason))); _chat.DispatchServerMessage(args.PlayerSession, Loc.GetString("ert-reason", ("reason", ev.Reason)));
} }
}
private void OnStartAttempt(RoundStartAttemptEvent ev) private void OnStartAttempt(RoundStartAttemptEvent ev)
{ {
@@ -187,6 +191,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
} }
*/ */
var ertMap = EnsureComp<ERTMapComponent>(outpost); var ertMap = EnsureComp<ERTMapComponent>(outpost);
ertMap.MapId = mapId; ertMap.MapId = mapId;
//ERTMap.Shuttle = shuttleId; //ERTMap.Shuttle = shuttleId;

4
Resources/Locale/en-US/chemistry/components/patch-component.ftl
View File

@@ -1,6 +1,5 @@
## Entity ## 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-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-other-message = You put a patch on {$other}.
patch-component-inject-self-message = You put a patch on yourself. 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-component-feel-prick-message = You feel a little sting
patch-cant-inject = Can't put a patch on {$target}! patch-cant-inject = Can't put a patch on {$target}!
patch-cant-inject-now = Can't put a patch now 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!

2
Resources/Locale/ru-RU/chemistry/components/patch-component.ftl
View File

@@ -10,4 +10,4 @@ patch-cant-inject-now = Вы не можете наложить пластырь
## mob-inject doafter messages ## mob-inject doafter messages
injector-component-injecting-target = {CAPITALIZE(THE($user))} пытается приклеить пластырь на вас! patch-component-injecting-target = {CAPITALIZE($user)} пытается приклеить пластырь на вас!