From e00fd0fd4bcdb9ec376330ef632fd0fc8b9d5595 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sun, 14 Oct 2012 07:33:19 +0000 Subject: [PATCH] -Fixed the flags for head items. Most space helmets will protect your face. -Welding mask will protect your face if it is down. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4874 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/head/misc_special.dm | 4 ++-- code/modules/clothing/spacesuits/miscellaneous.dm | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a4c5903135f..c3971b49f7c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -102,7 +102,7 @@ BLIND // can't see anything name = "Space helmet" icon_state = "space" desc = "A special helmet designed for work in a hazardous, low-pressure environment." - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH item_state = "space" permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 3d217c9f3b1..dbbb9c29253 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -36,13 +36,13 @@ if(usr.canmove && !usr.stat && !usr.restrained()) if(src.up) src.up = !src.up - src.flags |= HEADCOVERSEYES + src.flags |= HEADCOVERSEYES | HEADCOVERSMOUTH flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE icon_state = "welding" usr << "You flip the mask down to protect your eyes." else src.up = !src.up - src.flags &= ~HEADCOVERSEYES + src.flags &= ~HEADCOVERSEYES | HEADCOVERSMOUTH flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "weldingup" usr << "You push the mask up out of your face." diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e297d55e6e0..71dd6e20629 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -41,6 +41,7 @@ desc = "An armored beret commonly used by special operations officers." icon_state = "beret_badge" armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR //NASA Voidsuit @@ -63,6 +64,7 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR /obj/item/clothing/suit/space/santa name = "Santa's suit" @@ -81,6 +83,7 @@ icon_state = "pirate" item_state = "pirate" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR /obj/item/clothing/suit/space/pirate name = "pirate coat"