merge fixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-22 20:25:27 +10:00
parent dd538fd3c5
commit c0e7ad00b2
7 changed files with 51 additions and 1306 deletions
-1
View File
@@ -100,7 +100,6 @@
if (istype(mover, /obj/item/projectile))
return prob(30)
else
return !src.density
return !src.density