Draft
Conversation
MysticalFaceLesS
added
🎨 Спрайты 🎨
KOCMODECAHTHUK
changed the title
Cuildipie
previously approved these changes
Jun 8, 2025
This comment was marked as outdated.
This comment was marked as outdated.
github-actions
bot
added
the
🔥 Merge Conflict 🔥
KOCMODECAHTHUK
force-pushed
the
attachment
branch
from
f062702 to
4923396
Compare
github-actions
bot
removed
the
🔥 Merge Conflict 🔥
KOCMODECAHTHUK
force-pushed
the
attachment
branch
2 times, most recently
from
33bce74 to
1345997
Compare
This comment was marked as resolved.
This comment was marked as resolved.
github-actions
bot
added
🔥 Merge Conflict 🔥
KOCMODECAHTHUK
force-pushed
the
attachment
branch
2 times, most recently
from
4d4480c to
b0c2fb0
Compare
KOCMODECAHTHUK
force-pushed
the
attachment
branch
from
0cef198 to
cc1de5a
Compare
KOCMODECAHTHUK
force-pushed
the
attachment
branch
from
6f100a0 to
cc1de5a
Compare
<!-- 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. --> Removes: Goliath shield Roman shield (real and fake) Riot shield Spiked riot shield Flash riot shield Adds: New sprites for the telescopic shield and the brand new Heavy shield <img width="583" height="262" alt="image" src="https://github.com/user-attachments/assets/ed1ff181-aa61-4f18-a8c3-860cd52948e3" /> Sprites were done by the amazing @thearbiber The Heavy Shield A shield, as the name implies, very heavy. Leading to a very, very significant slowdown for the user With this weight comes a much higher block chance, a slightly higher max integrity compared to the now deceased riot shield, and a better ap threshold as well The Telescopic Shield Decreased the total integrity as well as the block chance, but also lightly decreased the slowdown Shields now have their own respective repair material Replaces the old riot shield in the Vaquero with a Heavy shield <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Removes shields that didn't belong with the setting (the roman shields), as well as shields that are practically never used in-game (and the flash-shield was a bit buggy with its use, from what I have been told from testing) As for the changes made to the shields themselves, namely the telescopic and the new heavy shield The telescopic shield was lightly adjusted to better fit as a "melee" focused shield. Not ideally used in firefights, but more for close-quarters-combat involving melee based weaponry. The heavy shield on the opposite side is a lot better suited for firefights, but namely for simply taking light-to-medium gunfire. The main idea for the heavy shield is to enable people to act almost like "mobile defense", giving up most if not all of their offensive capability to lean heavy into defensive capability. If used with the simple one-hand, it is practically 1:1 to the old riot shield, with the only difference being more slowdown. If used with two-hands however the slowdown is increased significantly more as well as the block chance. Alongside the addition of weapons being able to penetrate shields now, I don't believe this should cause any serious balance issues. As for the removal of the riot shield, it overlapped a lot with the implementation of the heavy shield. With the only real difference between the two the slowdown difference and the ability to wield the heavy shield. With this overlap I decided it best to simply remove the riot shield, and replace it with the heavy shield. <!-- 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. --> :cl: Cluckinawesome, thearbiber add: Added the Heavy Shield del: Removed Goliath shield, Roman shield (real and fake), Riot shield, Spiked riot shield, Flash riot shield balance: Lightly touched telescopic shield's stats to make it a little weaker imageadd: updated the sprites used for the telescopic shield and the new sprites for the heavy shield imagedel: deleted the Goliath shield, Roman shield (real and fake), Riot shield, Spiked riot shield, Flash riot shield, code: Updated shields to not all use plasteel, each now has a respective material that is used in repair /: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: CluckinAwesome <158237114+CluckinAwesome@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com>
This reverts commit ad41942.
KOCMODECAHTHUK
force-pushed
the
attachment
branch
from
48e9357 to
7d6a4d4
Compare
Celadon-Bot
added
🏭 Github 🏭
533 - af44c21
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Вечный ПР
Important
Вечный ПР, где изначально все тестируется напрямую на Альфе. После уже отделяется в отдельные ПРы.
Список изменений