Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

This commit is contained in:
Ccomp5950
2014-02-26 09:38:40 -06:00
37 changed files with 154 additions and 155 deletions
+2 -1
View File
@@ -201,7 +201,8 @@ steam.start() -- spawns the effect
sleep(5)
step(sparks,direction)
spawn(20)
sparks.delete()
if(sparks)
sparks.delete()
src.total_sparks--