cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-01 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source
This commit is contained in:
cib
2012-03-06 19:44:43 -08:00
parent 37f6e216c1 d5c5bddd69
commit 2d99674561
8 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/defines/obj/clothing/jumpsuit.dm
View File

@@ -401,7 +401,6 @@
item_state = "scratch"
color = "scratch"
/obj/item/clothing/under/jensen
desc = "You never asked for anything this stylish."
name = "Head of Security Jumpsuit"
@@ -507,7 +506,7 @@
color = "spiderman"
/obj/item/clothing/under/rank/nursesuit
desc = "A jumpsuit commonly worn by nursing staff in the medical department."
desc = "Made of a special fiber that gives special protection against biohazards. A jumpsuit commonly worn by nursing staff in the medical department."
name = "Nurse Suit"
icon_state = "nursesuit"
item_state = "nursesuit"
@@ -530,10 +529,17 @@
armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
/obj/item/clothing/under/rank/medical_sleeve
desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel. Has short sleeves."
desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personneland short sleeves."
name = "Short Sleeve Medical Jumpsuit"
icon_state = "medical_sleeve"
item_state = "medical_sleeve"
item_state = "w_suit"
color = "medical_sleeve"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/jumpsuitdown
desc = "A rolled down jumpsuit. Great for mechanics."
name = "Rolled Down Jumpsuit"
icon_state = "jumpsuitdown"
item_state = "jumpsuitdown"
color = "jumpsuitdown"

2
code/game/objects/items/clothing.dm
View File

@@ -352,7 +352,7 @@ THERMAL GLASSES
else if(src.icon_state == "labgreen")
src.icon_state = "labgreen_open"
usr << "You unbutton the labcoat."
if(src.icon_state == "labcoat_pink_open")
else if(src.icon_state == "labcoat_pink_open")
src.icon_state = "labcoat_pink"
usr << "You button up the labcoat."
else if(src.icon_state == "labcoat_pink")

3
code/modules/clothing/suits/labcoat.dm
View File

@@ -1,4 +1,3 @@
/obj/item/clothing/suit/storage/labcoat
name = "labcoat"
desc = "A suit that protects against minor chemical spills."
@@ -34,7 +33,7 @@
/obj/item/clothing/suit/storage/labcoat/virologist
name = "Virologist Labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
desc = "A suit that protects against minor chemical spills. Has a green stripe on the shoulder."
icon_state = "labcoat_vir_open"
/obj/item/clothing/suit/storage/labcoat/science