Removes magic stuff adjacent to gun/magic #2877
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
shiptest-server
pushed a commit
that referenced
this pull request
Jun 7, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> This was MEANT to be a pr were i was tackling gun cruft but magic accounts for a large portion of the line count. Pulls from shiptest-ss13#2664 (minus the actual gun crafting) and shiptest-ss13#2702 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Cruft <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: del: Removed alot of magic cruft code: Sorts gun defines into there own file /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: FalloutFalcon <[email protected]> Co-authored-by: Sun-Soaked <[email protected]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 15, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Finishing #145 Requires #2877 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: refactor: refactored attachments to be modular /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: FalloutFalcon <[email protected]> Signed-off-by: Theos <[email protected]> Co-authored-by: Matthew <[email protected]> Co-authored-by: Zephyr <[email protected]> Co-authored-by: Theos <[email protected]> Co-authored-by: thgvr <[email protected]>
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Jul 20, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Finishing #145 Requires shiptest-ss13#2877 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: refactor: refactored attachments to be modular /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: FalloutFalcon <[email protected]> Signed-off-by: Theos <[email protected]> Co-authored-by: Matthew <[email protected]> Co-authored-by: Zephyr <[email protected]> Co-authored-by: Theos <[email protected]> Co-authored-by: thgvr <[email protected]>
KittyNoodle
added a commit
to KittyNoodle/Shiptest
that referenced
this pull request
Jul 27, 2024
This reverts commit bb10642.
KittyNoodle
added a commit
to KittyNoodle/Shiptest
that referenced
this pull request
Jul 27, 2024
This reverts commit 0780ca7.
FalloutFalcon
added a commit
to FalloutFalcon/ShiptestF
that referenced
this pull request
Aug 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Finishing shiptest-ss13#145 Requires shiptest-ss13#2877 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: refactor: refactored attachments to be modular /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: FalloutFalcon <[email protected]> Signed-off-by: Theos <[email protected]> Co-authored-by: Matthew <[email protected]> Co-authored-by: Zephyr <[email protected]> Co-authored-by: Theos <[email protected]> Co-authored-by: thgvr <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This was MEANT to be a pr were i was tackling gun cruft but magic accounts for a large portion of the line count.
Pulls from #2664 (minus the actual gun crafting) and #2702
Why It's Good For The Game
Cruft
Changelog
🆑
del: Removed alot of magic cruft
code: Sorts gun defines into there own file
/:cl: