Merge remote-tracking branch 'remotes/origin/CHARGEMAN'

diff --cc src/birth.c
Simple merge

diff --cc src/bldg.c
Simple merge

diff --cc src/defines.h
Simple merge

diff --cc src/effects.c
Simple merge

diff --cc src/files.c
Simple merge

diff --cc src/monster2.c
Simple merge

diff --cc src/mspells4.c
Simple merge

diff --cc src/player-damage.c
Simple merge

diff --cc src/tables.c
Simple merge

diff --cc src/trap.c
Simple merge

diff --cc src/xtra1.c
Simple merge