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

Lets you wear emag on your ID slot and tweaks quick equip #27573

Merged
merged 4 commits into from
Jan 2, 2025

Conversation

datlo
Copy link
Contributor

@datlo datlo commented Dec 7, 2024

What Does This PR Do

This PR adds the ID slot tag to the emag, cmag, and broken emag, letting you wear them like an ID. This does not affect your identity but does show up on examination.

It also tweaks the quick equip action (E by default) to have prefered quick equip slots for certain items. When using quick equip, only those slots are considered.

Items concerned are : Emag, cmag, broken emag = Pocket preference, you dont want those on your ID slot unless intentional
Storage bags such as plant bags, ore bags, etc = Pocket preference, having those auto equip to the belt is awkward, pocket is more convenient

Bucket = In backpack preference, to avoid situations where you hurt yourself by auto equipping a bucket filled with dangerous reagents.

Why It's Good For The Game

Fake emags from ID decals can be worn, real emags should be wearable too, especially since they look like they'd fit right in the jumpsuit's ID slot being the same size.
Security will once again fear the emag wearing assistant.

Tweaks the quick equip action to avoid this new feature backfiring on real antags, and tweaks a couple frustrating quick equip interactions.

Testing

Tested wearing the emag, tested using the emag, tested how identity shows up wearing emag and gas mask (Unknown)

Tested the new quick equip with a variety of items to make sure the new feature works as intended.


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
tweak: Emags and cmags can now be worn on your ID slot.
tweak: Emags, cmags, and storage bags will now equip to your pockets or backpack when using quick equip (E)
tweak: Buckets will now equip to your backpack when using quick equip (E)
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Dec 7, 2024
@datlo datlo changed the title Lets you wear emag on your ID slot Lets you wear emag on your ID slot and tweaks quick equip Dec 7, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Dec 15, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Dec 21, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 26, 2024
Copy link
Member

@DGamerL DGamerL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please deconflict for merge!

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 2, 2025
@DGamerL DGamerL added this pull request to the merge queue Jan 2, 2025
Merged via the queue into ParadiseSS13:master with commit 2bc0388 Jan 2, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants