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.

Sign up for GitHub

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

Jump to bottom

Minor Code Maintenance Bundle (deletes, standards, runtimes) #4756

Merged
merged 7 commits into from
Nov 7, 2023
Merged

Minor Code Maintenance Bundle (deletes, standards, runtimes) #4756

merged 7 commits into from
Nov 7, 2023

Conversation

fira
Copy link
Member

@fira fira commented Oct 21, 2023 •
edited by github-actions bot
Loading

About the pull request

Just some bundled code maintenance bits:

  • annotations and variable names
  • loc -> forceMove / New -> Initialize, GLOB variables, per standard
  • add some missing ref clearing in Destroy
  • dead code
  • fix minor runtimes
  • runtime fix in gear presets spamming logs
  • fixes a typo in bottles making them use only 1 of the 4 sprites

Explain why it's good for the game

Standards, bugfixing

Changelog

🆑
fix: Spawned bottles now use all 4 of their sprites as intended rather than always the same.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Oct 21, 2023
@fira fira marked this pull request as draft October 22, 2023 19:37
@fira
Copy link
Member Author

fira commented Oct 25, 2023

per discussion on discord will do a more in depth fix for mind.original with weakrefs in a separate PR

@fira fira marked this pull request as ready for review November 1, 2023 13:29
Drulikar
Drulikar approved these changes Nov 2, 2023
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Code changes appear fine but this really ought to be tested, I don't know what all scenarios I would need to test to ensure this isn't a regression.

@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 2, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 3, 2023
@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 4, 2023
@cm13-github
Copy link
Contributor

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

@stagda stagda mentioned this pull request Nov 6, 2023
Closed
3 tasks
@Cooliecan Cooliecan mentioned this pull request Nov 7, 2023
Closed
3 tasks
@Drulikar Drulikar added this pull request to the merge queue Nov 7, 2023
Merged via the queue into cmss13-devs:master with commit 2c9ef44 Nov 7, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 7, 2023
@cm13-github
Automatic changelog for PR #4756 [ci skip]
a3c0d70
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

Assignees
No one assigned
Labels
Fix Fix one bug, make ten more Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fira @cm13-github @Drulikar