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

Destructible Walls (And Mineral Walls) #3145

Merged
merged 66 commits into from
Sep 9, 2024

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Jun 23, 2024

About The Pull Request

Wall Stuff and Behavior

  • Moves the damage behavior from concrete walls to closed turfs.
  • Basic walls can be repaired with a welder.
  • Basic walls are still deconstructed with a welder, but it now starts a repeatable do after that reduces the wall's integrity more efficiently than simply attacking.
  • R-walls integrity is tied to their deconstruction state. Damaging one enough will move it down a state, and can be repaired by following the construction steps. They can still be deconstructed the same as before, or with a plasmacutter.

Plasmacutters

  • Plasma cutters are now more of an engineering tool, and acts as an "upgrade" to the welder and deconstructs walls faster, and can repair prosthetic limbs. They can still mine, but lose the additional mining range and has a chance to ruin ores.
  • Plasmacutters now fit in toolbelts.
  • Moves plasmacutters and advanced plasmacutters from mining to tech plasma manipulation and adv plasma manipulation tech respectively.
  • Adds plasmacutters to the Mudskipper, Riggs, Talos, Gecko, Heron, Osprey, Ranger, Hyena, Komodo, Shetland and Twinkleshine
  • Adds plasmacutters to cargo for 1250 credits

Misc Code stuff

  • Cleans up crate/closet deconstruction. It now checks for tool_behavior rather than a specific tool and non-help intent.
  • Renames concrete_damage.dmi to wall_damage.dmi
  • Moves indestructible walls into it's own file
  • bitflags for bonus damage on walls

Why It's Good For The Game

Rylie asked me to make this.

Currently, it's much easier to go through a wall than a door if you want to force entry as it's as simple as having a welder or a jackhammer to take off the wall plating vs having to take the time hack an airlock, which probably isnt great. Also gives some counterplay if you're on the defending side since you have the opportunity to repair compromised walls or go around and attack the breacher.

This would add more possible interactions and play around with walls since you no longer need these two specific tools to get through a wall. If you say, have enough ammo you could theoretically just shoot your way in, and they're no longer indestructible pieces of cover.

Changelog

🆑
add: Welders/Plasmacutters now deal damage to wall integrity to decon
add: Plasmacutters are now engineering tools and fit in toolbelts. They can damage ores into slag if used to mine. They are now researched with plasma technology and advanced plasma technology.
add: Plasmacutters to cargo for 1250
add: Adds plasmacutters to the Mudskipper, Riggs, Talos, Gecko, Heron, Osprey, Ranger, Hyena, Komodo, Shetland and Twinkleshine
del: Plasmacutters extra mining range
fix: Plasmacutters can repair prosthetic limbs like welders
code: Moves damage behavior of concrete walls to closed turfs. Basic walls are now repaired with a welder.
code: R-walls d-state tied to their integrity. R-walls can be deconstructed with plasmacutters.
code: Crate decon checks for tool behavior rather than a istype check

/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Jun 23, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 27, 2024
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 Aug 27, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

Looks good code wise, haven't been able to see it in game.

@rye-rice
Copy link
Member

rye-rice commented Sep 1, 2024

if tmt doesnt review this by tommorow i will take that as an approval and merge

@rye-rice
Copy link
Member

rye-rice commented Sep 1, 2024

okay nvm apparently tmt already reviewed it in a voice call

@rye-rice rye-rice dismissed thgvr’s stale review September 1, 2024 04:58

I will do sprites for it someday, as for sounds... it should be obvious when you smack the wall i think

@rye-rice rye-rice added this pull request to the merge queue Sep 1, 2024
@rye-rice rye-rice removed this pull request from the merge queue due to a manual request Sep 1, 2024
@thgvr thgvr marked this pull request as draft September 1, 2024 14:18
@Gristlebee Gristlebee changed the title Destructible Walls Destructible Walls (And Mineral Walls) Sep 1, 2024
@Gristlebee Gristlebee marked this pull request as ready for review September 1, 2024 23:31
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 4, 2024
Copy link
Contributor

github-actions bot commented Sep 4, 2024

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 Sep 4, 2024
@rye-rice rye-rice added this pull request to the merge queue Sep 9, 2024
Merged via the queue into shiptest-ss13:master with commit 8f4a8a0 Sep 9, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 11, 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
### Wall Stuff and Behavior
- Moves the damage behavior from concrete walls to closed turfs.
- Basic walls can be repaired with a welder.
- Basic walls are still deconstructed with a welder, but it now starts a
repeatable do after that reduces the wall's integrity more efficiently
than simply attacking.
- R-walls integrity is tied to their deconstruction state. Damaging one
enough will move it down a state, and can be repaired by following the
construction steps. They can still be deconstructed the same as before,
or with a plasmacutter.
### Plasmacutters
- Plasma cutters are now more of an engineering tool, and acts as an
"upgrade" to the welder and deconstructs walls faster, and can repair
prosthetic limbs. They can still mine, but lose the additional mining
range and has a chance to ruin ores.
- Plasmacutters now fit in toolbelts.
- Moves plasmacutters and advanced plasmacutters from mining to tech
plasma manipulation and adv plasma manipulation tech respectively.
- Adds plasmacutters to the Mudskipper, Riggs, Talos, Gecko, Heron,
Osprey, Ranger, Hyena, Komodo, Shetland and Twinkleshine
- Adds plasmacutters to cargo for 1250 credits

### Misc Code stuff
- Cleans up crate/closet deconstruction. It now checks for tool_behavior
rather than a specific tool and non-help intent.
- Renames concrete_damage.dmi to wall_damage.dmi
- Moves indestructible walls into it's own file
- bitflags for bonus damage on walls


## 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. -->
Rylie asked me to make this.

Currently, it's much easier to go through a wall than a door if you want
to force entry as it's as simple as having a welder or a jackhammer to
take off the wall plating vs having to take the time hack an airlock,
which probably isnt great. Also gives some counterplay if you're on the
defending side since you have the opportunity to repair compromised
walls or go around and attack the breacher.

This would add more possible interactions and play around with walls
since you no longer need these two specific tools to get through a wall.
If you say, have enough ammo you could theoretically just shoot your way
in, and they're no longer indestructible pieces of cover.

## Changelog

:cl:
add: Welders/Plasmacutters now deal damage to wall integrity to decon
add: Plasmacutters are now engineering tools and fit in toolbelts. They
can damage ores into slag if used to mine. They are now researched with
plasma technology and advanced plasma technology.
add: Plasmacutters to cargo for 1250
add: Adds plasmacutters to the Mudskipper, Riggs, Talos, Gecko, Heron,
Osprey, Ranger, Hyena, Komodo, Shetland and Twinkleshine
del: Plasmacutters extra mining range
fix: Plasmacutters can repair prosthetic limbs like welders
code: Moves damage behavior of concrete walls to closed turfs. Basic
walls are now repaired with a welder.
code: R-walls d-state tied to their integrity. R-walls can be
deconstructed with plasmacutters.
code: Crate decon checks for tool behavior rather than a istype check

/: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. -->
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 Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Test Merged They've done it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants