diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index b8553708955..18ebcadfd12 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -92,11 +92,12 @@ new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) - new /obj/item/clothing/suit/toggle/labcoat(src) - new /obj/item/clothing/head/beret/science(src) + new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) + new /obj/item/clothing/head/beret/science/rd(src) new /obj/item/clothing/neck/cloak/rd(src) - new /obj/item/clothing/shoes/sneakers/brown(src) + new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) + new /obj/item/clothing/gloves/color/black(src) /obj/item/storage/bag/garment/chief_medical/PopulateContents() new /obj/item/clothing/head/beret/medical/cmo(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 33d43beea94..1ddb4f3f05d 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -281,12 +281,12 @@ greyscale_colors = "#8D008F" flags_1 = NONE -/obj/item/clothing/head/beret/science/fancy - desc = "A science-themed beret for our hardworking scientists. This one comes with a fancy badge!" +/obj/item/clothing/head/beret/science/rd + desc = "A purple badge with the insignia of the Research Director attached. For the paper-shuffler in you!" icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn - greyscale_colors = "#8D008F#FFFFFF" + greyscale_colors = "#7e1980#c9cbcb" //Medical /obj/item/clothing/head/beret/medical diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 0e16e95b504..24f472f09f0 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -87,6 +87,12 @@ . = ..() allowed += /obj/item/storage/bag/xeno +/obj/item/clothing/suit/toggle/labcoat/research_director + name = "research director's coat" + desc = "A mix between a labcoat and just a regular coat. It's made out of a special anti-bacterial, anti-acidic, and anti-biohazardous synthetic fabric." + icon_state = "labcoat_rd" + armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 75, FIRE = 75, ACID = 75) + /obj/item/clothing/suit/toggle/labcoat/roboticist name = "roboticist labcoat" desc = "More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads." @@ -96,4 +102,3 @@ name = "interdyne labcoat" desc = "More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads." icon_state = "labcoat_robo" - diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index b4b7b73aa0d..122fe418ed8 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -44,7 +44,7 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/research_director/turtleneck - desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style." + desc = "A Nanotrasen-purple turtleneck and black jeans, for a director with a superior sense of style." name = "research director's turtleneck" icon_state = "rdturtle" inhand_icon_state = "p_suit" @@ -53,7 +53,7 @@ /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt name = "research director's turtleneck skirt" - desc = "A dark purple turtleneck and tan khaki skirt, for a director with a superior sense of style." + desc = "A Nanotrasen-purple turtleneck and a black skirt, for a director with a superior sense of style." icon_state = "rdturtle_skirt" inhand_icon_state = "p_suit" body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 264a613bd30..36c0d583b73 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -57,14 +57,16 @@ id = /obj/item/card/id/advanced/silver id_trim = /datum/id_trim/job/research_director - uniform = /obj/item/clothing/under/rank/rnd/research_director - suit = /obj/item/clothing/suit/toggle/labcoat + uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck + suit = /obj/item/clothing/suit/toggle/labcoat/research_director backpack_contents = list( /obj/item/melee/baton/telescopic = 1, ) belt = /obj/item/modular_computer/tablet/pda/heads/rd + head = /obj/item/clothing/head/beret/science/rd ears = /obj/item/radio/headset/heads/rd - shoes = /obj/item/clothing/shoes/sneakers/brown + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black l_pocket = /obj/item/laser_pointer/purple l_hand = /obj/item/clipboard diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 57b29db6695..955a5fe338e 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -206,7 +206,6 @@ /obj/item/storage/backpack/satchel/science = 3, /obj/item/storage/backpack/duffelbag/science = 3, /obj/item/clothing/head/beret/science = 3, - /obj/item/clothing/head/beret/science/fancy = 3, /obj/item/clothing/mask/bandana/striped/science = 3, /obj/item/clothing/suit/hooded/wintercoat/science = 3, /obj/item/clothing/under/rank/rnd/scientist = 3, diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi index b9f6756bf89..891dc5b6929 100644 Binary files a/icons/mob/clothing/suits/labcoat.dmi and b/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/under/rnd.dmi b/icons/mob/clothing/under/rnd.dmi index 6895e8e8220..e9b438a00af 100644 Binary files a/icons/mob/clothing/under/rnd.dmi and b/icons/mob/clothing/under/rnd.dmi differ diff --git a/icons/obj/clothing/suits/labcoat.dmi b/icons/obj/clothing/suits/labcoat.dmi index b2cb4b716f7..ce11d4f2925 100644 Binary files a/icons/obj/clothing/suits/labcoat.dmi and b/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/icons/obj/clothing/under/rnd.dmi b/icons/obj/clothing/under/rnd.dmi index 58b06219422..136cc950dbf 100644 Binary files a/icons/obj/clothing/under/rnd.dmi and b/icons/obj/clothing/under/rnd.dmi differ