Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

This commit is contained in:
Whitellama
2013-06-25 16:47:15 -07:00
16 changed files with 97 additions and 72 deletions
@@ -85,7 +85,7 @@ rcd light flash thingy on matter drain
for(var/mob/V in hearers(M, null))
V.show_message("\blue You hear a loud electrical buzzing sound!", 2)
spawn(50)
explosion(get_turf(M), 0,1,1,0)
explosion(get_turf(M), 0,1,2,3)
del(M)
else usr << "Out of uses."
else usr << "That's not a machine."