Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
Segrain
2014-02-03 04:36:03 +03:00
14 changed files with 53 additions and 64 deletions
+2
View File
@@ -616,9 +616,11 @@ This function completely restores a damaged organ to perfect condition.
src.status &= ~ORGAN_BROKEN
src.status &= ~ORGAN_BLEEDING
src.status &= ~ORGAN_SPLINTED
src.status &= ~ORGAN_CUT_AWAY
src.status &= ~ORGAN_ATTACHABLE
src.status &= ~ORGAN_DESTROYED
src.status |= ORGAN_ROBOT
src.destspawn = 0
for (var/datum/organ/external/T in children)
if(T)
T.robotize()