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.

Sign up for GitHub

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

Jump to bottom

Hard Hat attachments retry #58749

Merged
merged 5 commits into from
Jul 7, 2022
Merged

Hard Hat attachments retry #58749

merged 5 commits into from
Jul 7, 2022

Conversation

Termineitor244
Copy link
Contributor

Summary

Content "Adds hard hats/helmets attachments"

Purpose of change

Continuation of #58020 and part of #58025 (Second try after #58204 got broken).
Many helmets or hard hats can have attachments and modifications, it's time for it to become reality in cataclysm too.

Examples of planned add-ons for hard hats:
Sun shields
Face Shield and Mounting Bracket
Shield Visor
Ear Muffs
Ballistic Mandible Guard
Counterweight Pouch

Describe the solution

Adds many new attachments for hard hats helmets, as well as the pockets that will accommodate these new items in the helmets/hard hats.

I also modified the hooded hard hat to now use a sun shield, and added a neck protector attachment in place of the hooded hard hat.

PROTECTION/COVERAGE VALUES ARE WIP UNTIL I GO AROUND TESTING THEM

Describe alternatives you've considered

To not add them?

Testing

TO BE DONE.

Additional context

Thanks @bombasticSlacks for the help with making these new ablative pockets to work!

That and adding some spawns/recipes, as well as adding the new pockets to the rest of the helmets.

@Termineitor244
Hard Hat attachments
f52dc3e 
Squashed commit of the following:
commit 0dc4a44
Merge: 527005c 5512b3d
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 26 14:27:26 2022 -0500

    Merge branch 'Hard-hat-attachments' of https://github.com/Termineitor244/Cataclysm-DDA into Hard-hat-attachments

commit 527005c
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 26 14:24:59 2022 -0500

    Common hard hat and bike attachments spawns

commit ff81741
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 26 13:27:35 2022 -0500

    More helmet pockets

commit 690ec0b
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 26 12:53:36 2022 -0500

    Chin guard

commit 143e5ec
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 19 17:47:33 2022 -0500

    Update data/json/items/armor/hats.json

    Co-authored-by: TheShadowFerret <[email protected]>

commit d4b11a0
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 19 17:45:04 2022 -0500

    Apply suggestions from code review

    Co-authored-by: TheShadowFerret <[email protected]>

commit 21ce28b
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:27:03 2022 -0500

    Update dictionary.txt

commit 62751e9
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:25:14 2022 -0500

    I forgot the pocket

commit b0d4661
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:01:50 2022 -0500

    Json Lint and fixes

commit b8d688b
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 20:50:43 2022 -0500

    Nape protector, sun shield and other small changes

commit ab2e91f
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 18:01:55 2022 -0500

    Add a plastic face shield

commit cdf7598
Author: Termineitor244 <[email protected]>
Date:   Wed Jun 8 04:53:53 2022 -0500

    Missing "P"

commit 72ee782
Author: Termineitor244 <[email protected]>
Date:   Tue Jun 7 22:46:24 2022 -0500

    Mandible guard problem resolved

commit ba882ce
Author: Termineitor244 <[email protected]>
Date:   Tue Jun 7 22:25:45 2022 -0500

    repairs_like

commit 39dc817
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 5 22:13:43 2022 -0500

    Hard hat attachments

commit 5512b3d
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 19 17:47:33 2022 -0500

    Update data/json/items/armor/hats.json

    Co-authored-by: TheShadowFerret <[email protected]>

commit 7ba8bbf
Merge: 569a97d 6e7d1a9
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 19 17:47:07 2022 -0500

    Merge branch 'master' into Hard-hat-attachments

commit 569a97d
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 19 17:45:04 2022 -0500

    Apply suggestions from code review

    Co-authored-by: TheShadowFerret <[email protected]>

commit e27acf1
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:27:03 2022 -0500

    Update dictionary.txt

commit 055b752
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:25:14 2022 -0500

    I forgot the pocket

commit d12c32c
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 21:01:50 2022 -0500

    Json Lint and fixes

commit f8ed904
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 20:50:43 2022 -0500

    Nape protector, sun shield and other small changes

commit 9ea849d
Author: Termineitor244 <[email protected]>
Date:   Sat Jun 11 18:01:55 2022 -0500

    Add a plastic face shield

commit df65b37
Author: Termineitor244 <[email protected]>
Date:   Wed Jun 8 04:53:53 2022 -0500

    Missing "P"

commit 23d2f69
Author: Termineitor244 <[email protected]>
Date:   Tue Jun 7 22:46:24 2022 -0500

    Mandible guard problem resolved

commit a7a2d98
Author: Termineitor244 <[email protected]>
Date:   Tue Jun 7 22:25:45 2022 -0500

    repairs_like

commit 0aa4ed1
Author: Termineitor244 <[email protected]>
Date:   Sun Jun 5 22:13:43 2022 -0500

    Hard hat attachments
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Armor / Clothing Armor and clothing Spawn Creatures, items, vehicles, locations appearing on map astyled astyled PR, label is assigned by github actions labels Jun 26, 2022
@Termineitor244 Termineitor244 mentioned this pull request Jun 26, 2022
Closed
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 26, 2022
@github-actions
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A common plastic chin guard designed to be attached to the strapps of any common hard hat or helmet.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 26, 2022
@mkrutov
Copy link
Contributor

mkrutov commented Jun 28, 2022

It would be really great to be able to attach Light Amp and Infrared goggles to your helmets to be able to switch between them quickly.

@bombasticSlacks
Copy link
Contributor

looks like you now have a merge conflict on this.

@kevingranade kevingranade merged commit 49360a2 into CleverRaven:master Jul 7, 2022
@Termineitor244 Termineitor244 deleted the New-hard-hat-attachments branch July 25, 2022 18:47
@chrispikula chrispikula mentioned this pull request Aug 11, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Termineitor244 @mkrutov @bombasticSlacks @kevingranade @dseguin