Фиксы и фичи еще раз (#426)
* fix: constructs are cultists now * rename: announcementPrototype -> arrivalNotificationPrototype * fix: fix naming * fix: hop became head * resprite: cult bola looks like cult stuff now * add: repsrite files * translation: translation for cult bola * tweak: now bola fits in belt * refactor: refactor KnockDownOnCollideSystem * tweak: bolas knockdown on hit * add: energy bola * cleanup: less components
This commit is contained in:
@@ -50,7 +50,7 @@ namespace Content.Shared.Roles
|
||||
public bool JoinNotifyCrew { get; private set; } = false;
|
||||
|
||||
[DataField]
|
||||
public string? AnnouncementPrototype;
|
||||
public string? ArrivalNotificationPrototype;
|
||||
|
||||
[DataField]
|
||||
public bool RequireAdminNotify { get; private set; } = false;
|
||||
|
||||
@@ -61,15 +61,15 @@ public abstract class SharedJobSystem : EntitySystem
|
||||
{
|
||||
// Not that many departments so we can just eat the cost instead of storing the inverse lookup.
|
||||
var departmentProtos = _protoManager.EnumeratePrototypes<DepartmentPrototype>().ToList();
|
||||
departmentProtos.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal));
|
||||
departmentProtos = departmentProtos.OrderByDescending(d => d.Weight).ToList();
|
||||
|
||||
foreach (var department in departmentProtos)
|
||||
{
|
||||
if (department.Roles.Contains(jobProto))
|
||||
{
|
||||
departmentPrototype = department;
|
||||
return true;
|
||||
}
|
||||
if (!department.Roles.Contains(jobProto))
|
||||
continue;
|
||||
|
||||
departmentPrototype = department;
|
||||
return true;
|
||||
}
|
||||
|
||||
departmentPrototype = null;
|
||||
|
||||
Reference in New Issue
Block a user