diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 43743aabddd..960e194248c 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -518,4 +518,13 @@ protective_temperature = 100000 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) \ No newline at end of file + 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) \ No newline at end of file diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index 1ae417144ea..679b53653d8 100644 --- a/code/game/objects/items/clothing.dm +++ b/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!" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 36b22c4ac9f..0877bbbc9e7 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/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" \ No newline at end of file diff --git a/config/custom_items.txt b/config/custom_items.txt index 3b481b98250..820238419f8 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -3,4 +3,5 @@ spaceman96: Trenna Seber: /obj/item/weapon/pen/multi, /obj/item/clothing/suit/st 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index a32f3e306c8..1b171419222 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0550550e7fa..7d5fbebf6c6 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index ce98885241e..9583224a6ba 100755 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 17d403d979a..3954c21503a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ