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

This commit is contained in:
Ccomp5950
2014-03-04 18:29:03 -06:00
31 changed files with 1562 additions and 1289 deletions
+2
View File
@@ -15,6 +15,8 @@
return 0
if (affected.status & ORGAN_DESTROYED)
return 0
if (target_zone == "head" && target.species && (target.species.flags & IS_SYNTHETIC))
return 1
if (affected.status & ORGAN_ROBOT)
return 0
return 1