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

Make more things made out of nylon #52376

Merged
merged 11 commits into from Oct 26, 2021
Merged

Conversation

tenmillimaster
Copy link
Member

Summary

Content "Adds Combat Shirts and Blouses"

Purpose of change

Combat shirts and Blouses are conspicuously missing from the game, garments which both are designed to be worn with armor (plate carriers and vests). They are made of more modern materials than cotton. In addition, few modern soft tactical gear like pouches and storage gear like backpacks is made of cotton.

Describe the solution

Changes the material where appropriate. Adds the items in question, adjusts spawns to match. Adds the old army jacket to appropriate spawns, adjusts its description.

Describe alternatives you've considered

Not giving the heli pilot anything at all for the outer layer, or adding their weird combo vest/harness thing.

Testing

Loaded the game, made sure no errors came up, and that the stuff was craftable with the right stuff.

Additional context

None.

@tenmillimaster
Copy link
Member Author

I think I missed the professions tab, hold up.

data/json/items/armor/coats.json Outdated Show resolved Hide resolved
data/json/items/armor/torso_clothes.json Outdated Show resolved Hide resolved
@Maleclypse Maleclypse added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items / Item Actions / Item Qualities Items and how they work and interact Spawn Creatures, items, vehicles, locations appearing on map and removed Crafting / Construction / Recipes Includes: Uncrafting / Disassembling labels Oct 21, 2021
tenmillimaster and others added 4 commits October 21, 2021 06:18
Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
@I-am-Erk
Copy link
Contributor

Sweet.

Don't forget to check the crafting recipes for these

Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
"repairs_like": "jacket_army_modern",
"type": "ARMOR",
"name": { "str_sp": "combat shirt" },
"description": "An oddly balanced long-sleeved shirt with a thin, moisture wicking torso and thicker arms more appropriate for a jacket. The arms are covered in a camouflage pattern and have two shoulder pockets. It has a pocket for your pen!",
Copy link
Contributor

Choose a reason for hiding this comment

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

Either add the pen pocket or change the description 😀

@kevingranade kevingranade merged commit 0fac7c7 into CleverRaven:master Oct 26, 2021
@tenmillimaster tenmillimaster deleted the Synths branch March 29, 2023 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants