Skip to content

Commit

Permalink
Broken bones now hurt less on rollerbeds (#3024)
Browse files Browse the repository at this point in the history
<!-- 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

fixes #2968

splints would work for some stuff but they are both uncommon (only spawn
in like brute kits/need to be crafted) and don't work on the head or
chest. Also gives rollerbeds a niche

## Why It's Good For The Game

Life or random damage ticks for broken cat

it's a bit unintuitive that putting someone on a rollerbed won't make
them resistant/immune to bone jostling

## Changelog

:cl:
balance: Rollerbeds stop broken bone damage ticks from occurring while
buckled
/: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: Theos <[email protected]>
  • Loading branch information
SomeguyManperson authored Jun 4, 2024
1 parent e8bc9ab commit f463852
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/surgery/bodyparts/bodyparts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,8 @@
bone_status = BONE_FLAG_NORMAL

/obj/item/bodypart/proc/on_mob_move()
// Dont trigger if it isn't broken or if it has no owner
if(bone_status != BONE_FLAG_BROKEN || !owner)
// Dont trigger if it isn't broken or if it has no owner or is buckled to a rollerbed
if(bone_status != BONE_FLAG_BROKEN || !owner || istype(owner?.buckled, /obj/structure/bed/roller))
return

if(prob(5))
Expand Down

0 comments on commit f463852

Please sign in to comment.