[MANUAL MIRROR] R[D]evamp - Secret Door (#17492)

* guh

* modular skyrat stuff

* Fixes the CI by fixing the other science and RD berets

* There you go Blueshift

Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>

_maps/map_files/Blueshift/BlueShift_upper.dmm

@@ -9440,8 +9440,8 @@
 /obj/item/clothing/neck/cloak/rd,
 /obj/item/clothing/neck/mantle/rdmantle,
 /obj/item/clothing/suit/hooded/wintercoat/science/rd,
-/obj/item/clothing/head/beret/science/fancy/rd,
-/obj/item/clothing/head/beret/science/fancy/rd/alt,
+/obj/item/clothing/head/beret/science/rd,
+/obj/item/clothing/head/beret/science/rd/alt,
 /turf/open/floor/carpet/purple,
 /area/station/command/heads_quarters/rd)
 "cJy" = (

code/game/objects/items/storage/garment.dm

@@ -93,11 +93,13 @@
 	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/suit/toggle/labcoat/rd(src) //SKYRAT EDIT ADDITION
+	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)

code/modules/clothing/head/jobs.dm

@@ -282,12 +282,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

code/modules/clothing/suits/labcoat.dm

@@ -97,6 +97,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."

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

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/rd //SKYRAT EDIT CHANGE
+	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
 

code/modules/vending/wardrobes.dm

@@ -208,7 +208,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,

modular_skyrat/modules/command_vendor/code/vending.dm

@@ -88,8 +88,8 @@
 		/obj/item/clothing/shoes/sneakers/brown = 1,
 	)
 	access_lists["[ACCESS_RD]"] = list(
-		/obj/item/clothing/head/beret/science/fancy/rd = 1,
-		/obj/item/clothing/head/beret/science/fancy/rd/alt = 1,
+		/obj/item/clothing/head/beret/science/rd = 1,
+		/obj/item/clothing/head/beret/science/rd/alt = 1,
 		/obj/item/clothing/under/rank/rnd/research_director = 1,
 		/obj/item/clothing/under/rank/rnd/research_director/skirt = 1,
 		/obj/item/clothing/under/rank/rnd/research_director/alt = 1,

modular_skyrat/modules/customization/modules/clothing/head/jobs.dm

@@ -99,17 +99,20 @@
 	desc = "A beret custom-fit to the Chief Medical Officer, repaired once or twice after Runtime got a hold of it. This one is made out of white fabric. Fancy."
 	greyscale_colors = "#FFFFFF#34CCEE"
 
+/obj/item/clothing/head/beret/science/fancy
+	desc = "A science-themed beret for our hardworking scientists. This one comes with a fancy badge!"
+	icon_state = "beret_badge"
+	greyscale_config = /datum/greyscale_config/beret_badge
+	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
+	greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
+	greyscale_colors = "#8D008F#FFFFFF"
+
 /obj/item/clothing/head/beret/science/fancy/robo
 	name = "robotics beret"
 	desc = "A sleek black beret designed with high-durability nano-mesh fiber - or so the roboticists claim."
 	greyscale_colors = "#4F4F4F#730000"
 
-/obj/item/clothing/head/beret/science/fancy/rd
-	name = "research director's beret"
-	desc = "A custom-tailored beret for the Research Director. Lamarr thinks it looks great."
-	greyscale_colors = "#8D008F#D8D39C"
-
-/obj/item/clothing/head/beret/science/fancy/rd/alt
+/obj/item/clothing/head/beret/science/rd/alt
 	name = "research director's beret"
 	desc = "A custom-tailored beret for the Research Director. Lamarr thinks it looks great. This one is made out of white fabric. Fancy."
 	greyscale_colors = "#FFFFFF#8D008F"

modular_skyrat/modules/teshari/code/teshari_clothes.dm

@@ -92,6 +92,9 @@
 /obj/item/clothing/head/beret/science/fancy
 	greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
 
+/obj/item/clothing/head/beret/science/rd
+	greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
+
 /obj/item/clothing/head/beret/durathread
 	greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
 

modular_skyrat/modules/vox_sprites/code/head.dm

@@ -25,6 +25,9 @@
 /obj/item/clothing/head/beret/science/fancy
 	greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
 
+/obj/item/clothing/head/beret/science/rd
+	greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
+
 /obj/item/clothing/head/beret/durathread
 	greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox