mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-16 12:07:48 +00:00
8dadc1e9ed
<!-- 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 The unfathomable curio now only blocks when equipped to the belt slot, and not when equipped in the hand. The shielded component now no longer blocks despite not having a wearer, and does not block if the wearer is not the same as the owner in the ``hit_reaction()`` proc. Fixes https://github.com/tgstation/tgstation/issues/82068 ## Why It's Good For The Game The curio was only blocking while in-hand, rather than how it should be; in the belt slot. Now it does what it is supposed to. On top of that, this fixes what I think has been a bug for quite some time with shield_inhand just not being respected whatsoever with regards to whether or not the component worked. It only really determined whether or not you got the sprites added/removed, but didn't factor into the blocking ability whatsoever. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 fix: Unfathomable Curios now properly block as expected. fix: The shielded component actually respects the shield_inhand when determining blocking potential. fix: Ensures that the shielded component has a wearer before attempting to block, and that this wearer is the same as the owner of the item. /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> --------- Co-authored-by: san7890 <the@san7890.com>