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

[MIRROR] Add new fitness skill and mechanics #185

Merged
merged 1 commit into from
Oct 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24448
Original PR: tgstation/tgstation#78922

About The Pull Request

dreamseeker_9pl5F22vN3

New Fitness Skill

  • Working out on the weight machines will require less stamina
  • The exercised status effect durations are increased by the level
  • The more fitness you have, the bigger your mob sprite

Exercised Status Effect

  • Boost your metabolism x2
  • The max duration is determined by the fitness skill
  • Uses multipliers based on a good diet and steriods medicine to increase the duration
  • Will convert into fitness skill xp while sleeping based on the quality of sleep

Weight Training Equipment

  • Weight machines now drain stamina and nutrition
  • Weight machines now give fitness xp
  • Punching bags now drain stamina (wearing boxing gloves lowers it) and gives a small amount of fitness xp
  • Being clumsy has a chance to hurt you, but it can be overcome with persistence. (the higher your fitness skill, the less chance of getting injuried)

Why It's Good For The Game

HUSTLE FOR THAT MUSCLE!!!

dreamseeker_YFfxcRhaJE

Changelog

🆑 timothymtorres
add: Add new fitness skill and mechanics for weight machines and punching bags. Working out with a proper diet and good sleep will result in massive fitness gains. As your fitness increases, so does your mass.
/:cl:

* Add new fitness skill and mechanics

* Modular changes

* No size increase

* Update fitness.dm

---------

Co-authored-by: Tim <[email protected]>
Co-authored-by: Giz <[email protected]>
@AnywayFarus AnywayFarus merged commit a64e90c into master Oct 20, 2023
23 checks passed
@AnywayFarus AnywayFarus deleted the upstream-mirror-24448 branch October 20, 2023 19:15
AnywayFarus added a commit that referenced this pull request Oct 20, 2023
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* Unholy water double parent call fix (#80641)

## About The Pull Request

Unholy water now only calls parent in on_mob_life() once, instead of
twice.

The parent call would give you a small shot of toxin damage. Now you'll
only get hit by it once, instead of twice. Neat!

The linked issue mentions the double parent call on holy water too, but
that seems to have been removed at some point.
## Why It's Good For The Game

Closes #80511.
## Changelog
:cl: Rhials
code: Unholy water no longer calls parent twice in on_mob_life().
/:cl:

* Unholy water double parent call fix

---------

Co-authored-by: Rhials <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants