tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bugfix] ContrabandSystem checks jobs correctly (#35228)

Browse Source 
* make it work lol

* index protos only once
This commit is contained in:
Killerqu00
2025-02-18 12:33:08 +01:00
committed by GitHub
parent deef592d9d
commit 239634269c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Contraband/ContrabandSystem.cs
View File

@@ -56,7 +56,8 @@ public sealed class ContrabandSystem : EntitySystem
// one, the actual informative 'this is restricted' // one, the actual informative 'this is restricted'
// then, the 'you can/shouldn't carry this around' based on the ID the user is wearing // then, the 'you can/shouldn't carry this around' based on the ID the user is wearing
var localizedDepartments = component.AllowedDepartments.Select(p => Loc.GetString("contraband-department-plural", ("department", Loc.GetString(_proto.Index(p).Name)))); var localizedDepartments = component.AllowedDepartments.Select(p => Loc.GetString("contraband-department-plural", ("department", Loc.GetString(_proto.Index(p).Name))));
var localizedJobs = component.AllowedJobs.Select(p => Loc.GetString("contraband-job-plural", ("job", _proto.Index(p).LocalizedName))); var jobs = component.AllowedJobs.Select(p => _proto.Index(p).LocalizedName).ToArray();
var localizedJobs = jobs.Select(p => Loc.GetString("contraband-job-plural", ("job", p)));
var severity = _proto.Index(component.Severity); var severity = _proto.Index(component.Severity);
String departmentExamineMessage; String departmentExamineMessage;
if (severity.ShowDepartmentsAndJobs) if (severity.ShowDepartmentsAndJobs)
@@ -86,7 +87,7 @@ public sealed class ContrabandSystem : EntitySystem
String carryingMessage; String carryingMessage;
// either its fully restricted, you have no departments, or your departments dont intersect with the restricted departments // either its fully restricted, you have no departments, or your departments dont intersect with the restricted departments
if (departments.Intersect(component.AllowedDepartments).Any() if (departments.Intersect(component.AllowedDepartments).Any()
|| localizedJobs.Contains(jobId)) || jobs.Contains(jobId))
{ {
carryingMessage = Loc.GetString("contraband-examine-text-in-the-clear"); carryingMessage = Loc.GetString("contraband-examine-text-in-the-clear");
} }