mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-31 20:11:56 +00:00
0fb69dd6e5
* Moves the bulk of shield code from the riot subtype into the core shield. (#71066) ## About The Pull Request I wanted to "rework" the riot shield security has but most other shields are subtypes of it, making them all inherit those features. So I made this PR first to make my job easier and fix some odd bugs like fixing wooden bucklers by slapping them with titanium sheets... There *shouldn't* be any other big change outside of the titanium healing and baton bashing they all inherited but I have been staring at shield code and worked on another branch before deciding to split the code improvement/fixes from the features so I might have missed something. And while there, kill some single letter vars, remove unnecessary lines, etc. ## Why It's Good For The Game Fixing a wooden shield by slapping it with titanium is weird... so is fixing a glass+iron shield but that is a bigger balance change. And well, easier for future shield changes to not inherit weird behaviors from the riot shield. ## Changelog 🆑 Guillaume Prata fix: You can no longer repair wooden bucklers and roman shields by slapping them with a titanium sheet. /🆑 * Moves the bulk of shield code from the riot subtype into the core shield. * sr conflits, goliath shield, reagent buckler Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com>