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

Character creation 'Preferred Armor' preview #5033

Merged
merged 2 commits into from
Nov 26, 2023

Conversation

SabreML
Copy link
Member

@SabreML SabreML commented Nov 25, 2023

About the pull request

Makes the armour worn by the preview dummy in the character creation menu show the user's 'Preferred Armor' setting.

Also fixes a bug I found where the 'Padded' armour type would have its sprite replaced with the user's preferred style when vended.
This specifically affected the 'Padded' variant because that has the icon states of L1/1/H1 for Light/Medium/Heavy, and post_vendor_spawn_hook() worked by replacing any 1s in the icon_state with the user's preference.
(post_vendor_spawn_hook() now checks if the armour has style variants before anything else.)

Explain why it's good for the game

The 'Preferred Armor' setting can be a bit confusing if you don't actually know what each armour style looks like. (Which I personally didn't until making this PR.)

Testing Photographs and Procedure

Screenshots & Videos

Character creation preview:

preview.mp4

Padded armour bug before: (Preferred Armor set to 'Skull')

bug.before.mp4

Padded armour bug after: (Preferred Armor set to 'Skull')

bug.after.mp4

Changelog

🆑
add: Made the character preview in the character creation menu show the 'Preferred Armor' setting.
fix: Fixed 'Padded' armour being replaced by the user's armour style preference when vended.
/:cl:

Plus a bit of a refactor
@github-actions github-actions bot added Feature Feature coder badge Fix Fix one bug, make ten more labels Nov 25, 2023
@harryob harryob added this pull request to the merge queue Nov 26, 2023
Merged via the queue into cmss13-devs:master with commit 8112b59 Nov 26, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants