Merge pull request #8766 from kingofkosmos/breathmaskautotoggle

Breath mask auto-adjust
This commit is contained in:
Cheridan
2015-04-10 13:58:35 -05:00
2 changed files with 11 additions and 4 deletions
+2 -1
View File
@@ -106,7 +106,7 @@ BLIND // can't see anything
//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
/obj/item/clothing/mask/proc/adjustmask(var/mob/user)
if(!ignore_maskadjust)
if(!user.canmove || user.stat || user.restrained())
if(user.incapacitated())
return
if(src.mask_adjusted == 1)
src.icon_state = initial(icon_state)
@@ -131,6 +131,7 @@ BLIND // can't see anything
//Shoes
/obj/item/clothing/shoes
name = "shoes"