cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Fixed the flags for head items. Most space helmets will protect your face.

Browse Source 
-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
This commit is contained in:
giacomand@gmail.com
2012-10-14 07:33:19 +00:00
parent 9047fbee05
commit e00fd0fd4b
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/clothing.dm
View File

@@ -102,7 +102,7 @@ BLIND // can't see anything
name = "Space helmet" name = "Space helmet"
icon_state = "space" icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment." 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" item_state = "space"
permeability_coefficient = 0.01 permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)

4
code/modules/clothing/head/misc_special.dm
View File

@@ -36,13 +36,13 @@
if(usr.canmove && !usr.stat && !usr.restrained()) if(usr.canmove && !usr.stat && !usr.restrained())
if(src.up) if(src.up)
src.up = !src.up src.up = !src.up
src.flags |= HEADCOVERSEYES src.flags |= HEADCOVERSEYES | HEADCOVERSMOUTH
flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
icon_state = "welding" icon_state = "welding"
usr << "You flip the mask down to protect your eyes." usr << "You flip the mask down to protect your eyes."
else else
src.up = !src.up src.up = !src.up
src.flags &= ~HEADCOVERSEYES src.flags &= ~HEADCOVERSEYES | HEADCOVERSMOUTH
flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = "weldingup" icon_state = "weldingup"
usr << "You push the mask up out of your face." usr << "You push the mask up out of your face."

3
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -41,6 +41,7 @@
desc = "An armored beret commonly used by special operations officers." desc = "An armored beret commonly used by special operations officers."
icon_state = "beret_badge" icon_state = "beret_badge"
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR
//NASA Voidsuit //NASA Voidsuit
@@ -63,6 +64,7 @@
name = "Santa's hat" name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!" desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat" icon_state = "santahat"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR
/obj/item/clothing/suit/space/santa /obj/item/clothing/suit/space/santa
name = "Santa's suit" name = "Santa's suit"
@@ -81,6 +83,7 @@
icon_state = "pirate" icon_state = "pirate"
item_state = "pirate" item_state = "pirate"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) 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 /obj/item/clothing/suit/space/pirate
name = "pirate coat" name = "pirate coat"