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

Added FM 20-32 Mine/Countermine Operations manual #37444

Merged
merged 6 commits into from
Mar 6, 2020
Merged

Added FM 20-32 Mine/Countermine Operations manual #37444

merged 6 commits into from
Mar 6, 2020

Conversation

RarkGrames
Copy link
Contributor

@RarkGrames RarkGrames commented Jan 27, 2020 •
edited
Loading

Summary

SUMMARY: Content "Added FM 20-32 Mine/Countermine Operations manual"

Purpose of change

Adding a traps manual for explosive traps. Adding an other way for the Overrun scenario to deal with the minefields.

Describe the solution

  • Added traps_manual_mil item
  • Added the book to the book_military item group
  • Moved the landmine and boobytrap recipes to this book
  • Added the book to the Military Base location (Military Base location #37024).

Testing

  • Spawned the item in game
  • Checked out the book_military item group with the debug menu
  • Checked the spawn point in the Military Base location

Additional context

Contributes to #37122.

@ymber
Copy link
Member

ymber commented Jan 27, 2020

This should go in the SUS group for field manuals.

@ZhilkinSerg ZhilkinSerg added 0.E Content Freeze [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Jan 28, 2020
@weekly-digest weekly-digest bot mentioned this pull request Feb 2, 2020
Closed
This was referenced Feb 9, 2020
Closed
Closed
@ZhilkinSerg ZhilkinSerg merged commit 3eee117 into CleverRaven:master Mar 6, 2020
Funguss added a commit to Funguss/Cataclysm-DDA that referenced this pull request Mar 7, 2020
@Funguss
Revert "Added FM 20-32 Mine/Countermine Operations manual (CleverRave…
510592f 
…n#37444)"

This reverts commit f78b8df.
Funguss added a commit to Funguss/Cataclysm-DDA that referenced this pull request Mar 7, 2020
@Funguss
Revert "Revert "Added FM 20-32 Mine/Countermine Operations manual (Cl…
f1db474 
…everRaven#37444)""

This reverts commit 510592f.
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
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RarkGrames @ymber @ZhilkinSerg