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

CDDA is about to E.X.P.L.O.D.E. (EOD stuff) #69063

Merged
merged 11 commits into from
Nov 15, 2023

Conversation

tenmillimaster
Copy link
Member

Summary

Content "EOD suit adjustments and EOD paraphernalia"

Purpose of change

EOD suits were previously providing considerable ballistic protection, all over the body. This would not be accurate; EOD suits are primarily meant to protect from blast and fragmentation on approach, not bullets.

Describe the solution

I changed the material type of the EOD suits and scaled their protection to values that might give some protection to very weak bullets, but nothing more. I added a central plate pocket to both the EOD suit and the light EOD suit (renamed to tactical EOD suit to better reflect usage) that offered some more ballistic protection as a side effect of design.

Along the way I also adjusted price (https://online.ogs.ny.gov/purchase/spg/awards/3823223173Can.htm) , added some paraphernalia to the EOD spawns, And also added LVL III deltoid plates that the tactical eod suit could accept.

ALSO added spots in police dept mapgen where cop_armory wasn't spawning.

Describe alternatives you've considered

Making the tactical EOD suit as modular as it's supposed to be - there's like a kajillion pieces.
image

Adding a flag for deltoid plates instead of limiting what can be put in the deltoid pockets via item length.

Not adding these stupid plates.
image

Adding a gorget/mega collar to the EOD suit, but I ran into issues doing that. See issue #69049 .
image

I think also we need a separate overpressure damage type for concussions. Or otherwise just have explosives deal bash damage.

Testing

Loaded game, spawned items, checked spawns. Tossed some grenades to 5 tiles away - at the cusp of the kill radius - and didn't die sometimes, which is about what I'd expect of an EOD suit. Tried putting plates in and out.

Additional context

While it wasn't terribly helpful I did use https://www.youtube.com/watch?v=s3pTJ1dIvMg as a source of some information, primarily plate composition.

@tenmillimaster tenmillimaster added the Items: Armor / Clothing Armor and clothing label Nov 1, 2023
@tenmillimaster tenmillimaster changed the title CDDA is about to E.X.P.L.O.D.E. CDDA is about to E.X.P.L.O.D.E. (EOD stuff) Nov 1, 2023
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies labels Nov 1, 2023
data/json/itemgroups/Clothing_Gear/gear.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/tool/firefighting.json Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Nov 1, 2023

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

Click to expand
  • onstructed from Kevlar and Nomex for use by explosive ordnance disposal technicians in 'non-permissive environments'. They are lighter than normal EOD armor to provide more maneuverability.

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 astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Nov 1, 2023
tenmillimaster and others added 3 commits November 1, 2023 19:58
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
data/json/items/armor/legs_armor.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 14, 2023
@Maleclypse Maleclypse merged commit bca9e9a into CleverRaven:master Nov 15, 2023
@tenmillimaster tenmillimaster deleted the EOD2 branch November 15, 2023 04:45
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* Everything EOD. I hope.

* eod2 - these stupid deltoid plates

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Descriptions.

* Update data/json/items/armor/ballistic_armor.json

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>

* accidentally some plates

* Update professions.json

* Update data/json/items/armor/legs_armor.json

Co-authored-by: Antti Riikonen <harava@gmail.com>

* Update boots.json

* appease density test

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: Antti Riikonen <harava@gmail.com>
@Mister-Cultist
Copy link

nice to see these get some love, would be interesting to add some recipes for custom up armoring them in a similar branch to survivor gear, just heavier and more encumbering.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants