Merge pull request #7008 from Zuhayr/spaceninjas

Hardsuit/voidsuit change, ninja refactor.
This commit is contained in:
PsiOmegaDelta
2014-11-22 09:30:54 +01:00
122 changed files with 6639 additions and 5879 deletions
+6
View File
@@ -261,6 +261,9 @@
if(slot_wear_mask)
if(H.wear_mask)
return 0
if(H.head && !(H.head.canremove) && (H.head.flags & HEADCOVERSMOUTH))
H << "\red \The [H.head] is in the way."
return 0
if( !(slot_flags & SLOT_MASK) )
return 0
return 1
@@ -301,6 +304,9 @@
if(slot_glasses)
if(H.glasses)
return 0
if(H.head && !(H.head.canremove) && (H.head.flags & HEADCOVERSEYES))
H << "\red \The [H.head] is in the way."
return 0
if( !(slot_flags & SLOT_EYES) )
return 0
return 1