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.

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

Pants Slot, Again #20240

Merged
merged 24 commits into from
Jan 9, 2025
Merged

Pants Slot, Again #20240

merged 24 commits into from
Jan 9, 2025

Conversation

alsoandanswer
Copy link
Contributor

@alsoandanswer alsoandanswer commented Dec 9, 2024

From previous PR:

  • Fixes Quick Equip (Thanks, Matt)
  • Fixes Loadout Preview, will override uniforms properly now
  • Turns shirts into uniform items, so you can attach accessories to them

This also fixes the issue of people spawning in shirtless if they didn't attach properly to the pants.

Additions:

  • Shifts suspenders, leather chaps, and kneepads to be pants accessories.
    (This fixes the issue of accessories staying even without pants, e.g. assless chaps)
    (In future, hip holsters are to be added to this accessory list)

Anyway, that's the long and short of it. Have fun.

@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Dec 9, 2024
@alsoandanswer alsoandanswer changed the title Pants Slot Pants Slot, Again Dec 9, 2024
@alsoandanswer
Copy link
Contributor Author

!review

@github-actions github-actions bot added 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. 🗺️ Mapping - Event The PR touches event map files. 🗺️ Mapping - Random Ruins The PR touches random ruins map files. labels Dec 9, 2024
@alsoandanswer alsoandanswer added the Test Merge Candidate The PR is eligible for test merging. label Dec 9, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Wowzewow (Wezzy) <[email protected]>
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Jan 9, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 9, 2025
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Jan 9, 2025
Merged via the queue into Aurorastation:master with commit 10d7063 Jan 9, 2025
27 checks passed
@alsoandanswer alsoandanswer deleted the pants branch January 9, 2025 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. 🗺️ Mapping - Event The PR touches event map files. 🗺️ Mapping - Random Ruins The PR touches random ruins map files. Sprites Adds new or changes existing sprites. Test Merge Candidate The PR is eligible for test merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: High vis pants are missing the emissives
4 participants