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

code/defines/obj/clothing/jumpsuit.dm

@@ -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"

code/game/objects/items/clothing.dm

@@ -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")

code/modules/clothing/suits/labcoat.dm

@@ -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

config/custom_items.txt

@@ -5,4 +5,6 @@ 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
-compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
+compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
+tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
+searif: Yuki Matsuda: /obj/item/clothing/under/jumpsuitdown