Merge master into dev.

This commit is contained in:
Zuhayr
2015-02-12 23:01:08 +10:30
25 changed files with 1252 additions and 1209 deletions

View File

@@ -104,7 +104,7 @@
return
..()
take_damage(Proj.damage * 4)
take_damage(Proj.damage)
return