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

Add the angle grinder, a tool to deconstruct structures quickly #1716

Closed
wants to merge 34 commits into from

Conversation

ritorizo
Copy link
Contributor

@ritorizo ritorizo commented Jan 19, 2023

About The Pull Request

The angle grinder is a powertool which is used to deconstruct things quickly, it's intended for salvaging structures.

It curently works on :

  • walls (not reinforced ones)
  • girders
  • grille
  • catwalks
  • lattices
  • crates/closets
  • tables
  • reinforced windows
  • bed
  • chairs

It require eye protection to be used like welding tools.
It also works as a getho bone saw (at 80%)

It's currently only obtainable in the outpost.

  • I affirm that I have tested all of my proposed changes and that any issues found during tested have been addressed.

Sprite (thanks NIRV-0025 NIRV-0026)

image

Why It's Good For The Game

The idea was to add another way of getting resources than mining ores (maybe to make ore processing harder at some point) and just be a building tool.

More feature will be added eventually but it could be cool to test it early for feedback (like what stuff to add, buff, debuff...)

Changelog

🆑
added: The angle grinder, a quick deconstruction tool.
added: A sprite for the angle grinder (made by NIRV-0024)
/:cl:

@ritorizo ritorizo requested review from a team as code owners January 19, 2023 23:21
@github-actions github-actions bot added Code change Watch something violently break. DME Edit Sprites A bikeshed full of soulless bikes. labels Jan 19, 2023
@TheNeoGamer42
Copy link
Contributor

Could make this work on the broken machines found on wasteworlds as a quicker alternative to the crowbar you have to use on them.

@Calyxman
Copy link

Will you be adding it into Industrial Engineering or Advanced Tools as an engineering/supply protolathe item?
It'd be nice if you could make one of these, I think

@Apogee-dev
Copy link
Contributor

Apogee-dev commented Jan 21, 2023

Needs availability in the Engineering and Supply lathes for sure. You should also allow it to cut down airlocks (either destroy the boards/wires or require the user to switch to crowbar/cutters for those), that’s kind of a critical requirement for a salvage/deconstruction tool

@Apogee-dev
Copy link
Contributor

Could make this work on the broken machines found on wasteworlds as a quicker alternative to the crowbar you have to use on them.

Doesn’t really make sense, a grinder would reasonably just destroy whatever valuable components are actually inside the derelict machines.

@CenkTheRaptor
Copy link
Contributor

spacr emgineers

@Sylphily
Copy link
Contributor

Could make this work on the broken machines found on wasteworlds as a quicker alternative to the crowbar you have to use on them.

Doesn’t really make sense, a grinder would reasonably just destroy whatever valuable components are actually inside the derelict machines.

i would quite argue that, they could just grind around the components that they want.

@Apogee-dev
Copy link
Contributor

Could make this work on the broken machines found on wasteworlds as a quicker alternative to the crowbar you have to use on them.

Doesn’t really make sense, a grinder would reasonably just destroy whatever valuable components are actually inside the derelict machines.

i would quite argue that, they could just grind around the components that they want.

it’s an industrial angle grinder, not a dremel tool. this thing takes two hands to use and saws through girders, it really doesn’t seem like something capable of precision work in the slightest.

@TheNeoGamer42
Copy link
Contributor

That doesn't stop John Space Engineers though, and in a few ways spessmens are capable of even more than them

@ritorizo
Copy link
Contributor Author

I think we could argue both way for the logic of salvaging circuits, I think we should think in term of balance

@ritorizo
Copy link
Contributor Author

I already coded the feature but we could still revert it later

@Apogee-dev
Copy link
Contributor

Apogee-dev commented Jan 23, 2023

I think we could argue both way for the logic of salvaging circuits, I think we should think in term of balance

well, my take from a balance and design perspective is that while having a tool that massively simplifies and expedites salvaging is good, it isn’t necessarily engaging to have a single tool capable of doing everything on its own. Part of the original conversation that led to the creation of the grinder was that salvage is too slow and unrewarding compared to mining, as far as raw resources like metal sheets go. That’s true, and the reason is specifically because dismantling walls and airlocks and the like takes a long time and only yields a few sheets of metal each. And airlocks aren’t even remotely worth it because you have to hack them first. Machines, meanwhile, are more of a source of boards and components than they are of raw materials, and they’re higher value for time spent anyway. Plus the broken rockplanet ones are just a single-step dismantle with a crowbar anyway, it’s not a long process.

@BarteG44
Copy link
Contributor

BarteG44 commented Jan 23, 2023

Needs availability in the Engineering and Supply lathes for sure.

IMO it shouldn't be aviable from a lathe at all. Only salvage ships should start with / it should be available at the outpost. Being able to deconstruct pretty much anything is a very powerful ability and requiring only research to get it would let the not specialized ships do salvage just as easily as mining nullifying one of the points of the original conversation

@ZephyrTFA
Copy link
Member

I don't really like JackOfAllTrade tools; and as such do not really like this

@Apogee-dev
Copy link
Contributor

Looking forward to the Gecko remap after this. Specialization and earmuffs, let's go.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jan 31, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 6, 2023
Comment on lines +3 to +8
#define ANGLEGRINDER_OUTPOST_PRICE 1000
// #define ANGLEGRINDER_BROKEN_MACHINE_SALVAGE_TIME 2.5 SECONDS
#define ANGLEGRINDER_OPEN_SAFE_TIME 90 SECONDS
#define ANGLEGRINDER_OPEN_CLOSET_TIME 5 SECONDS
#define ANGLEGRINDER_RAILING_TIME 1 SECONDS
#define ANGLEGRINDER_MACHINE_FRAME_TIME 3 SECONDS
Copy link
Member

Choose a reason for hiding this comment

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

These should be config entries not defines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Honestly I don't know how to do all of this cleanly using config without making some wacky code or hurting performance. I could have also hard coded all the value as it's usually done, but it would make balancing and tweaking of the feature harder.

@Erikafox
Copy link
Contributor

does this still need inhands

@ritorizo
Copy link
Contributor Author

I didn't see it get used that much while it was test merged but it shouldn't break tremendously if it end up a having an issue.
We could merge it so mappers can put it in their ship and and give feedback so I can make some improvement (re balancing, feature idea...) pr afterward.


/obj/item/anglegrinder
name = "angle grinder"
desc = "A powerfull tool to salvage about anything. You better wear some protection tough"
Copy link
Contributor

Choose a reason for hiding this comment

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

minor spelling/grammar mistakes. "A powerful tool to salvage just about anything, you better wear some protection though."

Preferably, I would replace that second part with something that outright states what is protection. "...anything, you should wear earmuffs and welding protection to avoid damage to your ears and eyes." would be my best guess but something longer might be better.

@@ -1,4 +1,4 @@
//Originally coded by ISaidNo, later modified by Kelenius. Ported from Baystation12.
//riginally coded by ISaidNo, later modified by Kelenius. Ported from Baystation12.
Copy link
Contributor

Choose a reason for hiding this comment

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

I dont know what the O in Originally did to deserve being deleted but you should probably fix it.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 27, 2023
@github-actions
Copy link
Contributor

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

@Erikafox
Copy link
Contributor

Erikafox commented Apr 4, 2023

Resolve the merge conflict please.

@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

This PR has been inactive for a month. This means it is at risk of being auto closed in a week, 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 All falls to entropy eventually. label May 6, 2023
@github-actions github-actions bot closed this May 14, 2023
github-merge-queue bot pushed a commit that referenced this pull request Oct 5, 2024
…ead of mining (and base gearpacks) (#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 #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:
- 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

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65bd6b99-d63d-4c75-9227-a9987fddf9d2)


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 <90987989+Thera-Pissed@users.noreply.github.com>
Co-authored-by: ritorizo <ritorizo@localhost>
Co-authored-by: FalloutFalcon <falloutfalconplays@gmail.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
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

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65bd6b99-d63d-4c75-9227-a9987fddf9d2)


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 <90987989+Thera-Pissed@users.noreply.github.com>
Co-authored-by: ritorizo <ritorizo@localhost>
Co-authored-by: FalloutFalcon <falloutfalconplays@gmail.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Merge Conflict Use Git Hooks, you're welcome. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. Stale All falls to entropy eventually.
Projects
None yet
Development

Successfully merging this pull request may close these issues.