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

Customizable Armor #430

Open
wants to merge 125 commits into
base: master
Choose a base branch
from
Open

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Sep 3, 2024

About the pull request

Makes a new line of Marine combat armor that adds a new level of customization not previously seen, as well as recycles previous features that weren't able to be fully realized.

The first is that webbing is no longer available to attach to uniforms, and instead a new M3 compatible webbing line is provided to attach directly to the armor. The different types provide specific options for storage, coinciding with their name.

Next is that options previously not interactable now are. Marines will be able to decide if their armor will have the shoulder pads or not, as well as are able to paint a skull on their armor should they want one.

And lastly, Smartgunners are now able to paint their harness black. Huzzah.

Explain why it's good for the game

It gives a level of customizability to the game not previously had and makes a new level of aesthetic customization that differentiates everyone's Marine in their own special ways.

Changelog

🆑
add: Added new Marine armor that lack internal storage
add: New M56 harness that lacks internal storage
add: Added new M3 Pattern webbing to give different storage options
add: Added new M3-R variants of webbing for FORECON operations
add: Two new storage clip on options for smartgunner harnesses now exist and are added to their lockers
add: M56 harness compliant machete to smartgunner lockers
qol: Pauldrons are now removeable for those that don't want them
qol: Shin armor is now removeable for the smartgunner harness for those that want a lighter look
qol: Smartgunners can now wear their holster rig on their backs for an alternative sprite style
add: Added new armor paints that can be selected from the loadout menu for paining icons designs onto armor
balance: Number of drop pouches increased to supplement storage
del: Solar Devils and MARSOC ERTs have been removed due to not being needed or being compliant with new custom armor
imageadd: Adds new sprites for the M3 and M3-R webbings
imageadd: Adds new back slot sprite for the smartgunner holster rig
imageadd: Adds new Marine headset sprites that are visible when worn
imageadd: M10 helmet cameras are now visible
imageadd: Helmet garb adjusted to account for M10 helmet cameras
imagedel: Deletes the padded, carrier, and skull armors due to unneeded redundancy
/:cl:

Dumbgunner added 30 commits March 27, 2024 15:58
This reverts commit b1f8fc5.
@AndroBetel AndroBetel marked this pull request as draft September 21, 2024 17:24
@AndroBetel
Copy link
Contributor

undraft it when you feel like its feature complete and ready for reviews

@Max-023 Max-023 marked this pull request as ready for review September 21, 2024 20:52
@Max-023
Copy link
Contributor Author

Max-023 commented Sep 21, 2024

undraft it when you feel like its feature complete and ready for reviews

Alright, I think it's ready.

code/modules/projectiles/gun_helpers.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Show resolved Hide resolved
icons/mob/humans/onmob/belt.dmi Outdated Show resolved Hide resolved
Doubleumc
Doubleumc previously approved these changes Sep 24, 2024
var/old_pref_armor
S["preferred_armor"] >> old_pref_armor

if(!old_pref_armor in GLOB.armor_style_list)
Copy link
Contributor

Choose a reason for hiding this comment

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

in is goofy as it is much later in the order of operations than you'd think. The ! executes first so it becomes FALSE in GLOB.armor_style_list.
can read more here: https://www.byond.com/docs/ref/#/operator/in

Suggested change
if(!old_pref_armor in GLOB.armor_style_list)
if(!(old_pref_armor in GLOB.armor_style_list))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants