Angle grinder AGAIN! Also, makes plasma cutters used for salvage instead of mining (and base gearpacks) #3146
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
added 30 commits
June 23, 2024 14:41
…roc and the signal that goes with it
github-actions
bot
removed
Merge Conflict
|
couple oddball things I want to work on but Im happy with the basic grinder and plasma cutter changes. not sure about plasma cutters in toolbelts from the destructible walls pr, but I'll wait and see how it goes. |
FalloutFalcon
requested changes
Sep 20, 2024
Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: HelmCrab <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
3 tasks
github-actions
bot
added
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FalloutFalcon
approved these changes
Oct 5, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Oct 5, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Oct 6, 2024
…ead of mining (and base gearpacks) (shiptest-ss13#3146) <!-- 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 re-implements shiptest-ss13#1716 as a base and adds cutter functionality to plasma cutters also implements and uses gear packs from shiptest-ss13#2103 that never got in. makes plasma cutters unable to mine, shorter range, and do burn instead of brute. angle grinders are integrated into grinder packs, like water backtanks. Also draws power from a cell. jackhammers can no longer break down walls and girders. ### Cutters can currently deconstruct: - girders - walls - reinforced walls - airlocks - airlock frames - grilles - machine frames - computer frames - catwalks - chairs - beds - tables - lockers & crates - salvage machines (the wasteplanet ones) - railings - lattice - wooden barricades cutters can also cut open safes and locked lockers & crates attempted to revert map changes but using git checkout doesn't completely revert the gecko. Will try again later. adds a mech salvage saw and a prototype energy saw. Doesn't make either available yet. sprites by me  https://github.com/shiptest-ss13/Shiptest/assets/90987989/12262338-055f-4c7c-86d1-d31279ab953c <!-- 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 Jackhammers as a main salvage tool is dumb, and angle grinders and cutters make more sense and have better functionality. Cutting apart old ruins and ships should be a reasonable source of material and shouldn't take years. <!-- 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: add: angle grinders for salvage add: reworks plasma cutters for salvage /: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: HelmCrab <[email protected]> Co-authored-by: ritorizo <ritorizo@localhost> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 24, 2024
…ead of mining (and base gearpacks) (shiptest-ss13#3146) <!-- 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. --> re-implements shiptest-ss13#1716 as a base and adds cutter functionality to plasma cutters also implements and uses gear packs from shiptest-ss13#2103 that never got in. makes plasma cutters unable to mine, shorter range, and do burn instead of brute. angle grinders are integrated into grinder packs, like water backtanks. Also draws power from a cell. jackhammers can no longer break down walls and girders. - girders - walls - reinforced walls - airlocks - airlock frames - grilles - machine frames - computer frames - catwalks - chairs - beds - tables - lockers & crates - salvage machines (the wasteplanet ones) - railings - lattice - wooden barricades cutters can also cut open safes and locked lockers & crates attempted to revert map changes but using git checkout doesn't completely revert the gecko. Will try again later. adds a mech salvage saw and a prototype energy saw. Doesn't make either available yet. sprites by me  https://github.com/shiptest-ss13/Shiptest/assets/90987989/12262338-055f-4c7c-86d1-d31279ab953c <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Jackhammers as a main salvage tool is dumb, and angle grinders and cutters make more sense and have better functionality. Cutting apart old ruins and ships should be a reasonable source of material and shouldn't take years. <!-- 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: add: angle grinders for salvage add: reworks plasma cutters for salvage /: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: HelmCrab <[email protected]> Co-authored-by: ritorizo <ritorizo@localhost> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-by: FalloutFalcon <[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
re-implements #1716 as a base and adds cutter functionality to plasma cutters
also implements and uses gear packs from #2103 that never got in.
makes plasma cutters unable to mine, shorter range, and do burn instead of brute.
angle grinders are integrated into grinder packs, like water backtanks. Also draws power from a cell.
jackhammers can no longer break down walls and girders.
Cutters can currently deconstruct:
cutters can also cut open safes and locked lockers & crates
attempted to revert map changes but using git checkout doesn't completely revert the gecko. Will try again later.
adds a mech salvage saw and a prototype energy saw. Doesn't make either available yet.
sprites by me
2024-06-23.21-43-32.mp4
Why It's Good For The Game
Jackhammers as a main salvage tool is dumb, and angle grinders and cutters make more sense and have better functionality. Cutting apart old ruins and ships should be a reasonable source of material and shouldn't take years.
Changelog
🆑
add: angle grinders for salvage
add: reworks plasma cutters for salvage
/:cl: