Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent random slots from hiding character noses and hair #1028

Closed
wants to merge 11 commits into from
Closed

Prevent random slots from hiding character noses and hair #1028

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb6251d
Fix formatting
DinoWattz Mar 28, 2024
463e81f
Merge branch 'master' of https://github.com/DinoWattz/Delta-v
DinoWattz Mar 28, 2024
d78033e
Make so pocket items don't affect character visual layers
DinoWattz Mar 28, 2024
dbc81b4
Merge branch 'DeltaV-Station:master' into master
DinoWattz Mar 28, 2024
29bf53f
Merge branch 'DeltaV-Station:master' into why
DinoWattz Mar 28, 2024
8348652
Merge branch 'DeltaV-Station:master' into why
DinoWattz Mar 28, 2024
363150d
Merge branch 'master' of https://github.com/DinoWattz/Delta-v
DinoWattz Mar 28, 2024
cb36b67
Revised code
DinoWattz Mar 28, 2024
6b34bc8
Merge branch 'DeltaV-Station:master' into why
DinoWattz Mar 28, 2024
c6699ac
Merge branch 'why' of https://github.com/DinoWattz/Delta-v into why
DinoWattz Mar 28, 2024
2fbb342
Merge branch 'master' into why
DinoWattz Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private void QuickEquip(

private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag)
{
InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee, SlotFlags.HEAD ^ SlotFlags.MASK);
bool shouldLayerShow = true;

while (enumerator.NextItem(out EntityUid item))
Expand Down Expand Up @@ -164,7 +164,7 @@ private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAf
{
if (args.Handled || args.Cancelled || args.Target is not { } target)
return;
args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false);
args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false);
}

private void OnUnequipDoAfter(Entity<ClothingComponent> ent, ref ClothingUnequipDoAfterEvent args)
Expand Down
Loading