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

CherryPick Mind Role Entities #1791

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Feb 14, 2025

Cherrypicks this PR space-wizards/space-station-14#31318

DO NOT MERGE THIS WITHOUT A BUNCH OF TESTING.

* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Feb 14, 2025
@VMSolidus VMSolidus added the Status: Do Not Merge Do not merge label Feb 14, 2025
@VMSolidus
Copy link
Member Author

I NEED HELP WITH THIS LAST GODDAMN STUPID ERROR OH MY LORD.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 16, 2025
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Do Not Merge Do not merge Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants