Merge branch 'ashen-shugar' into ambrosia
Cleaned up 'unused variable' GCC warnings.
Merge branch 'ambrosia' of https://github.com/RhostMUSH/trunk into ambrosia
Merge branch 'ambrosia'