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

sg sprites + flak jacket accessory (redone) #292

Merged
merged 4 commits into from
Jul 22, 2024

Conversation

AndroBetel
Copy link
Contributor

@AndroBetel AndroBetel commented Jun 11, 2024

adds new sg sprites by Dongwaiver
adds flak jacket accessory for 3 points in misc category, you can wear it differently by using it in hand

image
image

citing Dongwaiver from initial PR

For reference, these are the 'new' sprites that're being added:

After its initial removal, the Power Pack's sprite has been reintegrated into the Combat Harness. I don't believe the Combat Harness was originally intended to be viewed without it, which is why it's much slimmer (and darkly-shaded in the center) than the standard M3 suits. Just to clarify, this is purely a visual change that's intended to restore the Smartgunner's chunkiness of yesteryear.

The jumpsuit-attachable flak jacket is a homage to Drake, who's seen rocking that very same fit in the movie. It's a very slightly modified version of the M70 that the pilots're seen wearing, trimmed down to seamlessly fit underneath the Combat Harness. While I originally imagined the flak jacket giving some extra defense to its wearer (via the same code that makes ceramic plates work), I don't mind if it remains a purely cosmetic accessory.

The greyish-green palette swap (originally reserved for an unused(?) variant of the officer's armored suit) works surprisingly well as a movie-accurate representation of the Combat Harness. I think it's got a lot of potential, though it's something that could be explored in a later pull request.

@DexterDude
Copy link
Contributor

w_class should be 3 rather than 2

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

code/modules/clothing/under/ties.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me.

@Doubleumc Doubleumc dismissed DexterDude’s stale review July 22, 2024 19:36

All changes resolved, discussed in Discord

@Doubleumc Doubleumc merged commit f9fe348 into cmss13-devs:master Jul 22, 2024
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants