Remodeled the junk basement
Whoops to change the one in chance for the safe

Whoops! Fixed now
FRESH FISH

Four new Species of freshwater New England fish:
+ Bluegill
+ Smallmouth bass
+ Largemouth Bass
+ Striped Bass

Removes Generic 'bass'
- Bass
Remove commented out code
Player.h Documentation 1
Merge pull request #6974 from i2amroy/Documentation

Player.h Documentation 1
Merge pull request #6971 from John-Candlebury/More-basements

Remodeled the junk basement
Let's remove the disassembly option from anvils, shall we?
Merge pull request #6972 from Madnus/FRESH-FISH

FRESH FISH
Prevent npcs from seeing (and taking) sitems that they should not be able to see.

Like planted seeds. Or items in a container that is far away. Uses the same logic as for the player.
simplify item::next_mode

No reason to have two loops over the content
cycle to the next gunmod when removing a gunmod

Also, no need to create a new item, instead use the gunmod item directly.
Cycle to next gunmod when "unloading" a gunmod.

Also use inventory::assign_empty_invlet to assign a new invlet instead of iterating.
Merge pull request #6980 from Rivet-the-Zombie/anvil-fix

Let's remove the disassembly option from anvils, shall we?
Merge branch 'fix-mods-reset-on-removing-gunmods' of https://github.com/BevapDin/Cataclysm-DDA into MoreMerge
Merge branch 'fix-npc-ignoring-sealed-stuff' of https://github.com/BevapDin/Cataclysm-DDA into MoreMerge
awl pike impale technique
merged upstream