From fa1d3d36cd65f379eba053062718564a486f181c Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:59:51 -0700
Subject: [PATCH] Loadouts V3 (#736)
# Description
Resolves #723
Resolves #708
Resolves #691
Resolves #671
Resolves #643
Adding/removing loadouts and categories (and trait stuff) will require
disconnecting and reconnecting to the server (or anything that will
reload the lobby UI) due to how I've done my caching.
---
# TODO
- [x] Test entity IDs from loadouts
- [x] Better Tab Container
- [x] Scroll props
- [x] Margin props
- [x] Make vertical work
- [x] Merge buttons
- [x] Subcategories
- [x] Allow the same for traits (their tab is completely broken)
- [x] Give the Job Picker tab a BoxContainer
- [x] Different selected unusable color
- [x] Deselect unusable button
- Sort menu/Reverse sort direction button
- [x] Fix scroll resetting on updating
- [x] Cache loadouts
- [x] Ensure everything that can affect reqs updates everything that
checks reqs
- [x] More Requirements
- [x] Height
- [x] Width
- [x] Weight
- [x] Gender
- [x] Sex
- Markings
- [x] Logic
- [x] And
- [x] Or
- [x] Xor
- [x] Item groups
- [x] #643
- Something better than `Exclusive`
- Allow picking slots for things to go in (hands and inventories too)
- [x] Add a background to the loadout spriteView
- [x] Get better style colors
---
- [ ] More PRs
- [ ] Remove duplicate command loadouts that are outside the command
folders/categories
- [ ] Categorize job loadouts (By dept?)
- [ ] Fix [every
loadout](https://discord.com/channels/1218698320155906090/1218698321053356060/1279260210208440361)'s
IDs (who reviewed them??)
- [ ] Make loadout ID migrations?
---
Media
## New loadouts/traits UI
## NeoTabContainer allows changing the tab orientation
### https://youtu.be/krg8TJoQG3I
+ /// If , the tabs will be above the contents
+ ///
+ private Direction _tabLocation = North;
+ public Direction TabLocation
+ {
+ get => _tabLocation;
+ set => LayoutChanged(value);
+ }
+
+ /// If the 's horizontal scroll is enabled
+ private bool _hScrollEnabled;
+ ///
+ public bool HScrollEnabled
+ {
+ get => _hScrollEnabled;
+ set => ScrollingChanged(value, _vScrollEnabled);
+ }
+
+ /// If the 's vertical scroll is enabled
+ private bool _vScrollEnabled;
+ ///
+ public bool VScrollEnabled
+ {
+ get => _vScrollEnabled;
+ set => ScrollingChanged(_hScrollEnabled, value);
+ }
+
+ /// The margin around the whole UI element
+ private Thickness _containerMargin = new(0);
+ ///
+ public Thickness ContainerMargin
+ {
+ get => _containerMargin;
+ set => ContainerMarginChanged(value);
+ }
+
+ /// The margin around the separator between the tabs and contents
+ public Thickness SeparatorMargin
+ {
+ get => Separator.Margin;
+ set => Separator.Margin = value;
+ }
+
+ private bool _firstTabOpenBoth;
+ public bool FirstTabOpenBoth
+ {
+ get => _firstTabOpenBoth;
+ set => TabStyleChanged(value, LastTabOpenBoth);
+ }
+
+ private bool _lastTabOpenBoth;
+ public bool LastTabOpenBoth
+ {
+ get => _lastTabOpenBoth;
+ set => TabStyleChanged(FirstTabOpenBoth, value);
+ }
+
+
+ /// Changes the layout of the tabs and contents based on the value
+ /// See
+ private void LayoutChanged(Direction direction)
+ {
+ _tabLocation = direction;
+
+ LayoutOrientation DirectionalOrientation(Direction direction, LayoutOrientation north, LayoutOrientation south,
+ LayoutOrientation east, LayoutOrientation west)
+ {
+ return direction switch
+ {
+ North => north,
+ South => south,
+ East => east,
+ West => west,
+ _ => Vertical,
+ };
+ }
+ TabContainer.Orientation = DirectionalOrientation(direction, Horizontal, Horizontal, Vertical, Vertical);
+ Container.Orientation = DirectionalOrientation(direction, Vertical, Vertical, Horizontal, Horizontal);
+
+ var containerMargin = direction switch
+ {
+ North => new Thickness(_containerMargin.Left, 0, _containerMargin.Right, _containerMargin.Bottom),
+ South => new Thickness(_containerMargin.Left, _containerMargin.Top, _containerMargin.Right, 0),
+ East => new Thickness(_containerMargin.Left, _containerMargin.Top, 0, _containerMargin.Bottom),
+ West => new Thickness(0, _containerMargin.Top, _containerMargin.Right, _containerMargin.Bottom),
+ _ => _containerMargin,
+ };
+ TabScrollContainer.Margin = containerMargin;
+ ContentScrollContainer.Margin = containerMargin;
+
+ bool DirectionalBool(Direction direction, bool north, bool south, bool east, bool west)
+ {
+ return direction switch
+ {
+ North => north,
+ South => south,
+ East => east,
+ West => west,
+ _ => false,
+ };
+ }
+ TabScrollContainer.HorizontalExpand = DirectionalBool(direction, true, true, false, false);
+ TabScrollContainer.VerticalExpand = DirectionalBool(direction, false, false, true, true);
+ TabScrollContainer.HScrollEnabled = DirectionalBool(direction, true, true, false, false);
+ TabScrollContainer.VScrollEnabled = DirectionalBool(direction, false, false, true, true);
+
+
+ // Move the TabScrollContainer, Separator, and ContentScrollContainer to the correct positions
+ TabScrollContainer.Orphan();
+ Separator.Orphan();
+ ContentScrollContainer.Orphan();
+
+ if (direction is North or West)
+ {
+ Container.AddChild(TabScrollContainer);
+ Container.AddChild(Separator);
+ Container.AddChild(ContentScrollContainer);
+ }
+ else
+ {
+ Container.AddChild(ContentScrollContainer);
+ Container.AddChild(Separator);
+ Container.AddChild(TabScrollContainer);
+ }
+
+ UpdateTabMerging();
+ }
+
+ private void ScrollingChanged(bool hScroll, bool vScroll)
+ {
+ _hScrollEnabled = hScroll;
+ _vScrollEnabled = vScroll;
+
+ ContentScrollContainer.HScrollEnabled = hScroll;
+ ContentScrollContainer.VScrollEnabled = vScroll;
+ }
+
+ private void ContainerMarginChanged(Thickness value)
+ {
+ _containerMargin = value;
+ LayoutChanged(TabLocation);
+ }
+
+ private void TabStyleChanged(bool firstTabOpenBoth, bool lastTabOpenBoth)
+ {
+ _firstTabOpenBoth = firstTabOpenBoth;
+ _lastTabOpenBoth = lastTabOpenBoth;
+
+ UpdateTabMerging();
+ }
+}
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml
new file mode 100644
index 00000000000..21ee79a6caf
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
new file mode 100644
index 00000000000..c0f6300d325
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
@@ -0,0 +1,299 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using static Content.Client.Stylesheets.StyleBase;
+using static Robust.Shared.Maths.Direction;
+
+namespace Content.Client.UserInterface.Controls;
+
+///
+/// A simple yet good-looking tab container using normal UI elements with multiple styles
+///
+/// Because nobody else could do it better.
+///
+[GenerateTypedNameReferences]
+public sealed partial class NeoTabContainer : BoxContainer
+{
+ private readonly Dictionary _tabs = new();
+ private readonly List _controls = new();
+ private readonly ButtonGroup _tabGroup = new(false);
+
+ /// All children within the
+ public OrderedChildCollection Contents => ContentContainer.Children;
+ /// All children within the that are visible
+ public List VisibleContents => Contents.Where(c => c == CurrentControl).ToList();
+
+ /// All children within the
+ public OrderedChildCollection Tabs => TabContainer.Children;
+ /// All children within the that are visible
+ public List VisibleTabs => Tabs.Where(c => c.Visible).ToList();
+
+ public Control? CurrentControl { get; private set; }
+ public int? CurrentTab => _controls.FirstOrDefault(control => control == CurrentControl) switch
+ {
+ { } control => _controls.IndexOf(control),
+ _ => null,
+ };
+
+
+ ///
+ public NeoTabContainer()
+ {
+ RobustXamlLoader.Load(this);
+
+ LayoutChanged(TabLocation);
+ ScrollingChanged(HScrollEnabled, VScrollEnabled);
+ }
+
+ protected override void ChildRemoved(Control child)
+ {
+ if (_tabs.Remove(child, out var button))
+ button.Dispose();
+
+ // Set the current tab to a different control
+ if (CurrentControl == child)
+ {
+ var previous = _controls.IndexOf(child) - 1;
+
+ if (previous > -1)
+ SelectTab(_controls[previous]);
+ else
+ CurrentControl = null;
+ }
+
+ _controls.Remove(child);
+ base.ChildRemoved(child);
+ UpdateTabMerging();
+ }
+
+ // A fun display of every location for the tabs if you want it
+ // private TimeSpan _lastLayoutChange = TimeSpan.Zero;
+ // private TimeSpan _nextLayoutChange = TimeSpan.Zero;
+ // protected override void FrameUpdate(FrameEventArgs args)
+ // {
+ // base.FrameUpdate(args);
+ //
+ // _lastLayoutChange += TimeSpan.FromSeconds(args.DeltaSeconds);
+ // // Change the layout every second such that the tabs go in a circle
+ // if (_lastLayoutChange.TotalSeconds < _nextLayoutChange.TotalSeconds)
+ // return;
+ //
+ // _lastLayoutChange = _nextLayoutChange;
+ // _nextLayoutChange = _lastLayoutChange + TimeSpan.FromSeconds(2);
+ //
+ // LayoutChanged(TabLocation switch
+ // {
+ // North => East,
+ // East => South,
+ // South => West,
+ // West => North,
+ // _ => North,
+ // });
+ // }
+
+
+ ///
+ /// Adds a tab to this container
+ ///
+ /// The tab contents
+ /// The title of the tab
+ /// Whether the tabs should fix their styling automatically. Useful if you're doing tons of updates at once
+ /// The index of the new tab
+ public int AddTab(Control control, string? title, bool updateTabMerging = true)
+ {
+ var button = new Button
+ {
+ Group = _tabGroup,
+ MinHeight = 32,
+ MaxHeight = 32,
+ HorizontalExpand = true,
+ };
+ button.OnPressed += _ => SelectTab(control);
+ if (!string.IsNullOrEmpty(title))
+ button.Text = title;
+
+ TabContainer.AddChild(button);
+ ContentContainer.AddChild(control);
+ _controls.Add(control);
+ _tabs.Add(control, button);
+
+ // Show it if it has content
+ if (ContentContainer.ChildCount > 1)
+ control.Visible = false;
+ else
+ // Select it if it's the only tab
+ SelectTab(control);
+
+ if (updateTabMerging)
+ UpdateTabMerging();
+ return ChildCount - 1;
+ }
+
+ ///
+ /// Removes the tab associated with the given index
+ ///
+ /// The index of the tab to remove
+ /// Whether the tabs should fix their styling automatically. Useful if you're doing tons of updates at once
+ /// True if the tab was removed, false otherwise
+ public bool RemoveTab(int index, bool updateTabMerging = true)
+ {
+ if (index < 0 || index >= _controls.Count)
+ return false;
+
+ var control = _controls[index];
+ RemoveTab(control, updateTabMerging);
+ return true;
+ }
+
+ ///
+ /// Removes the tab associated with the given control
+ ///
+ /// The control to remove
+ /// Whether the tabs should fix their styling automatically. Useful if you're doing tons of updates at once
+ /// True if the tab was removed, false otherwise
+ public bool RemoveTab(Control control, bool updateTabMerging = true)
+ {
+ if (!_tabs.TryGetValue(control, out var button))
+ return false;
+
+ button.Dispose();
+ control.Dispose();
+ if (updateTabMerging)
+ UpdateTabMerging();
+ return true;
+ }
+
+
+ /// Sets the title of the tab associated with the given index
+ public void SetTabTitle(int index, string title)
+ {
+ if (index < 0 || index >= _controls.Count)
+ return;
+
+ var control = _controls[index];
+ SetTabTitle(control, title);
+ }
+
+ /// Sets the title of the tab associated with the given control
+ public void SetTabTitle(Control control, string title)
+ {
+ if (!_tabs.TryGetValue(control, out var button))
+ return;
+
+ if (button is Button b)
+ b.Text = title;
+ }
+
+ /// Shows or hides the tab associated with the given index
+ public void SetTabVisible(int index, bool visible)
+ {
+ if (index < 0 || index >= _controls.Count)
+ return;
+
+ var control = _controls[index];
+ SetTabVisible(control, visible);
+ }
+
+ /// Shows or hides the tab associated with the given control
+ public void SetTabVisible(Control control, bool visible)
+ {
+ if (!_tabs.TryGetValue(control, out var button))
+ return;
+
+ button.Visible = visible;
+ UpdateTabMerging();
+ }
+
+ /// Selects the tab associated with the control
+ public void SelectTab(Control control)
+ {
+ if (CurrentControl != null)
+ CurrentControl.Visible = false;
+
+ var button = _tabs[control];
+ button.Pressed = true;
+ control.Visible = true;
+ CurrentControl = control;
+ }
+
+ /// Sets the style of every visible tab's Button to be Open to Right, Both, or Left depending on position
+ public void UpdateTabMerging()
+ {
+ var visibleTabs = VisibleTabs;
+
+ if (visibleTabs.Count == 0)
+ return;
+
+ if (visibleTabs.Count == 1)
+ {
+ var button = visibleTabs[0];
+ button.RemoveStyleClass(ButtonOpenRight);
+ button.RemoveStyleClass(ButtonOpenBoth);
+ button.RemoveStyleClass(ButtonOpenLeft);
+
+ if (FirstTabOpenBoth)
+ button.AddStyleClass(ButtonOpenBoth);
+
+ return;
+ }
+
+ string GetDirection(Direction direction, int position)
+ {
+ return position switch
+ {
+ // First
+ 0 => direction switch
+ {
+ North => ButtonOpenRight,
+ South => ButtonOpenRight,
+ East => ButtonOpenLeft,
+ West => ButtonOpenLeft,
+ _ => ButtonOpenRight,
+ },
+ // Middle
+ 1 => ButtonOpenBoth,
+ // Last
+ 2 => direction switch
+ {
+ North => ButtonOpenLeft,
+ South => ButtonOpenLeft,
+ East => ButtonOpenRight,
+ West => ButtonOpenRight,
+ _ => ButtonOpenLeft,
+ },
+ _ => ButtonOpenBoth,
+ };
+ }
+
+ for (var i = 0; i < visibleTabs.Count; i++)
+ {
+ var button = visibleTabs[i];
+ button.RemoveStyleClass(ButtonOpenRight);
+ button.RemoveStyleClass(ButtonOpenBoth);
+ button.RemoveStyleClass(ButtonOpenLeft);
+
+ if (FirstTabOpenBoth && i == 0)
+ {
+ button.AddStyleClass(ButtonOpenBoth);
+ continue;
+ }
+ if (LastTabOpenBoth && i == visibleTabs.Count - 1)
+ {
+ button.AddStyleClass(ButtonOpenBoth);
+ continue;
+ }
+
+ var position = i switch
+ {
+ 0 => 0,
+ _ when i == visibleTabs.Count - 1 => 2,
+ _ => 1,
+ };
+ button.AddStyleClass(GetDirection(TabLocation, position));
+ }
+ }
+}
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index f03289782ae..2e0d310bbd7 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -2,6 +2,7 @@
using Content.Client.Eui;
using Content.Client.Players.PlayTimeTracking;
using Content.Client.Preferences;
+using Content.Shared.Clothing.Loadouts.Prototypes;
using Content.Shared.Customization.Systems;
using Content.Shared.Eui;
using Content.Shared.Ghost.Roles;
@@ -91,15 +92,16 @@ public override void HandleState(EuiStateBase state)
var hasAccess = true;
if (!characterReqs.CheckRequirementsValid(
- group.Key.Requirements ?? new(),
- new(),
- (HumanoidCharacterProfile) (prefs.Preferences?.SelectedCharacter ?? HumanoidCharacterProfile.DefaultWithSpecies()),
- requirementsManager.GetRawPlayTimeTrackers(),
- requirementsManager.IsWhitelisted(),
- entityManager,
- protoMan,
- configManager,
- out var reasons))
+ group.Key.Requirements ?? new(),
+ new(),
+ (HumanoidCharacterProfile) (prefs.Preferences?.SelectedCharacter ?? HumanoidCharacterProfile.DefaultWithSpecies()),
+ requirementsManager.GetRawPlayTimeTrackers(),
+ requirementsManager.IsWhitelisted(),
+ new LoadoutPrototype(), // idk
+ entityManager,
+ protoMan,
+ configManager,
+ out var reasons))
hasAccess = false;
_window.AddEntry(name, description, hasAccess, characterReqs.GetRequirementsText(reasons), group, spriteSystem);
diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
index 0f64e8a2751..18c1d545a7c 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
@@ -43,11 +43,11 @@ public void Update(int? roles, bool? canReturnToBody)
GhostRolesButton.Text = Loc.GetString("ghost-gui-ghost-roles-button", ("count", roles));
if (roles > 0)
{
- GhostRolesButton.StyleClasses.Add(StyleBase.ButtonCaution);
+ GhostRolesButton.StyleClasses.Add(StyleBase.ButtonDanger);
}
else
{
- GhostRolesButton.StyleClasses.Remove(StyleBase.ButtonCaution);
+ GhostRolesButton.StyleClasses.Remove(StyleBase.ButtonDanger);
}
}
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index 8368388d81e..de532351985 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -186,6 +186,7 @@ public bool IsAllowed(ICommonSession player, string role)
(HumanoidCharacterProfile) _prefs.GetPreferences(player.UserId).SelectedCharacter,
playTimes,
isWhitelisted,
+ job,
EntityManager,
_prototypes,
_config,
@@ -216,6 +217,7 @@ public HashSet GetDisallowedJobs(ICommonSession player)
(HumanoidCharacterProfile) _prefs.GetPreferences(player.UserId).SelectedCharacter,
playTimes,
isWhitelisted,
+ job,
EntityManager,
_prototypes,
_config,
@@ -257,15 +259,16 @@ public void RemoveDisallowedJobs(NetUserId userId, ref List jobs)
continue;
if (!_characterRequirements.CheckRequirementsValid(
- jobber.Requirements,
- jobber,
- (HumanoidCharacterProfile) _prefs.GetPreferences(userId).SelectedCharacter,
- _tracking.GetPlayTimes(_playerManager.GetSessionById(userId)),
- _playerManager.GetSessionById(userId).ContentData()?.Whitelisted ?? false,
- EntityManager,
- _prototypes,
- _config,
- out _))
+ jobber.Requirements,
+ jobber,
+ (HumanoidCharacterProfile) _prefs.GetPreferences(userId).SelectedCharacter,
+ _tracking.GetPlayTimes(_playerManager.GetSessionById(userId)),
+ _playerManager.GetSessionById(userId).ContentData()?.Whitelisted ?? false,
+ jobber,
+ EntityManager,
+ _prototypes,
+ _config,
+ out _))
{
jobs.RemoveSwap(i);
i--;
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index fe4e8704496..ae8f8038534 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -9,6 +9,7 @@
using Robust.Shared.Configuration;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Utility;
using Content.Server.Abilities.Psionics;
using Content.Shared.Psionics;
@@ -38,14 +39,14 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
{
if (!_prototype.TryIndex(traitId, out var traitPrototype))
{
- Log.Warning($"No trait found with ID {traitId}!");
+ DebugTools.Assert($"No trait found with ID {traitId}!");
return;
}
if (!_characterRequirements.CheckRequirementsValid(
traitPrototype.Requirements,
_prototype.Index(args.JobId ?? _prototype.EnumeratePrototypes().First().ID),
- args.Profile, _playTimeTracking.GetTrackerTimes(args.Player), args.Player.ContentData()?.Whitelisted ?? false,
+ args.Profile, _playTimeTracking.GetTrackerTimes(args.Player), args.Player.ContentData()?.Whitelisted ?? false, traitPrototype,
EntityManager, _prototype, _configuration,
out _))
continue;
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
index 445cbc10e6d..26567d0c13b 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -6,9 +6,15 @@ namespace Content.Shared.Clothing.Loadouts.Prototypes;
///
/// A prototype defining a valid category for s to go into.
///
-[Prototype("loadoutCategory")]
+[Prototype]
public sealed class LoadoutCategoryPrototype : IPrototype
{
[IdDataField]
public string ID { get; } = default!;
+
+ [DataField]
+ public bool Root;
+
+ [DataField]
+ public List> SubCategories = new();
}
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
index 9ca575fa72e..74cfa1d4e86 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -7,7 +7,7 @@
namespace Content.Shared.Clothing.Loadouts.Prototypes;
-[Prototype("loadout")]
+[Prototype]
public sealed class LoadoutPrototype : IPrototype
{
///
@@ -16,22 +16,12 @@ public sealed class LoadoutPrototype : IPrototype
[IdDataField]
public string ID { get; } = default!;
- ///
- /// Which tab category to put this under
- ///
[DataField, ValidatePrototypeId]
- public string Category = "Uncategorized";
-
- ///
- /// The item to give
- ///
- [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer), required: true)]
- public List Items = new();
+ public ProtoId Category = "Uncategorized";
+ [DataField(required: true)]
+ public List> Items = new();
- ///
- /// The point cost of this loadout
- ///
[DataField]
public int Cost = 1;
@@ -41,7 +31,6 @@ public sealed class LoadoutPrototype : IPrototype
[DataField]
public bool Exclusive;
-
[DataField]
public List Requirements = new();
}
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
index e7a0eef80ee..c784a8bf451 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
using Content.Shared.Clothing.Components;
using Content.Shared.Clothing.Loadouts.Prototypes;
using Content.Shared.Customization.Systems;
@@ -69,7 +70,7 @@ public List ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
if (!_characterRequirements.CheckRequirementsValid(
- loadoutProto.Requirements, job, profile, playTimes, whitelisted,
+ loadoutProto.Requirements, job, profile, playTimes, whitelisted, loadoutProto,
EntityManager, _prototype, _configuration,
out _))
continue;
@@ -78,12 +79,13 @@ public List ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
// Spawn the loadout items
var spawned = EntityManager.SpawnEntities(
EntityManager.GetComponent(uid).Coordinates.ToMap(EntityManager),
- loadoutProto.Items!);
+ loadoutProto.Items.Select(p => (string?) p.ToString()).ToList()); // Dumb cast
foreach (var item in spawned)
{
- if (EntityManager.TryGetComponent(item, out var clothingComp) &&
- _inventory.TryGetSlots(uid, out var slotDefinitions))
+ if (EntityManager.TryGetComponent(item, out var clothingComp)
+ && _characterRequirements.CanEntityWearItem(uid, item)
+ && _inventory.TryGetSlots(uid, out var slotDefinitions))
{
var deleted = false;
foreach (var curSlot in slotDefinitions)
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs
index fe44f2ccc06..f9a060b7380 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs
@@ -24,9 +24,9 @@ public sealed partial class CharacterJobRequirement : CharacterRequirement
public List> Jobs;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
var jobs = new List();
@@ -70,9 +70,9 @@ public sealed partial class CharacterDepartmentRequirement : CharacterRequiremen
public List> Departments;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
var departments = new List();
@@ -112,9 +112,9 @@ public sealed partial class CharacterDepartmentTimeRequirement : CharacterRequir
public ProtoId Department;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
// Disable the requirement if the role timers are disabled
if (!configManager.GetCVar(CCVars.GameRoleTimers))
@@ -178,9 +178,9 @@ public sealed partial class CharacterOverallTimeRequirement : CharacterRequireme
public TimeSpan Max = TimeSpan.MaxValue;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
// Disable the requirement if the role timers are disabled
if (!configManager.GetCVar(CCVars.GameRoleTimers))
@@ -234,9 +234,9 @@ public sealed partial class CharacterPlaytimeRequirement : CharacterRequirement
public ProtoId Tracker;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
// Disable the requirement if the role timers are disabled
if (!configManager.GetCVar(CCVars.GameRoleTimers))
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Logic.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Logic.cs
new file mode 100644
index 00000000000..1cd3618fda4
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.Logic.cs
@@ -0,0 +1,147 @@
+using System.Linq;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+///
+/// Requires all of the requirements to be true
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLogicAndRequirement : CharacterRequirement
+{
+ [DataField]
+ public List Requirements { get; private set; } = new();
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ var succeeded = entityManager.EntitySysManager.GetEntitySystem()
+ .CheckRequirementsValid(Requirements, job, profile, playTimes, whitelisted, prototype, entityManager,
+ prototypeManager, configManager, out var reasons, depth + 1);
+
+ if (reasons.Count == 0)
+ {
+ reason = null;
+ return succeeded;
+ }
+
+ reason = new FormattedMessage();
+ foreach (var message in reasons)
+ reason.AddMessage(FormattedMessage.FromMarkup(
+ Loc.GetString("character-logic-and-requirement-listprefix", ("indent", new string(' ', depth * 2))) + message.ToMarkup()));
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-logic-and-requirement",
+ ("inverted", Inverted), ("options", reason.ToMarkup())));
+
+ return succeeded;
+ }
+}
+
+///
+/// Requires any of the requirements to be true
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLogicOrRequirement : CharacterRequirement
+{
+ [DataField]
+ public List Requirements { get; private set; } = new();
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ var succeeded = false;
+ var reasons = new List();
+ foreach (var requirement in Requirements)
+ {
+ if (requirement.IsValid(job, profile, playTimes, whitelisted, prototype, entityManager, prototypeManager,
+ configManager, out var raisin, depth + 1))
+ {
+ succeeded = true;
+ break;
+ }
+
+ if (raisin != null)
+ reasons.Add(raisin);
+ }
+
+ if (reasons.Count == 0)
+ {
+ reason = null;
+ return succeeded;
+ }
+
+ reason = new FormattedMessage();
+ foreach (var message in reasons)
+ reason.AddMessage(FormattedMessage.FromMarkup(
+ Loc.GetString("character-logic-or-requirement-listprefix", ("indent", new string(' ', depth * 2))) + message.ToMarkup()));
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-logic-or-requirement",
+ ("inverted", Inverted), ("options", reason.ToMarkup())));
+
+ return succeeded;
+ }
+}
+
+///
+/// Requires only one of the requirements to be true
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLogicXorRequirement : CharacterRequirement
+{
+ [DataField]
+ public List Requirements { get; private set; } = new();
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ var reasons = new List();
+ var succeeded = false;
+
+ foreach (var requirement in Requirements)
+ {
+ if (requirement.IsValid(job, profile, playTimes, whitelisted, prototype, entityManager, prototypeManager,
+ configManager, out var raisin, depth + 1))
+ {
+ if (succeeded)
+ {
+ succeeded = false;
+ break;
+ }
+
+ succeeded = true;
+ }
+
+ if (raisin != null)
+ reasons.Add(raisin);
+ }
+
+ if (reasons.Count == 0)
+ {
+ reason = null;
+ return succeeded;
+ }
+
+ reason = new FormattedMessage();
+ foreach (var message in reasons)
+ reason.AddMessage(FormattedMessage.FromMarkup(
+ Loc.GetString("character-logic-xor-requirement-listprefix", ("indent", new string(' ', depth * 2))) + message.ToMarkup()));
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-logic-xor-requirement",
+ ("inverted", Inverted), ("options", reason.ToMarkup())));
+
+ return succeeded;
+ }
+}
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
index aaeae107b9e..8fdb7c0e7db 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
@@ -1,11 +1,15 @@
using System.Linq;
using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.Preferences;
+using Content.Shared.Prototypes;
using Content.Shared.Roles;
using Content.Shared.Traits;
using JetBrains.Annotations;
using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Physics;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
@@ -27,9 +31,9 @@ public sealed partial class CharacterAgeRequirement : CharacterRequirement
public int Max;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
reason = FormattedMessage.FromMarkup(Loc.GetString("character-age-requirement",
("inverted", Inverted), ("min", Min), ("max", Max)));
@@ -48,9 +52,9 @@ public sealed partial class CharacterBackpackTypeRequirement : CharacterRequirem
public BackpackPreference Preference;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
reason = FormattedMessage.FromMarkup(Loc.GetString("character-backpack-type-requirement",
("inverted", Inverted),
@@ -70,9 +74,9 @@ public sealed partial class CharacterClothingPreferenceRequirement : CharacterRe
public ClothingPreference Preference;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
reason = FormattedMessage.FromMarkup(Loc.GetString("character-clothing-preference-requirement",
("inverted", Inverted),
@@ -81,6 +85,50 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
}
}
+///
+/// Requires the profile to be a certain gender
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterGenderRequirement : CharacterRequirement
+{
+ [DataField(required: true)]
+ public Gender Gender;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-gender-requirement",
+ ("inverted", Inverted),
+ ("gender", Loc.GetString($"humanoid-profile-editor-pronouns-{Gender.ToString().ToLower()}-text"))));
+ return profile.Gender == Gender;
+ }
+}
+
+///
+/// Requires the profile to be a certain sex
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterSexRequirement : CharacterRequirement
+{
+ [DataField(required: true)]
+ public Sex Sex;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-sex-requirement",
+ ("inverted", Inverted),
+ ("sex", Loc.GetString($"humanoid-profile-editor-sex-{Sex.ToString().ToLower()}-text"))));
+ return profile.Sex == Sex;
+ }
+}
+
///
/// Requires the profile to be a certain species
///
@@ -92,9 +140,9 @@ public sealed partial class CharacterSpeciesRequirement : CharacterRequirement
public List> Species;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
const string color = "green";
reason = FormattedMessage.FromMarkup(Loc.GetString("character-species-requirement",
@@ -106,6 +154,124 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
}
}
+///
+/// Requires the profile to be within a certain height range
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterHeightRequirement : CharacterRequirement
+{
+ ///
+ /// The minimum height of the profile in centimeters
+ ///
+ [DataField]
+ public float Min = int.MinValue;
+
+ ///
+ /// The maximum height of the profile in centimeters
+ ///
+ [DataField]
+ public float Max = int.MaxValue;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ const string color = "yellow";
+ var species = prototypeManager.Index(profile.Species);
+
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-height-requirement",
+ ("inverted", Inverted), ("color", color), ("min", Min), ("max", Max)));
+
+ var height = profile.Height * species.AverageHeight;
+ return height >= Min && height <= Max;
+ }
+}
+
+///
+/// Requires the profile to be within a certain width range
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterWidthRequirement : CharacterRequirement
+{
+ ///
+ /// The minimum width of the profile in centimeters
+ ///
+ [DataField]
+ public float Min = int.MinValue;
+
+ ///
+ /// The maximum width of the profile in centimeters
+ ///
+ [DataField]
+ public float Max = int.MaxValue;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ const string color = "yellow";
+ var species = prototypeManager.Index(profile.Species);
+
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-width-requirement",
+ ("inverted", Inverted), ("color", color), ("min", Min), ("max", Max)));
+
+ var width = profile.Width * species.AverageWidth;
+ return width >= Min && width <= Max;
+ }
+}
+
+///
+/// Requires the profile to be within a certain weight range
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterWeightRequirement : CharacterRequirement
+{
+ ///
+ /// Minimum weight of the profile in kilograms
+ ///
+ [DataField]
+ public float Min = int.MinValue;
+
+ ///
+ /// Maximum weight of the profile in kilograms
+ ///
+ [DataField]
+ public float Max = int.MaxValue;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ const string color = "green";
+ var species = prototypeManager.Index(profile.Species);
+ prototypeManager.Index(species.Prototype).TryGetComponent(out var fixture);
+
+ if (fixture == null)
+ {
+ reason = null;
+ return false;
+ }
+
+ var weight = MathF.Round(
+ MathF.PI * MathF.Pow(
+ fixture.Fixtures["fix1"].Shape.Radius
+ * ((profile.Width + profile.Height) / 2), 2)
+ * fixture.Fixtures["fix1"].Density);
+
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-weight-requirement",
+ ("inverted", Inverted), ("color", color), ("min", Min), ("max", Max)));
+
+ return weight >= Min && weight <= Max;
+ }
+}
+
+
///
/// Requires the profile to have one of the specified traits
///
@@ -117,9 +283,9 @@ public sealed partial class CharacterTraitRequirement : CharacterRequirement
public List> Traits;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
const string color = "lightblue";
reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-requirement",
@@ -142,9 +308,9 @@ public sealed partial class CharacterLoadoutRequirement : CharacterRequirement
public List> Loadouts;
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
const string color = "lightblue";
reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-requirement",
@@ -155,3 +321,37 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
return Loadouts.Any(l => profile.LoadoutPreferences.Contains(l.ToString()));
}
}
+
+///
+/// Requires the profile to not have any more than X of the specified traits, loadouts, etc, in a group
+///
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterItemGroupRequirement : CharacterRequirement
+{
+ [DataField(required: true)]
+ public ProtoId Group;
+
+ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
+ IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+ out FormattedMessage? reason, int depth = 0)
+ {
+ var group = prototypeManager.Index(Group);
+
+ // Get the count of items in the group that are in the profile
+ var items = group.Items.Select(item => item.TryGetValue(profile, prototypeManager, out _) ? item.ID : null).Where(id => id != null).ToList();
+ var count = items.Count;
+
+ // If prototype is selected, remove one from the count
+ if (items.ToList().Contains(prototype.ID))
+ count--;
+
+ reason = FormattedMessage.FromMarkup(Loc.GetString("character-item-group-requirement",
+ ("inverted", Inverted),
+ ("group", Loc.GetString($"character-item-group-{Group}")),
+ ("max", group.MaxItems)));
+
+ return count < group.MaxItems;
+ }
+}
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Whitelist.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Whitelist.cs
index 56465251cdd..d23d472e067 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.Whitelist.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.Whitelist.cs
@@ -18,9 +18,9 @@ namespace Content.Shared.Customization.Systems;
public sealed partial class CharacterWhitelistRequirement : CharacterRequirement
{
public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
- Dictionary playTimes, bool whitelisted,
+ Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out FormattedMessage? reason)
+ out FormattedMessage? reason, int depth = 0)
{
reason = FormattedMessage.FromMarkup(Loc.GetString("character-whitelist-requirement", ("inverted", Inverted)));
return !configManager.GetCVar(CCVars.WhitelistEnabled) || whitelisted;
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
index b347c9787af..2bf24700a6d 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.cs
@@ -8,7 +8,7 @@
namespace Content.Shared.Customization.Systems;
-
+// ReSharper disable InvalidXmlDocComment
[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
[Serializable, NetSerializable]
public abstract partial class CharacterRequirement
@@ -31,9 +31,11 @@ public abstract bool IsValid(
HumanoidCharacterProfile profile,
Dictionary playTimes,
bool whitelisted,
+ IPrototype prototype,
IEntityManager entityManager,
IPrototypeManager prototypeManager,
IConfigurationManager configManager,
- out FormattedMessage? reason
+ out FormattedMessage? reason,
+ int depth = 0
);
}
diff --git a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
index 521c4f186a2..74c2c26cf8a 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
@@ -1,4 +1,6 @@
+using System.Linq;
using System.Text;
+using Content.Shared.Inventory;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Shared.Configuration;
@@ -10,10 +12,13 @@ namespace Content.Shared.Customization.Systems;
public sealed class CharacterRequirementsSystem : EntitySystem
{
+ [Dependency] private readonly InventorySystem _inventory = default!;
+
+
public bool CheckRequirementsValid(List requirements, JobPrototype job,
- HumanoidCharacterProfile profile, Dictionary playTimes, bool whitelisted,
+ HumanoidCharacterProfile profile, Dictionary playTimes, bool whitelisted, IPrototype prototype,
IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
- out List reasons)
+ out List reasons, int depth = 0)
{
reasons = new List();
var valid = true;
@@ -22,9 +27,9 @@ public bool CheckRequirementsValid(List requirements, JobP
{
// Set valid to false if the requirement is invalid and not inverted
// If it's inverted set valid to false when it's valid
- if (!requirement.IsValid(job, profile, playTimes, whitelisted,
+ if (!requirement.IsValid(job, profile, playTimes, whitelisted, prototype,
entityManager, prototypeManager, configManager,
- out var reason))
+ out var reason, depth))
{
if (valid)
valid = requirement.Inverted;
@@ -48,11 +53,7 @@ public bool CheckRequirementsValid(List requirements, JobP
///
public FormattedMessage GetRequirementsText(List reasons)
{
- var text = new StringBuilder();
- foreach (var reason in reasons)
- text.Append($"\n{reason.ToMarkup()}");
-
- return FormattedMessage.FromMarkup(text.ToString().Trim());
+ return FormattedMessage.FromMarkup(GetRequirementsMarkup(reasons));
}
///
@@ -66,4 +67,16 @@ public string GetRequirementsMarkup(List reasons)
return text.ToString().Trim();
}
+
+
+ ///
+ /// Returns true if the given dummy can equip the given item.
+ /// Does not care if items are already in equippable slots, and ignores pockets.
+ ///
+ public bool CanEntityWearItem(EntityUid dummy, EntityUid clothing)
+ {
+ return _inventory.TryGetSlots(dummy, out var slots)
+ && slots.Where(slot => !slot.SlotFlags.HasFlag(SlotFlags.POCKET))
+ .Any(slot => _inventory.CanEquip(dummy, clothing, slot.Name, out _));
+ }
}
diff --git a/Content.Shared/Prototypes/CharacterItemGroupPrototype.cs b/Content.Shared/Prototypes/CharacterItemGroupPrototype.cs
new file mode 100644
index 00000000000..c303f4f7d52
--- /dev/null
+++ b/Content.Shared/Prototypes/CharacterItemGroupPrototype.cs
@@ -0,0 +1,55 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Customization.Systems;
+using Content.Shared.Preferences;
+using Content.Shared.Traits;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Prototypes;
+
+[Prototype]
+public sealed partial class CharacterItemGroupPrototype : IPrototype
+{
+ [IdDataField]
+ public string ID { get; } = default!;
+
+ /// How many items from this group can be selected at once
+ [DataField]
+ public int MaxItems = 1;
+
+ /// An arbitrary list of traits, loadouts, etc
+ [DataField]
+ public List Items = new();
+}
+
+[DataDefinition]
+public sealed partial class CharacterItemGroupItem
+{
+ [DataField(required: true)]
+ public string Type;
+
+ [DataField("id", required: true)]
+ public string ID;
+
+ /// Tries to get Value from whatever Type maps to on a character profile
+ //TODO: Make a test for this
+ public bool TryGetValue(HumanoidCharacterProfile profile, IPrototypeManager protoMan, [NotNullWhen(true)] out object? value)
+ {
+ value = null;
+
+ // This sucks
+ switch (Type)
+ {
+ case "trait":
+ return profile.TraitPreferences.TryFirstOrDefault(
+ p => protoMan.Index((string) p).ID == ID, out value);
+ case "loadout":
+ return profile.LoadoutPreferences.TryFirstOrDefault(
+ p => protoMan.Index((string) p).ID == ID, out value);
+ default:
+ DebugTools.Assert($"Invalid CharacterItemGroupItem Type: {Type}");
+ return false;
+ }
+ }
+}
diff --git a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
index efbac1ca7d0..f5cf95fd563 100644
--- a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
+++ b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
@@ -11,4 +11,10 @@ public sealed partial class TraitCategoryPrototype : IPrototype
{
[IdDataField]
public string ID { get; } = default!;
+
+ [DataField]
+ public bool Root;
+
+ [DataField]
+ public List> SubCategories = new();
}
diff --git a/Content.Shared/Traits/Prototypes/TraitPrototype.cs b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
index ce42f054bfe..8aa3e4442f0 100644
--- a/Content.Shared/Traits/Prototypes/TraitPrototype.cs
+++ b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
@@ -19,8 +19,8 @@ public sealed partial class TraitPrototype : IPrototype
///
/// Which customization tab to place this entry in
///
- [DataField(required: true), ValidatePrototypeId]
- public string Category = "Uncategorized";
+ [DataField(required: true)]
+ public ProtoId Category = "Uncategorized";
///
/// How many points this will give the character
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index a3f00dea872..d50c2b39669 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -1,50 +1,142 @@
-# Job
-character-job-requirement = You must {$inverted ->
- [true] not be
- *[other] be
-} one of these jobs: {$jobs}
-character-department-requirement = You must {$inverted ->
- [true] not be
- *[other] be
-} in one of these departments: {$departments}
+## Job
+character-job-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be one of these jobs: {$jobs}
+
+character-department-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be in one of these departments: {$departments}
character-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
character-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+
character-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
character-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+
character-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
character-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
-# Profile
-character-age-requirement = You must {$inverted ->
- [true] not be
- *[other] be
+## Logic
+character-logic-and-requirement-listprefix = {""}
+ {$indent}[color=gray]&[/color]{" "}
+character-logic-and-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} fit [color=red]all[/color] of [color=gray]these[/color]: {$options}
+
+character-logic-or-requirement-listprefix = {""}
+ {$indent}[color=white]O[/color]{" "}
+character-logic-or-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} fit [color=red]at least one[/color] of [color=white]these[/color]: {$options}
+
+character-logic-xor-requirement-listprefix = {""}
+ {$indent}[color=white]X[/color]{" "}
+character-logic-xor-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} fit [color=red]only one[/color] of [color=white]these[/color]: {$options}
+
+
+## Profile
+character-age-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
} be within [color=yellow]{$min}[/color] and [color=yellow]{$max}[/color] years old
-character-species-requirement = You must {$inverted ->
- [true] not be
- *[other] be
-} a {$species}
-character-trait-requirement = You must {$inverted ->
- [true] not have
- *[other] have
-} one of these traits: {$traits}
-character-loadout-requirement = You must {$inverted ->
- [true] not have
- *[other] have
-} one of these loadouts: {$loadouts}
+
character-backpack-type-requirement = You must {$inverted ->
[true] not use
*[other] use
} a [color=brown]{$type}[/color] as your bag
+
character-clothing-preference-requirement = You must {$inverted ->
[true] not wear
*[other] wear
} a [color=white]{$type}[/color]
+character-gender-requirement = You must {$inverted ->
+ [true] not have
+ *[other] have
+} the pronouns [color=white]{$gender}[/color]
+
+character-sex-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be [color=white]{$sex ->
+ [None] unsexed
+ *[other] {$sex}
+}[/color]
+character-species-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be a {$species}
+
+character-height-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be {$min ->
+ [-2147483648]{$max ->
+ [2147483648]{""}
+ *[other] shorter than [color={$color}]{$max}[/color]cm
+ }
+ *[other]{$max ->
+ [2147483648] taller than [color={$color}]{$min}[/color]cm
+ *[other] between [color={$color}]{$min}[/color] and [color={$color}]{$max}[/color]cm tall
+ }
+}
+
+character-width-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be {$min ->
+ [-2147483648]{$max ->
+ [2147483648]{""}
+ *[other] skinnier than [color={$color}]{$max}[/color]cm
+ }
+ *[other]{$max ->
+ [2147483648] wider than [color={$color}]{$min}[/color]cm
+ *[other] between [color={$color}]{$min}[/color] and [color={$color}]{$max}[/color]cm wide
+ }
+}
+
+character-weight-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be {$min ->
+ [-2147483648]{$max ->
+ [2147483648]{""}
+ *[other] lighter than [color={$color}]{$max}[/color]kg
+ }
+ *[other]{$max ->
+ [2147483648] heavier than [color={$color}]{$min}[/color]kg
+ *[other] between [color={$color}]{$min}[/color] and [color={$color}]{$max}[/color]kg
+ }
+}
+
+
+character-trait-requirement = You must {$inverted ->
+ [true] not have
+ *[other] have
+} one of these traits: {$traits}
+
+character-loadout-requirement = You must {$inverted ->
+ [true] not have
+ *[other] have
+} one of these loadouts: {$loadouts}
+
+
+character-item-group-requirement = You must {$inverted ->
+ [true] have {$max} or more
+ *[other] have {$max} or less
+} items from the group [color=white]{$group}[/color]
+
-# Whitelist
-character-whitelist-requirement = You must {$inverted ->
- [true] not be
- *[other] be
-} whitelisted
+## Whitelist
+character-whitelist-requirement = You must{$inverted ->
+ [true]{" "}not
+ *[other]{""}
+} be whitelisted
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 9770bd8bafd..6dde7128d87 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -7,6 +7,16 @@ loadout-category-Hands = Hands
loadout-category-Head = Head
loadout-category-Items = Items
loadout-category-Jobs = Jobs
+loadout-category-JobsAUncategorized = Uncategorized
+loadout-category-JobsCommand = Command
+loadout-category-JobsCommandAUncategorized = Uncategorized
+loadout-category-JobsCommandCaptain = Captain
+loadout-category-JobsCommandCE = Chief Engineer
+loadout-category-JobsCommandCMO = Chief Medical Officer
+loadout-category-JobsCommandHOP = Head of Personnel
+loadout-category-JobsCommandHOS = Head of Security
+loadout-category-JobsCommandQM = Logistics Officer
+loadout-category-JobsCommandRD = Mystagogue
loadout-category-Mask = Mask
loadout-category-Neck = Neck
loadout-category-Outer = Outer
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index f0ea0a4a721..d8fb5eab53c 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -59,11 +59,15 @@ humanoid-profile-editor-traits-header = You have {$points ->
}
*[other] {$traits}/{$maxTraits} traits
}
-humanoid-profile-editor-traits-show-unusable-button = Show Unusable
+humanoid-profile-editor-traits-show-unusable-button = Show Unusable Traits
humanoid-profile-editor-traits-show-unusable-button-tooltip =
- When enabled, traits that your current character setup cannot use will be shown highlighted in red.
+ When enabled, traits that your current character setup cannot use will be shown highlighted in red or orange if selected.
You will still not be able to use the invalid traits unless your character setup changes to fit the requirements.
This is most likely useful only if there's a bug hiding traits you actually can use or if you want to see other species' traits or something.
+humanoid-profile-editor-traits-remove-unusable-button = Remove {$count} Unusable Traits
+humanoid-profile-editor-traits-remove-unusable-button-tooltip =
+ If you click this button, all traits that your current character setup cannot use will be removed.
+ You will be asked for confirmation before the traits are removed.
humanoid-profile-editor-traits-no-traits = No traits found
humanoid-profile-editor-job-priority-high-button = High
@@ -75,11 +79,19 @@ humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC name
humanoid-profile-editor-loadouts-tab = Loadout
humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
-humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
+humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable Loadouts
humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
- When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
+ When enabled, loadouts that your current character setup cannot use will be highlighted in red.
+ Loadouts that your character cannot wear (if clothing) will be highlighted in yellow.
You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
- This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every
+ This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time you switch.
+humanoid-profile-editor-loadouts-remove-unusable-button = Remove {$count ->
+ [1] {$count} Unusable Loadout
+ *[other] {$count} Unusable Loadouts
+}
+humanoid-profile-editor-loadouts-remove-unusable-button-tooltip =
+ If you click this button, all loadouts that your current character setup cannot use will be removed.
+ You will be asked for confirmation before the loadouts are removed.
humanoid-profile-editor-loadouts-no-loadouts = No loadouts foundtime.
humanoid-profile-editor-markings-tab = Markings
diff --git a/Resources/Prototypes/CharacterItemGroups/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/itemGroups.yml
new file mode 100644
index 00000000000..a82a8395689
--- /dev/null
+++ b/Resources/Prototypes/CharacterItemGroups/itemGroups.yml
@@ -0,0 +1,67 @@
+# Alphabetically ordered
+# Please do not flood this one file with groups, make more files to sort them
+
+- type: characterItemGroup
+ id: LoadoutUniformsColored
+ maxItems: 1 # 1 is the default, here for clarity
+ items:
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorBlack
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorBlack
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorBlue
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorBlue
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorBrown
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorBrown
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorDarkBlue
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorDarkBlue
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorDarkGreen
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorDarkGreen
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorGreen
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorGreen
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorLightBrown
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorLightBrown
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorMaroon
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorMaroon
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorOrange
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorOrange
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorPink
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorPink
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorPurple
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorPurple
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorRed
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorRed
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorTeal
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorTeal
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorWhite
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorWhite
+ - type: loadout
+ id: LoadoutUniformJumpsuitColorYellow
+ - type: loadout
+ id: LoadoutUniformJumpskirtColorYellow
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
new file mode 100644
index 00000000000..77b1adbe56c
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -0,0 +1,95 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+# AUncategorized is always first in subcategories to stay consistent with the root Uncategorized
+# AUncategorized is not a spelling mistake, and might have more As added as needed
+
+- type: loadoutCategory
+ id: Uncategorized
+ root: true
+
+- type: loadoutCategory
+ id: Eyes
+ root: true
+
+- type: loadoutCategory
+ id: Hands
+ root: true
+
+- type: loadoutCategory
+ id: Head
+ root: true
+
+- type: loadoutCategory
+ id: Items
+ root: true
+
+- type: loadoutCategory
+ id: Jobs
+ root: true
+ subCategories:
+ - JobsAUncategorized
+ - JobsCommand
+
+- type: loadoutCategory
+ id: JobsAUncategorized
+
+- type: loadoutCategory
+ id: JobsCommand
+ subCategories:
+ - JobsCommandAUncategorized
+ - JobsCommandCaptain
+ - JobsCommandCE
+ - JobsCommandCMO
+ - JobsCommandHOP
+ - JobsCommandHOS
+ - JobsCommandQM
+ - JobsCommandRD
+
+
+- type: loadoutCategory
+ id: JobsCommandAUncategorized
+
+- type: loadoutCategory
+ id: JobsCommandCaptain
+
+- type: loadoutCategory
+ id: JobsCommandCE
+
+- type: loadoutCategory
+ id: JobsCommandCMO
+
+- type: loadoutCategory
+ id: JobsCommandHOP
+
+- type: loadoutCategory
+ id: JobsCommandHOS
+
+- type: loadoutCategory
+ id: JobsCommandQM
+
+- type: loadoutCategory
+ id: JobsCommandRD
+
+
+- type: loadoutCategory
+ id: Mask
+ root: true
+
+- type: loadoutCategory
+ id: Neck
+ root: true
+
+- type: loadoutCategory
+ id: Outer
+ root: true
+
+- type: loadoutCategory
+ id: Shoes
+ root: true
+
+- type: loadoutCategory
+ id: Species
+ root: true
+
+- type: loadoutCategory
+ id: Uniform
+ root: true
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
index d77dabf557c..b59f044144f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandCapNeckMantle
- category: Jobs
+ category: JobsCommandCaptain
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandCapNeckCloak
- category: Jobs
+ category: JobsCommandCaptain
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandCapNeckCloakFormal
- category: Jobs
+ category: JobsCommandCaptain
cost: 2
exclusive: true
requirements:
@@ -36,7 +36,7 @@
- type: loadout
id: LoadoutCommandCapJumpsuitFormal
- category: Jobs
+ category: JobsCommandCaptain
cost: 3
exclusive: true
requirements:
@@ -48,7 +48,7 @@
- type: loadout
id: LoadoutCommandCapJumpskirtFormal
- category: Jobs
+ category: JobsCommandCaptain
cost: 3
exclusive: true
requirements:
@@ -60,7 +60,7 @@
- type: loadout
id: LoadoutCommandCapOuterWinter
- category: Jobs
+ category: JobsCommandCaptain
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -71,7 +71,7 @@
- type: loadout
id: LoadoutCommandCapGloves
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -82,7 +82,7 @@
- type: loadout
id: LoadoutCommandCapHat
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -93,7 +93,7 @@
- type: loadout
id: LoadoutCommandCapHatCapcap
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -104,7 +104,7 @@
- type: loadout
id: LoadoutCommandCapHatBeret
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -115,7 +115,7 @@
- type: loadout
id: LoadoutCommandCapMaskGas
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -126,15 +126,10 @@
- type: loadout
id: LoadoutCommandCapShoesBootsWinter
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Captain
@@ -143,7 +138,7 @@
- type: loadout
id: LoadoutCommandCapItemDrinkFlask
- category: Jobs
+ category: JobsCommandCaptain
cost: 1
requirements:
- !type:CharacterJobRequirement
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index 4de22bc9593..187c06119e9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandCENeckMantle
- category: Jobs
+ category: JobsCommandCE
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandCENeckCloak
- category: Jobs
+ category: JobsCommandCE
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandCEOuterWinter
- category: Jobs
+ category: JobsCommandCE
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -35,15 +35,10 @@
- type: loadout
id: LoadoutCommandCEShoesBootsWinter
- category: Jobs
+ category: JobsCommandCE
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- ChiefEngineer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
index 163bad29261..8b236a48f4e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandCMONeckMantle
- category: Jobs
+ category: JobsCommandCMO
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandCMONeckCloak
- category: Jobs
+ category: JobsCommandCMO
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandCMOOuterWinter
- category: Jobs
+ category: JobsCommandCMO
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -35,7 +35,7 @@
- type: loadout
id: LoadoutCommandCMOOuterLab
- category: Jobs
+ category: JobsCommandCMO
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -46,7 +46,7 @@
- type: loadout
id: LoadoutCommandCMOHatBeret
- category: Jobs
+ category: JobsCommandCMO
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -57,15 +57,10 @@
- type: loadout
id: LoadoutCommandCMOShoesBootsWinter
- category: Jobs
+ category: JobsCommandCMO
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- ChiefMedicalOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml
index c8c98b5eb44..43c6213049e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandGlovesInspection
- category: Jobs
+ category: JobsCommandAUncategorized
cost: 1
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index e6bc6ada049..44b77d3acd5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandHOPNeckMantle
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandHOPNeckCloak
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
@@ -36,7 +36,7 @@
- type: loadout
id: LoadoutCommandHOPJumpsuitMess
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
@@ -48,7 +48,7 @@
- type: loadout
id: LoadoutCommandHOPJumpskirtMess
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
@@ -60,7 +60,7 @@
- type: loadout
id: LoadoutcommandHOPOuterCoatFormal
- category: Jobs
+ category: JobsCommandHOP
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -71,7 +71,7 @@
- type: loadout
id: LoadoutCommandHOPBackIan
- category: Jobs
+ category: JobsCommandHOP
cost: 4
requirements:
- !type:CharacterJobRequirement
@@ -82,7 +82,7 @@
- type: loadout
id: LoadoutCommandHOPHatCap
- category: Jobs
+ category: JobsCommandHOP
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -93,15 +93,10 @@
- type: loadout
id: LoadoutCommandHOPShoesBootsWinter
- category: Jobs
+ category: JobsCommandHOP
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- HeadOfPersonnel
@@ -110,7 +105,7 @@
- type: loadout
id: LoadoutCommandHOPBedsheetIan
- category: Jobs
+ category: JobsCommandHOP
cost: 2
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
index 7be380d7474..89e36caed49 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandHOSNeckMantle
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandHOSNeckCloak
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandHOSJumpsuitAlt
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -36,7 +36,7 @@
- type: loadout
id: LoadoutCommandHOSJumpsuitBlue
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -48,7 +48,7 @@
- type: loadout
id: LoadoutCommandHOSJumpsuitGrey
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -60,7 +60,7 @@
- type: loadout
id: LoadoutCommandHOSJumpsuitParade
- category: Jobs
+ category: JobsCommandHOS
cost: 3
exclusive: true
requirements:
@@ -72,7 +72,7 @@
- type: loadout
id: LoadoutCommandHOSJumpsuitFormal
- category: Jobs
+ category: JobsCommandHOS
cost: 3
exclusive: true
requirements:
@@ -84,7 +84,7 @@
- type: loadout
id: LoadoutCommandHOSJumpskirtAlt
- category: Jobs
+ category: JobsCommandHOS
cost: 2
exclusive: true
requirements:
@@ -96,7 +96,7 @@
- type: loadout
id: LoadoutCommandHOSJumpskirtParade
- category: Jobs
+ category: JobsCommandHOS
cost: 3
exclusive: true
requirements:
@@ -108,7 +108,7 @@
- type: loadout
id: LoadoutCommandHOSJumpskirtFormal
- category: Jobs
+ category: JobsCommandHOS
cost: 3
exclusive: true
requirements:
@@ -120,7 +120,7 @@
- type: loadout
id: LoadoutCommandHOSOuterWinter
- category: Jobs
+ category: JobsCommandHOS
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -131,7 +131,7 @@
- type: loadout
id: LoadoutCommandHOSOuterTrench
- category: Jobs
+ category: JobsCommandHOS
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -142,7 +142,7 @@
- type: loadout
id: LoadoutCommandHOSHatBeret
- category: Jobs
+ category: JobsCommandHOS
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -153,7 +153,7 @@
- type: loadout
id: LoadoutCommandHOSHatHoshat
- category: Jobs
+ category: JobsCommandHOS
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -164,15 +164,10 @@
- type: loadout
id: LoadoutCommandHOSShoesBootsWinter
- category: Jobs
+ category: JobsCommandHOS
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- HeadOfSecurity
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
index 15adc7d44e8..62d872cea28 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -1,7 +1,7 @@
# What? This isn't a thing?? :(
# - type: loadout
# id: LoadoutCommandQMNeckMantle
-# category: Jobs
+# category: JobsCommandQM
# cost: 2
# exclusive: true
# requirements:
@@ -13,7 +13,7 @@
- type: loadout
id: LoadoutCommandQMNeckCloak
- category: Jobs
+ category: JobsCommandQM
cost: 2
exclusive: true
requirements:
@@ -25,7 +25,7 @@
- type: loadout
id: LoadoutCommandQMUniformTurtleneck
- category: Jobs
+ category: JobsCommandQM
cost: 2
exclusive: true
requirements:
@@ -37,7 +37,7 @@
- type: loadout
id: LoadoutCommandQMUniformTurtleneckSkirt
- category: Jobs
+ category: JobsCommandQM
cost: 2
exclusive: true
requirements:
@@ -49,7 +49,7 @@
- type: loadout
id: LoadoutCommandQMHeadSoft
- category: Jobs
+ category: JobsCommandQM
cost: 1
requirements:
- !type:CharacterJobRequirement
@@ -60,15 +60,10 @@
- type: loadout
id: LoadoutCommandQMShoesBootsWinter
- category: Jobs
+ category: JobsCommandQM
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Quartermaster
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
index 5d06e54efab..6448f4a1513 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutCommandRDNeckMantle
- category: Jobs
+ category: JobsCommandRD
cost: 2
exclusive: true
requirements:
@@ -12,7 +12,7 @@
- type: loadout
id: LoadoutCommandRDNeckCloak
- category: Jobs
+ category: JobsCommandRD
cost: 2
exclusive: true
requirements:
@@ -24,7 +24,7 @@
- type: loadout
id: LoadoutCommandRDOuterWinter
- category: Jobs
+ category: JobsCommandRD
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -35,7 +35,7 @@
- type: loadout
id: LoadoutCommandRDOuterMysta
- category: Jobs
+ category: JobsCommandRD
cost: 2
requirements:
- !type:CharacterJobRequirement
@@ -46,15 +46,10 @@
- type: loadout
id: LoadoutCommandRDShoesBootsWinter
- category: Jobs
+ category: JobsCommandRD
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
index cdc83a3c0f7..2bec0b7c0a5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -1,7 +1,7 @@
# Cargo technician
- type: loadout
id: LoadoutCargoOuterWinterCargo
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -13,18 +13,13 @@
- type: loadout
id: LoadoutCargoShoesBootsWinterCargo
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- CargoTechnician
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsWinterCargo
@@ -32,7 +27,7 @@
- type: loadout
id: LoadoutCargoOuterWinterMiner
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -44,7 +39,7 @@
- type: loadout
id: LoadoutCargoNeckGoliathCloak
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 06ce4cbf8c3..94f018e5834 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -1,13 +1,9 @@
- type: loadout
id: LoadoutEngineeringUniformHazard
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- StationEngineer
@@ -16,7 +12,7 @@
- type: loadout
id: LoadoutEngineeringOuterHazard
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -28,7 +24,7 @@
- type: loadout
id: LoadoutEngineeringUniformJumpskirtSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -49,14 +45,10 @@
- type: loadout
id: LoadoutEngineeringUniformJumpsuitSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- StationEngineer
@@ -74,7 +66,7 @@
- type: loadout
id: LoadoutEngineeringChickenSuit # :)
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
@@ -87,7 +79,7 @@
- type: loadout
id: LoadoutEngineeringEyesMeson
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -100,7 +92,7 @@
- type: loadout
id: LoadoutEngineeringHeadBeret
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -114,7 +106,7 @@
- type: loadout
id: LoadoutEngineeringHeadHardhatBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -127,7 +119,7 @@
- type: loadout
id: LoadoutEngineeringHeadHardhatOrange
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -140,7 +132,7 @@
- type: loadout
id: LoadoutEngineeringHeadHardhatYellow
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -153,7 +145,7 @@
- type: loadout
id: LoadoutEngineeringHeadHardhatWhite
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -166,7 +158,7 @@
- type: loadout
id: LoadoutEngineeringHeadHardhatRed
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index f193dfaea2d..33d6ff36da9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutMedicalGlovesNitrile
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -16,7 +16,7 @@
- type: loadout
id: LoadoutMedicalOuterLabcoat
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -29,7 +29,7 @@
- type: loadout
id: LoadoutMedicalNeckStethoscope
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -43,14 +43,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -62,14 +58,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsGreen
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -81,14 +73,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsPurple
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -100,14 +88,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsCyan
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -119,14 +103,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsBlack
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -138,14 +118,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsPink
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -157,14 +133,10 @@
- type: loadout
id: LoadoutMedicalUniformScrubsCybersun
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -175,7 +147,7 @@
- type: loadout
id: LoadoutMedicalOuterCybersunWindbreaker
- category: Jobs
+ category: JobsAUncategorized
cost: 5
exclusive: true
requirements:
@@ -189,7 +161,7 @@
- type: loadout
id: LoadoutMedicalOuterLabcoatChem
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -201,7 +173,7 @@
- type: loadout
id: LoadoutMedicalItemHandLabeler
- category: Jobs
+ category: JobsAUncategorized
exclusive: true
requirements:
- !type:CharacterJobRequirement
@@ -212,14 +184,10 @@
- type: loadout
id: LoadoutMedicalUniformParamedicJumpsuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Paramedic
@@ -228,7 +196,7 @@
- type: loadout
id: LoadoutMedicalUniformParamedicJumpskirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -240,7 +208,7 @@
- type: loadout
id: LoadoutMedicalUniformJumpskirtSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -264,14 +232,10 @@
- type: loadout
id: LoadoutMedicalUniformJumpsuitSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
@@ -292,7 +256,7 @@
- type: loadout
id: LoadoutMedicalHeadNurse
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -304,7 +268,7 @@
- type: loadout
id: LoadoutMedicalHeadBeretSeniorPhysician
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -328,7 +292,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -343,7 +307,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapPurple
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -358,7 +322,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapGreen
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -373,7 +337,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapCyan
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -388,7 +352,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapBlack
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -403,7 +367,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapPink
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -418,7 +382,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapWhite
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -433,7 +397,7 @@
- type: loadout
id: LoadoutMedicalHeadSurgcapCybersun
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
@@ -447,7 +411,7 @@
- type: loadout
id: LoadoutMedicalEyesHudMedical
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -463,7 +427,7 @@
- type: loadout
id: LoadoutMedicalEyesEyepatchHudMedical
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -479,7 +443,7 @@
- type: loadout
id: LoadoutMedicalEyesHudMedicalPrescription
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -498,7 +462,7 @@
- type: loadout
id: LoadoutMedicalEyesGlassesChemical
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -510,7 +474,7 @@
- type: loadout
id: LoadoutMedicalBedsheetMedical
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -523,23 +487,19 @@
# Chemist PPE gear
- type: loadout
id: LoadoutMedicalUniformJumpsuitChemShirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- Chemist
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
items:
- ClothingUniformJumpsuitChemShirt
- type: loadout
id: LoadoutMedicalNeckTieChem
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -551,24 +511,19 @@
- type: loadout
id: LoadoutMedicalShoesEnclosedChem
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- Chemist
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesEnclosedChem
- type: loadout
id: LoadoutMedicalOuterApronChemist
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -580,7 +535,7 @@
- type: loadout
id: LoadoutMedicalEyesGlassesChemist
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -592,7 +547,7 @@
- type: loadout
id: LoadoutMedicalHandsGlovesChemist
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index 04b226e2ba2..8a1a2710c24 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -1,6 +1,6 @@
- type: loadout
id: LoadoutScienceUniformJumpskirtSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -15,14 +15,10 @@
- type: loadout
id: LoadoutScienceUniformJumpsuitSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Scientist
@@ -34,7 +30,7 @@
- type: loadout
id: LoadoutScienceOuterCoat
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -48,7 +44,7 @@
- type: loadout
id: LoadoutScienceOuterLabcoat
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -62,7 +58,7 @@
- type: loadout
id: LoadoutScienceOuterLabcoatSeniorResearcher
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -77,7 +73,7 @@
- type: loadout
id: LoadoutScienceOuterExplorerLabcoat
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -91,7 +87,7 @@
- type: loadout
id: LoadoutScienceHatBeret
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -105,7 +101,7 @@
- type: loadout
id: LoadoutScienceEyesHudDiagnostic
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
@@ -119,7 +115,7 @@
- type: loadout
id: LoadoutScienceEyesEyepatchHudDiag
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index 527c9391c0a..13d11b13fa5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -1,14 +1,10 @@
# Uniforms
- type: loadout
id: LoadoutSecurityUniformJumpsuitBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
@@ -17,14 +13,10 @@
- type: loadout
id: LoadoutSecurityUniformJumpsuitGrey
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
@@ -33,7 +25,7 @@
- type: loadout
id: LoadoutSecurityUniformJumpskirtGrey
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -45,7 +37,7 @@
- type: loadout
id: LoadoutSecurityUniformJumpskirtBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -57,7 +49,7 @@
- type: loadout
id: LoadoutSecurityUniformJumpskirtSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -81,14 +73,10 @@
- type: loadout
id: LoadoutSecurityUniformJumpsuitSenior
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- SecurityOfficer
@@ -109,14 +97,10 @@
- type: loadout
id: LoadoutUniformJumpsuitWardenBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Warden
@@ -125,14 +109,10 @@
- type: loadout
id: LoadoutUniformJumpsuitWardenGrey
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Warden
@@ -141,7 +121,7 @@
- type: loadout
id: LoadoutUniformJumpskirtWardenBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -153,7 +133,7 @@
- type: loadout
id: LoadoutUniformJumpskirtWardenGrey
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -165,7 +145,7 @@
- type: loadout
id: LoadoutUniformJumpskirtHoSBlue
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -177,7 +157,7 @@
- type: loadout
id: LoadoutUniformJumpskirtHoSGrey
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -189,14 +169,10 @@
- type: loadout
id: LoadoutUniformJumpsuitSecFormal
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
@@ -205,24 +181,20 @@
- type: loadout
id: LoadoutUniformJumpsuitSecSummer
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- ClothingUniformJumpsuitSecSummer
-
+
# Mask
- type: loadout
id: LoadoutSecurityMaskGasSwat
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -236,14 +208,9 @@
# Shoes
- type: loadout
id: LoadoutSecurityShoesJackboots
- category: Jobs
+ category: JobsAUncategorized
cost: 1
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
@@ -252,14 +219,9 @@
- type: loadout
id: LoadoutClothingShoesBootsCombat
- category: Jobs
+ category: JobsAUncategorized
cost: 1
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
@@ -269,7 +231,7 @@
# Eyes
- type: loadout
id: LoadoutSecurityEyesHudSecurity
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -281,7 +243,7 @@
- type: loadout
id: ClothingEyesGlassesSunglasses
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -293,7 +255,7 @@
- type: loadout
id: LoadoutSecurityEyesEyepatchHudSecurity
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -305,7 +267,7 @@
- type: loadout
id: LoadoutSecurityEyesHudSecurityPrescription
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -320,7 +282,7 @@
- type: loadout
id: LoadoutClothingEyesGlassesSecurity
- category: Jobs
+ category: JobsAUncategorized
cost: 4
exclusive: true
requirements:
@@ -336,7 +298,7 @@
# Head
- type: loadout
id: LoadoutSecurityHeadHatBeret
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -348,7 +310,7 @@
- type: loadout
id: LoadoutClothingHeadHelmetBasic
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -360,7 +322,7 @@
- type: loadout
id: LoadoutClothingHeadHatBeretBrigmedic
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -372,7 +334,7 @@
- type: loadout
id: LoadoutClothingHeadHatBeretCorpsman
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -384,7 +346,7 @@
- type: loadout
id: LoadoutClothingHeadHatBeretWarden
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -396,7 +358,7 @@
- type: loadout
id: LoadoutClothingHeadHatBeretHoS
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -408,7 +370,7 @@
- type: loadout
id: LoadoutSecurityHeadHelmetInsulated
- category: Jobs
+ category: JobsAUncategorized
cost: 2
requirements:
- !type:CharacterDepartmentRequirement
@@ -420,7 +382,7 @@
# Belt
- type: loadout
id: LoadoutSecurityBeltWebbing
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -432,7 +394,7 @@
- type: loadout
id: LoadoutClothingBeltCorpsmanWebbing
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -444,7 +406,7 @@
- type: loadout
id: LoadoutClothingBeltSecurity
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -458,7 +420,7 @@
- type: loadout
id: LoadoutClothingHandsGlovesNitrile
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -470,7 +432,7 @@
- type: loadout
id: LoadoutClothingOuterArmorPlateCarrier
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -482,7 +444,7 @@
- type: loadout
id: LoadoutClothingOuterArmorDuraVest
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -494,7 +456,7 @@
- type: loadout
id: LoadoutClothingOuterCoatDetective
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -506,7 +468,7 @@
- type: loadout
id: LoadoutOuterVestDetective
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -518,7 +480,7 @@
- type: loadout
id: LoadoutClothingOuterCoatWarden
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -530,7 +492,7 @@
- type: loadout
id: LoadoutClothingOuterCoatHoSTrench
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -542,7 +504,7 @@
- type: loadout
id: LoadoutClothingOuterWinterHoS
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -555,7 +517,7 @@
# Neck
- type: loadout
id: LoadoutClothingNeckCloakHos
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -567,7 +529,7 @@
- type: loadout
id: LoadoutClothingNeckMantleHOS
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -579,7 +541,7 @@
- type: loadout
id: LoadoutBedsheetBrigmedic
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -588,12 +550,12 @@
- Brigmedic
items:
- BedsheetBrigmedic
-
-
+
+
# Equipment
- type: loadout
id: LoadoutSecurityCombatKnife
- category: Jobs
+ category: JobsAUncategorized
cost: 2
requirements:
- !type:CharacterDepartmentRequirement
@@ -604,7 +566,7 @@
- type: loadout
id: LoadoutSecurityFlash
- category: Jobs
+ category: JobsAUncategorized
cost: 1
requirements:
- !type:CharacterDepartmentRequirement
@@ -615,7 +577,7 @@
- type: loadout
id: LoadoutSecurityDisabler
- category: Jobs
+ category: JobsAUncategorized
cost: 2
requirements:
- !type:CharacterDepartmentRequirement
@@ -626,7 +588,7 @@
- type: loadout
id: LoadoutMagazinePistolRubber
- category: Jobs
+ category: JobsAUncategorized
cost: 2
requirements:
- !type:CharacterDepartmentRequirement
@@ -637,7 +599,7 @@
- type: loadout
id: LoadoutSpeedLoaderMagnumRubber
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -651,7 +613,7 @@
# # Species
# - type: loadout
# id: LoadoutSecurityEquipmentTruncheon
-# category: Jobs
+# category: JobsAUncategorized
# cost: 8
# requirements:
# - !type:CharacterJobRequirement
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 74a7364e9a4..815138e393a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -1,7 +1,7 @@
# Clown
- type: loadout
id: LoadoutServiceClownOutfitJester
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
@@ -15,7 +15,7 @@
- type: loadout
id: LoadoutServiceClownOutfitJesterAlt
- category: Jobs
+ category: JobsAUncategorized
cost: 3
exclusive: true
requirements:
@@ -29,7 +29,7 @@
- type: loadout
id: LoadoutServiceClownOuterWinter
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -41,7 +41,7 @@
- type: loadout
id: LoadoutServiceClownOuterClownPriest
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -53,24 +53,19 @@
- type: loadout
id: LoadoutServiceClownBootsWinter
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- Clown
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsWinterClown
- type: loadout
id: LoadoutServiceClownMaskSexy
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -82,7 +77,7 @@
- type: loadout
id: LoadoutServiceClownBedsheetClown
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -94,19 +89,51 @@
- type: loadout
id: LoadoutServiceClownCowToolboxFilled
- category: Jobs
+ category: JobsAUncategorized
cost: 3
requirements:
- - !type:CharacterJobRequirement
- jobs:
- - Clown
+ - !type:CharacterLogicXorRequirement
+ requirements:
+ - !type:CharacterLogicAndRequirement
+ requirements:
+ - !type:CharacterSexRequirement
+ sex: Male
+ - !type:CharacterSpeciesRequirement
+ species:
+ - Felinid
+ - !type:CharacterHeightRequirement
+ min: 110
+ max: 122
+ - !type:CharacterGenderRequirement
+ gender: Female
+ - !type:CharacterTraitRequirement
+ traits:
+ - HeavyweightDrunk
+ - !type:CharacterLogicAndRequirement
+ requirements:
+ - !type:CharacterSpeciesRequirement
+ species:
+ - Harpy
+ - !type:CharacterHeightRequirement
+ min: 170
+ - !type:CharacterWeightRequirement
+ min: 20
+ - !type:CharacterSexRequirement
+ sex: Male
+ - !type:CharacterJobRequirement
+ inverted: true
+ jobs:
+ - Clown
+ - !type:CharacterJobRequirement
+ jobs:
+ - Clown
items:
- CowToolboxFilled
# Mime
- type: loadout
id: LoadoutServiceMimeOuterWinter
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -118,7 +145,7 @@
- type: loadout
id: LoadoutServiceMimeMaskSad
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -130,7 +157,7 @@
- type: loadout
id: LoadoutServiceMimeMaskScared
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -142,7 +169,7 @@
- type: loadout
id: LoadoutServiceMimeMaskSexy
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
@@ -154,24 +181,19 @@
- type: loadout
id: LoadoutServiceMimeShoesBootsWinter
- category: Jobs
+ category: JobsAUncategorized
cost: 1
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- Mime
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsWinterMime
- type: loadout
id: LoadoutServiceMimeBedsheetMime
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -184,7 +206,7 @@
# Bartender
- type: loadout
id: LoadoutServiceBartenderUniformPurple
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -197,12 +219,12 @@
# Botanist
- type: loadout
id: LoadoutServiceBotanistUniformOveralls
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterJobRequirement
- jobs:
+ jobs:
- Botanist
items:
- ClothingUniformOveralls
@@ -210,23 +232,19 @@
# Lawyer
- type: loadout
id: LoadoutServiceLawyerUniformBlueSuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
- jobs:
+ jobs:
- Lawyer
items:
- ClothingUniformJumpsuitLawyerBlue
- type: loadout
id: LoadoutServiceLawyerUniformBlueSkirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -238,14 +256,10 @@
- type: loadout
id: LoadoutServiceLawyerUniformRedSuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Lawyer
@@ -254,7 +268,7 @@
- type: loadout
id: LoadoutServiceLawyerUniformRedSkirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -266,14 +280,10 @@
- type: loadout
id: LoadoutServiceLawyerUniformPurpleSuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Lawyer
@@ -282,7 +292,7 @@
- type: loadout
id: LoadoutServiceLawyerUniformPurpleSkirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -294,14 +304,10 @@
- type: loadout
id: LoadoutServiceLawyerUniformGoodSuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Lawyer
@@ -310,7 +316,7 @@
- type: loadout
id: LoadoutServiceLawyerUniformGoodSkirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -322,7 +328,7 @@
- type: loadout
id: LoadoutServiceReporterUniformJournalist
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -335,14 +341,10 @@
# Reporter
- type: loadout
id: LoadoutServiceReporterUniformDetectivesuit
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Reporter
@@ -351,7 +353,7 @@
- type: loadout
id: LoadoutServiceReporterUniformDetectiveskirt
- category: Jobs
+ category: JobsAUncategorized
cost: 2
exclusive: true
requirements:
@@ -364,7 +366,7 @@
# Musician
- type: loadout
id: LoadoutItemSynthesizerInstrument
- category: Jobs
+ category: JobsAUncategorized
cost: 8
requirements:
- !type:CharacterJobRequirement
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
deleted file mode 100644
index 0dfccb096ca..00000000000
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Alphabetically ordered, except for Uncategorized since it is always first
-
-- type: loadoutCategory
- id: Uncategorized
-
-- type: loadoutCategory
- id: Eyes
-
-- type: loadoutCategory
- id: Hands
-
-- type: loadoutCategory
- id: Head
-
-- type: loadoutCategory
- id: Items
-
-- type: loadoutCategory
- id: Jobs
-
-- type: loadoutCategory
- id: Mask
-
-- type: loadoutCategory
- id: Neck
-
-- type: loadoutCategory
- id: Outer
-
-- type: loadoutCategory
- id: Shoes
-
-- type: loadoutCategory
- id: Species
-
-- type: loadoutCategory
- id: Uniform
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index e67ca70b392..5aedd3ccf64 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -4,12 +4,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorBlack
@@ -18,12 +12,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorBlue
@@ -32,12 +20,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorBrown
@@ -46,12 +28,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorGreen
@@ -60,12 +36,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorOrange
@@ -74,12 +44,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorPurple
@@ -88,12 +52,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorRed
@@ -102,12 +60,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorWhite
@@ -116,12 +68,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesColorYellow
@@ -130,12 +76,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesGeta
@@ -144,12 +84,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesTourist
@@ -159,12 +93,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsWork
@@ -173,12 +101,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsLaceup
@@ -187,12 +109,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsWinter
@@ -201,12 +117,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsCowboyBrown
@@ -215,12 +125,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsCowboyBlack
@@ -229,12 +133,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsCowboyWhite
@@ -243,12 +141,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsCowboyFancy
@@ -257,12 +149,6 @@
category: Shoes
cost: 2
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesBootsFishing
@@ -275,11 +161,6 @@
items:
- ClothingShoeSlippersDuck
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Clown
@@ -289,12 +170,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesLeather
@@ -303,12 +178,6 @@
category: Shoes
cost: 1
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesMiscWhite
@@ -317,12 +186,6 @@
category: Shoes
cost: 3
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingShoesHighheelBoots
@@ -332,12 +195,6 @@
category: Shoes
cost: 3
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingUnderSocksCoder
@@ -346,12 +203,6 @@
category: Shoes
cost: 3
exclusive: true
- requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Diona
- - Harpy
items:
- ClothingUnderSocksBee
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 5843cb30ee5..86c61c3af38 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -4,10 +4,6 @@
cost: 2
exclusive: true
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterJobRequirement
jobs:
- Passenger
@@ -15,6 +11,7 @@
- ClothingUniformJumpsuitAncient
# Colored jumpsuits
+# Someone please alphabetically order these...
- type: loadout
id: LoadoutUniformJumpsuitColorBlack
@@ -24,18 +21,16 @@
items:
- ClothingUniformJumpsuitColorBlack
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Security
+ departments:
+ - Civilian
+ - Security
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorBlack
@@ -45,14 +40,16 @@
items:
- ClothingUniformJumpskirtColorBlack
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Security
+ departments:
+ - Civilian
+ - Security
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorBlue
@@ -62,18 +59,16 @@
items:
- ClothingUniformJumpsuitColorBlue
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Medical
- - Civilian
+ departments:
+ - Medical
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorBlue
@@ -83,14 +78,16 @@
items:
- ClothingUniformJumpskirtColorBlue
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Medical
- - Civilian
+ departments:
+ - Medical
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorGreen
@@ -100,17 +97,15 @@
items:
- ClothingUniformJumpsuitColorGreen
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorGreen
@@ -120,13 +115,15 @@
items:
- ClothingUniformJumpskirtColorGreen
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorOrange
@@ -136,17 +133,15 @@
items:
- ClothingUniformJumpsuitColorOrange
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorOrange
@@ -156,13 +151,15 @@
items:
- ClothingUniformJumpskirtColorOrange
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorPink
@@ -172,17 +169,15 @@
items:
- ClothingUniformJumpsuitColorPink
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorPink
@@ -192,13 +187,15 @@
items:
- ClothingUniformJumpskirtColorPink
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorRed
@@ -208,18 +205,16 @@
items:
- ClothingUniformJumpsuitColorRed
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Security
+ departments:
+ - Civilian
+ - Security
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorRed
@@ -229,14 +224,16 @@
items:
- ClothingUniformJumpskirtColorRed
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Security
+ departments:
+ - Civilian
+ - Security
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorWhite
@@ -246,19 +243,17 @@
items:
- ClothingUniformJumpsuitColorWhite
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Medical
- - Epistemics
+ departments:
+ - Civilian
+ - Medical
+ - Epistemics
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorWhite
@@ -268,15 +263,17 @@
items:
- ClothingUniformJumpskirtColorWhite
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Medical
- - Epistemics
+ departments:
+ - Civilian
+ - Medical
+ - Epistemics
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorYellow
@@ -286,18 +283,16 @@
items:
- ClothingUniformJumpsuitColorYellow
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Engineering
+ departments:
+ - Civilian
+ - Engineering
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorYellow
@@ -307,14 +302,16 @@
items:
- ClothingUniformJumpskirtColorYellow
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Engineering
+ departments:
+ - Civilian
+ - Engineering
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorDarkBlue
@@ -324,17 +321,15 @@
items:
- ClothingUniformJumpsuitColorDarkBlue
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorDarkBlue
@@ -344,13 +339,15 @@
items:
- ClothingUniformJumpskirtColorDarkBlue
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorTeal
@@ -360,17 +357,15 @@
items:
- ClothingUniformJumpsuitColorTeal
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorTeal
@@ -380,13 +375,15 @@
items:
- ClothingUniformJumpskirtColorTeal
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorPurple
@@ -396,18 +393,16 @@
items:
- ClothingUniformJumpsuitColorPurple
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Epistemics
+ departments:
+ - Civilian
+ - Epistemics
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorPurple
@@ -417,14 +412,16 @@
items:
- ClothingUniformJumpskirtColorPurple
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
- - Epistemics
+ departments:
+ - Civilian
+ - Epistemics
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorDarkGreen
@@ -434,17 +431,15 @@
items:
- ClothingUniformJumpsuitColorDarkGreen
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorDarkGreen
@@ -454,13 +449,15 @@
items:
- ClothingUniformJumpskirtColorDarkGreen
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorLightBrown
@@ -470,17 +467,15 @@
items:
- ClothingUniformJumpsuitColorLightBrown
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorLightBrown
@@ -490,13 +485,15 @@
items:
- ClothingUniformJumpskirtColorLightBrown
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorBrown
@@ -506,17 +503,15 @@
items:
- ClothingUniformJumpsuitColorBrown
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorBrown
@@ -526,13 +521,15 @@
items:
- ClothingUniformJumpskirtColorBrown
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitColorMaroon
@@ -542,17 +539,15 @@
items:
- ClothingUniformJumpsuitColorMaroon
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtColorMaroon
@@ -562,13 +557,15 @@
items:
- ClothingUniformJumpskirtColorMaroon
requirements:
+ - !type:CharacterItemGroupRequirement
+ group: LoadoutUniformsColored
- !type:CharacterDepartmentRequirement
- departments:
- - Civilian
+ departments:
+ - Civilian
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitFlannel
@@ -578,14 +575,10 @@
items:
- ClothingUniformJumpsuitFlannel
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtCasualBlue
@@ -596,10 +589,10 @@
- ClothingUniformJumpskirtCasualBlue
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitCasualPurple
@@ -609,15 +602,11 @@
items:
- ClothingUniformJumpsuitCasualPurple
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtCasualPurple
@@ -628,10 +617,10 @@
- ClothingUniformJumpskirtCasualPurple
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitCasualRed
@@ -641,14 +630,10 @@
items:
- ClothingUniformJumpsuitCasualRed
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtCasualRed
@@ -659,9 +644,9 @@
- ClothingUniformJumpskirtCasualRed
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitTshirtJeans
@@ -671,15 +656,11 @@
items:
- ClothingUniformJumpsuitTshirtJeans
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitTshirtJeansGray
@@ -689,14 +670,10 @@
items:
- ClothingUniformJumpsuitTshirtJeansGray
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitTshirtJeansPeach
@@ -706,14 +683,10 @@
items:
- ClothingUniformJumpsuitTshirtJeansPeach
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitJeansGreen
@@ -723,15 +696,11 @@
items:
- ClothingUniformJumpsuitJeansGreen
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitJeansRed
@@ -741,14 +710,10 @@
items:
- ClothingUniformJumpsuitJeansRed
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitJeansBrown
@@ -758,15 +723,11 @@
items:
- ClothingUniformJumpsuitJeansBrown
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitLostTourist
@@ -776,15 +737,11 @@
items:
- ClothingUniformJumpsuitLostTourist
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# Hawaiian shirts
- type: loadout
@@ -795,15 +752,11 @@
items:
- ClothingUniformJumpsuitHawaiBlack
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitHawaiBlue
@@ -813,15 +766,11 @@
items:
- ClothingUniformJumpsuitHawaiBlue
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitHawaiRed
@@ -831,14 +780,10 @@
items:
- ClothingUniformJumpsuitHawaiRed
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitHawaiYellow
@@ -848,15 +793,11 @@
items:
- ClothingUniformJumpsuitHawaiYellow
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# AutoDrobe clothes
- type: loadout
@@ -868,9 +809,9 @@
- ClothingUniformDressRed
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitSober
@@ -880,14 +821,10 @@
items:
- ClothingUniformJumpsuitSober
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformSkirtTurtle
@@ -898,9 +835,9 @@
- ClothingUniformSkirtTurtle
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformGeisha
@@ -911,9 +848,9 @@
- UniformGeisha
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformCostumeArcDress
@@ -924,10 +861,10 @@
- ClothingCostumeArcDress
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformCostumeMioSkirt
@@ -938,10 +875,10 @@
- ClothingCostumeMioSkirt
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformCostumeNaota
@@ -952,10 +889,10 @@
- ClothingCostumeNaota
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpsuitLoungewear
@@ -966,9 +903,9 @@
- ClothingUniformJumpsuitLoungewear
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
# Bartender clothes
- type: loadout
@@ -979,15 +916,11 @@
items:
- ClothingUniformJumpsuitBartender
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformJumpskirtBartender
@@ -998,10 +931,10 @@
- ClothingUniformJumpskirtBartender
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# Kendo
- type: loadout
@@ -1013,9 +946,9 @@
- ClothingUniformKendoHakama
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformMartialGi
@@ -1026,10 +959,10 @@
- ClothingUniformMartialGi
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# Kimono
- type: loadout
@@ -1041,10 +974,10 @@
- ClothingUniformJumpsuitKimono
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutClothingKimonoBlue
@@ -1055,10 +988,10 @@
- ClothingKimonoBlue
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutClothingKimonoPink
@@ -1069,10 +1002,10 @@
- ClothingKimonoPink
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutClothingKimonoPurple
@@ -1083,10 +1016,10 @@
- ClothingKimonoPurple
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutClothingKimonoSky
@@ -1097,10 +1030,10 @@
- ClothingKimonoSky
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutClothingKimonoGreen
@@ -1111,10 +1044,10 @@
- ClothingKimonoGreen
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# Gakuran
- type: loadout
@@ -1126,9 +1059,9 @@
- ClothingUniformSchoolGakuranBlack
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
# Schoolgirl uniform
- type: loadout
@@ -1140,9 +1073,9 @@
- UniformSchoolgirlBlack
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlBlue
@@ -1153,10 +1086,10 @@
- UniformSchoolgirlBlue
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlCyan
@@ -1167,10 +1100,10 @@
- UniformSchoolgirlCyan
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlGreen
@@ -1181,10 +1114,10 @@
- UniformSchoolgirlGreen
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlOrange
@@ -1195,10 +1128,10 @@
- UniformSchoolgirlOrange
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlPink
@@ -1209,10 +1142,10 @@
- UniformSchoolgirlPink
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlPurple
@@ -1223,10 +1156,10 @@
- UniformSchoolgirlPurple
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlRed
@@ -1237,9 +1170,9 @@
- UniformSchoolgirlRed
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlDusk
@@ -1250,10 +1183,10 @@
- UniformSchoolgirlDusk
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
- type: loadout
id: LoadoutUniformSchoolgirlBlazerTan
@@ -1264,10 +1197,10 @@
- UniformSchoolgirlBlazerTan
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Security
- - Command
+ inverted: true
+ departments:
+ - Security
+ - Command
# MNK Uniforms
- type: loadout
@@ -1279,9 +1212,9 @@
- ClothingUniformMNKOfficeSkirt
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKUnderGarment
@@ -1292,9 +1225,9 @@
- ClothingUniformMNKUnderGarment
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKGymBra
@@ -1305,9 +1238,9 @@
- ClothingUniformMNKGymBra
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKDressBlack
@@ -1318,9 +1251,9 @@
- ClothingUniformMNKDressBlack
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKBlackOveralls
@@ -1331,9 +1264,9 @@
- ClothingUniformMNKBlackOveralls
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKBlackShoulder
@@ -1344,9 +1277,9 @@
- ClothingUniformMNKBlackShoulder
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingMNKTracksuitBlack
@@ -1357,9 +1290,9 @@
- ClothingUniformMNKTracksuitBlack
requirements:
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
# Suits
- type: loadout
@@ -1370,14 +1303,10 @@
items:
- ClothingUniformJumpsuitSuitBlack
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitBlackAlt
@@ -1387,14 +1316,10 @@
items:
- ClothingUniformJumpsuitSuitBlackAlt
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitBlackMob
@@ -1404,14 +1329,10 @@
items:
- ClothingUniformJumpsuitSuitBlackMob
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitBrown
@@ -1421,15 +1342,11 @@
items:
- ClothingUniformJumpsuitSuitBrown
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
- - Security
+ inverted: true
+ departments:
+ - Command
+ - Security
- type: loadout
id: LoadoutClothingJumpsuitSuitBrownAlt
@@ -1439,14 +1356,10 @@
items:
- ClothingUniformJumpsuitSuitBrownAlt
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitBrownMob
@@ -1456,14 +1369,10 @@
items:
- ClothingUniformJumpsuitSuitBrownMob
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitWhite
@@ -1473,15 +1382,11 @@
items:
- ClothingUniformJumpsuitSuitWhite
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
- - Security
+ inverted: true
+ departments:
+ - Command
+ - Security
- type: loadout
id: LoadoutClothingJumpsuitSuitWhiteAlt
@@ -1491,14 +1396,10 @@
items:
- ClothingUniformJumpsuitSuitWhiteAlt
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
- type: loadout
id: LoadoutClothingJumpsuitSuitWhiteMob
@@ -1508,11 +1409,7 @@
items:
- ClothingUniformJumpsuitSuitWhiteMob
requirements:
- - !type:CharacterSpeciesRequirement
- inverted: true
- species:
- - Harpy
- !type:CharacterDepartmentRequirement
- inverted: true
- departments:
- - Command
+ inverted: true
+ departments:
+ - Command
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index ba3fd7b3456..e413706bfa0 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -2,18 +2,24 @@
- type: traitCategory
id: Uncategorized
+ root: true
- type: traitCategory
id: Auditory
+ root: true
- type: traitCategory
id: Mental
+ root: true
- type: traitCategory
id: Physical
+ root: true
- type: traitCategory
id: Speech
+ root: true
- type: traitCategory
id: Visual
+ root: true