Cleared the “examine” message in the trade menu correctly
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Fix for conductivity in items with null second material. Issue #6190
Merge branch 'master' into conductivityfix
Mods can now have their own lua files.

Furthermore, added game.dofile function, which executes a lua file from the current mod directory.
Fixed unused parameter warnings.
Only check creature attributes if we have a creature.
Update .pot
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into conductivityfix

Merge conductivity fix with upstream/master
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Fixes display bug, and crash bug.
Fix slot machine so you don't win on average.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'fix_slot_machine' of https://github.com/vidarsk/Cataclysm-DDA into vidarsk-fix_slot_machine
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into conductivityfix
Keep fix in tune with upstream/master

Need to switch to diff branch
change the creature_tracker to use a list of pointers to monsters.

This allows infestation/removal of monsters without changing the references that `Creature_tracker::find` / `game::zombie` returns.
Revert using temporary copy copy of monster during its death function.

The previous commit removed the possible reallocation of the monster object. One can now safely use the monster object until it is actually removed from the creature tracker. So there is no need for the temporary copy.
Adds constructable stone walls.

A really tiny PR, this one is remarkably simple.
Merge pull request #6298 from Rivet-the-Zombie/stone-walls

Adds constructable stone walls.