Merge branch 'removed-combat-test-code' into 'staging'

Left in some test code that caused all damage to be multiplied by 10000

See merge request !31

src/server/combat/combat.js

@@ -58,8 +58,6 @@ define([
 				}
 			}
 
-			amount *= 10000;
-
 			return {
 				amount: amount,
 				crit: isCrit,