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

Flexible Job Icons #7106

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Sep 4, 2024

About the pull request

This PR makes editing job hud icons mid-round much more flexible, and will allow staff events to modify them without a lot of clunky cheating by trying to trick the game into displaying certain other icons.

I have also cleaned up a chunk of duplicate code in the USCM rank hud proc.

Explain why it's good for the game

Makes events easier, also standardises how job hud is picked.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added variables staff can use to override job hud. This will not alter security hud at this time.
code: Removed unused and duplicate code from the USCM faction hud.
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Code Improvement Make the code longer labels Sep 4, 2024
cm13-github added a commit that referenced this pull request Sep 5, 2024
cm13-github added a commit that referenced this pull request Sep 5, 2024
cm13-github added a commit that referenced this pull request Sep 6, 2024
cm13-github added a commit that referenced this pull request Sep 6, 2024
cm13-github added a commit that referenced this pull request Sep 7, 2024
cm13-github added a commit that referenced this pull request Sep 7, 2024
@MemesLauncher MemesLauncher mentioned this pull request Sep 7, 2024
3 tasks
cm13-github added a commit that referenced this pull request Sep 7, 2024
cm13-github added a commit that referenced this pull request Sep 7, 2024
cm13-github added a commit that referenced this pull request Sep 8, 2024
cm13-github added a commit that referenced this pull request Sep 9, 2024
cm13-github added a commit that referenced this pull request Sep 9, 2024
cm13-github added a commit that referenced this pull request Sep 10, 2024
cm13-github added a commit that referenced this pull request Sep 10, 2024
cm13-github added a commit that referenced this pull request Sep 10, 2024
cm13-github added a commit that referenced this pull request Sep 10, 2024
cm13-github added a commit that referenced this pull request Sep 11, 2024
cm13-github added a commit that referenced this pull request Sep 11, 2024
cm13-github added a commit that referenced this pull request Sep 11, 2024
cm13-github added a commit that referenced this pull request Sep 12, 2024
cm13-github added a commit that referenced this pull request Sep 13, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 9, 2024
cm13-github added a commit that referenced this pull request Oct 9, 2024
cm13-github added a commit that referenced this pull request Oct 9, 2024
cm13-github added a commit that referenced this pull request Oct 12, 2024
cm13-github added a commit that referenced this pull request Oct 12, 2024
cm13-github added a commit that referenced this pull request Oct 12, 2024
cm13-github added a commit that referenced this pull request Oct 12, 2024
cm13-github added a commit that referenced this pull request Oct 13, 2024
cm13-github added a commit that referenced this pull request Oct 13, 2024
cm13-github added a commit that referenced this pull request Oct 13, 2024
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

whoever gets rid of that big ass switch() and puts it on the datum gets a cookie

@harryob harryob added this pull request to the merge queue Oct 22, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 22, 2024
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

need to make compatible w #6490

@harryob harryob marked this pull request as draft October 27, 2024 22:25
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 8, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 12, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants