Merge pull request #398 from caelaislinn/master

new custom items

code/defines/obj/clothing/jumpsuit.dm

@@ -519,3 +519,12 @@
 	flags = FPRINT | TABLEPASS | SUITSPACE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	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."
+	name = "Short Sleeve Medical Jumpsuit"
+	icon_state = "medical_sleeve"
+	item_state = "medical_sleeve"
+	color = "medical_sleeve"
+	permeability_coefficient = 0.50
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)

code/game/objects/items/clothing.dm

@@ -355,6 +355,12 @@ THERMAL GLASSES
 	else if(src.icon_state == "labcoat_pink")
 		src.icon_state = "labcoat_pink_open"
 		usr << "You unbutton the labcoat."
+	else if(src.icon_state == "labcoat_sleeve_open")
+		src.icon_state = "labcoat_sleeve"
+		usr << "You button up the labcoat."
+	else if(src.icon_state == "labcoat_sleeve")
+		src.icon_state = "labcoat_sleeve_open"
+		usr << "You unbutton the labcoat."
 
 	else
 		usr << "Sorry! The suit you're wearing doesn't have buttons!"

code/modules/clothing/suits/labcoat.dm

@@ -46,3 +46,8 @@
 	name = "Pink Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
 	icon_state = "labcoat_pink_open"
+
+/obj/item/clothing/suit/storage/labcoat/red
+	name = "Red Labcoat"
+	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
+	icon_state = "labcoat_sleeve_open"

config/custom_items.txt

@@ -4,3 +4,4 @@ asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
 searif: Yuki Matsuda: /obj/item/weapon/paper/certificate
+erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red