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

Changes to squad color code #3908

Merged
merged 7 commits into from
Jul 25, 2023
Merged

Conversation

BeagleGaming1
Copy link
Contributor

About the pull request

Changes the squad text and equipment colors from a list into a variable that can be edited

Explain why it's good for the game

This allows the squad information to be edited much easier mid-round, allowing the creation of new squads with new colors, and edits to pre-existing squads.

Changelog

🆑
code: Changed squad color code from a list to a variable
/:cl:

@BeagleGaming1 BeagleGaming1 requested a review from fira as a code owner July 16, 2023 21:50
@github-actions github-actions bot added UI deletes nanoui/html Code Improvement Make the code longer labels Jul 16, 2023
@BeagleGaming1 BeagleGaming1 added the Needs Testing Need to test it on the guinea pigs (production server) label Jul 16, 2023
@BeagleGaming1
Copy link
Contributor Author

I have probably broken so much with this PR. It worked locally but I don't know how it will go with more players

code/modules/clothing/gloves/marine_gloves.dm Outdated Show resolved Hide resolved
code/game/jobs/job/marine/squads.dm Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 18, 2023 09:18
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review July 18, 2023 17:01
@BeagleGaming1
Copy link
Contributor Author

BeagleGaming1 commented Jul 18, 2023

Found some bugs from the test merge:

  • If squad name is changed, req supply pads break
  • If squad name is changed, crew manifest starts to runtime
  • If squad name is changed, breaks squad prefs (lol)
  • If squad name is changed, foxtrot squad doesn't get assigned

@BeagleGaming1 BeagleGaming1 marked this pull request as draft July 18, 2023 23:15
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review July 24, 2023 22:45
@harryob harryob added this pull request to the merge queue Jul 24, 2023
Merged via the queue into cmss13-devs:master with commit f0f8e4c Jul 25, 2023
cm13-github added a commit that referenced this pull request Jul 25, 2023
github-actions bot added a commit that referenced this pull request Jul 25, 2023
@BeagleGaming1 BeagleGaming1 deleted the cursed-code branch September 15, 2023 02:03
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 Needs Testing Need to test it on the guinea pigs (production server) UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants