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

Helmet garb fix (lingering squad stripe) #7713

Merged
merged 2 commits into from
Dec 2, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Dec 1, 2024

About the pull request

This PR is a follow up to #5573 which increased the amount of inventory slots in helmets, which meant more overlays were possible. It also removes some dead code attempting to add a hugger damage overlay to a helmet when the icon_state doesn't exist anywhere in cm and update_icons would just immediately clear the item from the helmet_overlays.

Explain why it's good for the game

Fixes #5912

Testing Photographs and Procedure

Screenshots & Videos

https://youtu.be/PtsCM_MHHoA

Changelog

🆑 Drathek
fix: Fix squad overlay sometimes not getting removed when helmet exceeded its helmet garb overlay slots
del: Remove some effectively dead code attempting to add hugger damage to helmets
/:cl:

@cmss13-ci cmss13-ci bot added Fix Fix one bug, make ten more Removal snap labels Dec 1, 2024
@harryob harryob added this pull request to the merge queue Dec 2, 2024
Merged via the queue into cmss13-devs:master with commit 0539608 Dec 2, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Dec 2, 2024
@Drulikar Drulikar deleted the Helmet_Garb_Fix branch December 2, 2024 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Removal snap
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Getting hugged, takes your helmet off but keeps the squad overlay
2 participants