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

Hardcode Rework #6586

Merged
merged 13 commits into from
Aug 5, 2024
Merged

Conversation

blackcrystall
Copy link
Contributor

@blackcrystall blackcrystall commented Jun 28, 2024

About the pull request

Added ECHO support to sounds (byond function implementation to be accessible), some changes from one letter vars.

Rework of admin shoot the ship pannel, so now it's not hardoced

Explain why it's good for the game

Just backend rework, almost same

🆑 BlackCrystalic
add: Byond backed function of sound ECHO ported
refactor: refactor of weaponhits hardcode
/:cl:

@blackcrystall blackcrystall requested a review from fira as a code owner June 28, 2024 14:18
@github-actions github-actions bot added Refactor Make the code harder to read Feature Feature coder badge labels Jun 28, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 2, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 4, 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 added the Merge Conflict PR can't be merged because it touched too much code label Jul 6, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 6, 2024
@cm13-github
Copy link
Contributor

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

@blackcrystall
Copy link
Contributor Author

... @harryob
idk who to slap, check pr pls, and others rev ready too

Copy link
Contributor

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

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 14, 2024
@blackcrystall
Copy link
Contributor Author

Fighting with stale mark

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.

otherwise looks fine

code/_globalvars/global_lists.dm Outdated Show resolved Hide resolved
code/_globalvars/global_lists.dm Outdated Show resolved Hide resolved
code/game/sound.dm Outdated Show resolved Hide resolved
code/_globalvars/global_lists.dm Outdated Show resolved Hide resolved
code/modules/almayer/weaponhits.dm Outdated Show resolved Hide resolved
code/modules/almayer/weaponhits.dm Outdated Show resolved Hide resolved
code/modules/almayer/weaponhits.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 16, 2024 10:02
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Jul 17, 2024
@blackcrystall
Copy link
Contributor Author

Probably all done.

@blackcrystall blackcrystall marked this pull request as ready for review July 17, 2024 06:24
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 1, 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 Aug 3, 2024
@cm13-github
Copy link
Contributor

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

@harryob harryob added this pull request to the merge queue Aug 5, 2024
Merged via the queue into cmss13-devs:master with commit fbe0943 Aug 5, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 5, 2024
@blackcrystall blackcrystall deleted the attacktheDpoint branch August 27, 2024 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Refactor Make the code harder to read
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants