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

Constructable exercise equipment #2839

Merged
merged 18 commits into from
Apr 11, 2024
Merged

Conversation

Gristlebee
Copy link
Contributor

About The Pull Request

  • Punching bags can now be constructed from 5 cloth and deconstructed with a wirecutter.
  • Bench presses and chest presses can be constructed from 5 metal and deconstructed with a wrench.

Why It's Good For The Game

You no longer need to smash apart the exercise equipment like a caveman, and offers players some more freedom in how they want to decorate or arrange their ships.

Changelog

🆑
add: Punching bags can be built with 5 cloth.
add: Bench press and chest press can be built with 5 metal.
add: Exercise equipment can be deconstructed.
/:cl:

Bolts description for weight machines.
Adds crafting for weight machines.
Can construct punching bag from cloth, and deconstruct with wirecutters.
Adds cut var, adjusts examine behavior for punching bags.
@github-actions github-actions bot added the Code change Watch something violently break. label Mar 16, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Mar 16, 2024

I’d actually prefer if exercise equipment could be unanchored and dragged in addition to deconstructed. Maybe allow for unanchoring weight benches with a wrench and deconstructing with a screwdriver?

@Gristlebee
Copy link
Contributor Author

Gristlebee commented Mar 17, 2024

I’d actually prefer if exercise equipment could be unanchored and dragged in addition to deconstructed. Maybe allow for unanchoring weight benches with a wrench and deconstructing with a screwdriver?

It's been added, and the punching bag can also be unwrenched and wirecuttered

@Gristlebee
Copy link
Contributor Author

Gristlebee commented Mar 20, 2024

Typos have been fixed, the extraneous TRUE returns are removed. Also fixed a typo I noticed. Bolt and unbolt messages were backwards.

@Gristlebee
Copy link
Contributor Author

Seems like the TRUEs are necessary, but now Rust is failing. Agh.

@Gristlebee
Copy link
Contributor Author

Typos are fixed, the the TRUEs are necessary to prevent the tools from hitting the benches or the bag after the action. Everything should hopefully be good now.

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

just a few tiny things

code/modules/mining/lavaland/ruins/gym.dm Outdated Show resolved Hide resolved
code/modules/mining/lavaland/ruins/gym.dm Outdated Show resolved Hide resolved
code/modules/mining/lavaland/ruins/gym.dm Outdated Show resolved Hide resolved
code/modules/mining/lavaland/ruins/gym.dm Outdated Show resolved Hide resolved
@Gristlebee
Copy link
Contributor Author

Suggested changes have been added, and it looks like everything works

code/modules/mining/lavaland/ruins/gym.dm Outdated Show resolved Hide resolved
@Gristlebee
Copy link
Contributor Author

Spans have all been converted to macros as requested

@thgvr thgvr added this pull request to the merge queue Apr 11, 2024
Merged via the queue into shiptest-ss13:master with commit 1f8da5f Apr 11, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 12, 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! -->

- Punching bags can now be constructed from 5 cloth and deconstructed
with a wirecutter.
- Bench presses and chest presses can be constructed from 5 metal and
deconstructed with a wrench.
## 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. -->
You no longer need to smash apart the exercise equipment like a caveman,
and offers players some more freedom in how they want to decorate or
arrange their ships.


## Changelog

:cl:
add: Punching bags can be built with 5 cloth.
add: Bench press and chest press can be built with 5 metal.
add: Exercise equipment can be deconstructed.
/: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. -->
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

- Punching bags can now be constructed from 5 cloth and deconstructed
with a wirecutter.
- Bench presses and chest presses can be constructed from 5 metal and
deconstructed with a wrench.
## 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. -->
You no longer need to smash apart the exercise equipment like a caveman,
and offers players some more freedom in how they want to decorate or
arrange their ships.


## Changelog

:cl:
add: Punching bags can be built with 5 cloth.
add: Bench press and chest press can be built with 5 metal.
add: Exercise equipment can be deconstructed.
/: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. -->
@Gristlebee Gristlebee deleted the Weights branch April 30, 2024 18:13
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants