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

loyalist equivalent to mutineers #7184

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

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented Sep 19, 2024

About the pull request

I NEED SPRITE FOR LOYALIS ICON PLEASE HELP and I need to adjust UI too

adds support to create loyalist eqivalent to mutineers to make mutinees more readable so both sides know who is with them. loyalists are visible beofre mutiny starts and can be set after mutiny starts. also gets rid of bunch of single latter vars... that is most of the codechanges

Explain why it's good for the game

not knowing who is with you during mutiny is kinda shit, same reason as the mutineers have their stuff

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
add: Loyalists and loyalist leader added to make mutiny better.
/:cl:

@cmss13-ci cmss13-ci bot added the Feature Feature coder badge label Sep 19, 2024
code/modules/gear_presets/other.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/human/human_abilities.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/human/human_abilities.dm Outdated Show resolved Hide resolved

if(tgui_alert(chosen, "Do you want to be a loyalist?", "Become Loyalist", list("Yes", "No")) != "Yes")
return
var/datum/equipment_preset/other/loyalist/XC = new()
Copy link
Contributor

Choose a reason for hiding this comment

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

Better var name please

code/modules/admin/topic/topic.dm Outdated Show resolved Hide resolved
code/modules/admin/player_panel/actions/antag.dm Outdated Show resolved Hide resolved
@kiVts kiVts marked this pull request as draft September 26, 2024 00:21
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 5, 2024
@cm13-github
Copy link
Contributor

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

@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented Oct 27, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@cmss13-ci cmss13-ci bot added the Stale beg a maintainer to review your PR label Oct 27, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 1, 2024
@cm13-github
Copy link
Contributor

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

@cmss13-ci cmss13-ci bot added the UI deletes nanoui/html label Nov 1, 2024
@cuberound cuberound requested a review from kiVts November 1, 2024 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants