Bridge Gone; Science Department Resprite + Drip Expansion (#30917)

* obj sprites, human suits, vox suits, berets, softcap, loadout, vendors

* compile fix

* kidan sprites

* drask sprites + kidan uniform i missed

* xenobio merge conflict + swap robotics beret names

* grey sprites

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

code/game/machinery/vendors/wardrobe_vendors.dm

@@ -342,6 +342,12 @@
 	ads_list = list("Perfect for the mad scientist in you!")
 	vend_reply = "Thank you for using the GeneDrobe!"
 	products = list(/obj/item/clothing/under/rank/rnd/geneticist = 3,
+					/obj/item/clothing/under/rank/rnd/geneticist/skirt = 3,
+					/obj/item/clothing/under/rank/rnd/geneticist/corporate = 3,
+					/obj/item/clothing/under/rank/rnd/geneticist/skirt/corporate = 3,
+					/obj/item/clothing/head/beret/gene = 3,
+					/obj/item/clothing/head/beret/gene_alt = 3,
+					/obj/item/clothing/head/beret/gene_wine = 3,
 					/obj/item/clothing/shoes/laceup = 3,
 					/obj/item/clothing/shoes/white = 3,
 					/obj/item/clothing/shoes/sandal/white = 3,
@@ -355,6 +361,12 @@
 	contraband = list(/obj/item/toy/figure/crew/geneticist = 1)
 
 	prices = list(/obj/item/clothing/under/rank/rnd/geneticist = 50,
+				/obj/item/clothing/under/rank/rnd/geneticist/skirt = 50,
+				/obj/item/clothing/under/rank/rnd/geneticist/corporate = 50,
+				/obj/item/clothing/under/rank/rnd/geneticist/skirt/corporate = 50,
+				/obj/item/clothing/head/beret/gene = 20,
+				/obj/item/clothing/head/beret/gene_alt = 20,
+				/obj/item/clothing/head/beret/gene_wine = 20,
 				/obj/item/clothing/suit/storage/labcoat/genetics = 75,
 				/obj/item/clothing/shoes/laceup = 30,
 				/obj/item/clothing/shoes/white = 20,
@@ -383,11 +395,14 @@
 	vend_reply = "Thank you for using the SciDrobe!"
 	products = list(/obj/item/clothing/under/rank/rnd/scientist = 6,
 					/obj/item/clothing/under/rank/rnd/scientist/skirt = 3,
+					/obj/item/clothing/under/rank/rnd/scientist/corporate = 3,
+					/obj/item/clothing/under/rank/rnd/scientist/skirt/corporate = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
 					/obj/item/clothing/suit/storage/labcoat = 3,
 					/obj/item/clothing/suit/storage/labcoat/science = 3,
 					/obj/item/clothing/suit/jacket/bomber/sci = 3,
 					/obj/item/clothing/head/beret/sci = 3,
+					/obj/item/clothing/head/beret/sci_alt = 3,
 					/obj/item/clothing/accessory/armband/science = 6,
 					/obj/item/clothing/shoes/laceup = 3,
 					/obj/item/clothing/shoes/white = 3,
@@ -403,11 +418,14 @@
 
 	prices = list(/obj/item/clothing/under/rank/rnd/scientist = 50,
 				/obj/item/clothing/under/rank/rnd/scientist/skirt = 50,
+				/obj/item/clothing/under/rank/rnd/scientist/corporate = 50,
+				/obj/item/clothing/under/rank/rnd/scientist/skirt/corporate = 50,
 				/obj/item/clothing/suit/hooded/wintercoat/science = 75,
 				/obj/item/clothing/suit/storage/labcoat = 75,
 				/obj/item/clothing/suit/storage/labcoat/science = 75,
 				/obj/item/clothing/suit/jacket/bomber/sci = 75,
 				/obj/item/clothing/head/beret/sci = 20,
+				/obj/item/clothing/head/beret/sci_alt = 20,
 				/obj/item/clothing/accessory/armband/science = 20,
 				/obj/item/clothing/shoes/laceup = 30,
 				/obj/item/clothing/shoes/white = 20,
@@ -434,11 +452,16 @@
 	vend_reply = "Thank you for using the RoboDrobe!"
 	products = list(/obj/item/clothing/under/rank/rnd/roboticist = 3,
 					/obj/item/clothing/under/rank/rnd/roboticist/skirt = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist/corporate = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist/skirt/corporate = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist/overalls = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist/corporate/alt = 3,
 					/obj/item/clothing/suit/storage/labcoat/roboblack = 3,
 					/obj/item/clothing/suit/storage/labcoat/robowhite = 3,
 					/obj/item/clothing/suit/jacket/bomber/robo = 3,
 					/obj/item/clothing/head/beret/roboblack = 3,
 					/obj/item/clothing/head/beret/robowhite = 3,
+					/obj/item/clothing/head/soft/robotics = 3,
 					/obj/item/clothing/head/soft/black = 3,
 					/obj/item/clothing/gloves/fingerless = 3,
 					/obj/item/clothing/shoes/laceup = 3,
@@ -455,11 +478,16 @@
 
 	prices = list(/obj/item/clothing/under/rank/rnd/roboticist = 50,
 				/obj/item/clothing/under/rank/rnd/roboticist/skirt = 50,
+				/obj/item/clothing/under/rank/rnd/roboticist/corporate = 50,
+				/obj/item/clothing/under/rank/rnd/roboticist/skirt/corporate = 50,
+				/obj/item/clothing/under/rank/rnd/roboticist/overalls = 50,
+				/obj/item/clothing/under/rank/rnd/roboticist/corporate/alt = 50,
 				/obj/item/clothing/suit/storage/labcoat/roboblack = 75,
 				/obj/item/clothing/suit/storage/labcoat/robowhite = 75,
 				/obj/item/clothing/suit/jacket/bomber/robo = 75,
 				/obj/item/clothing/head/beret/roboblack = 20,
 				/obj/item/clothing/head/beret/robowhite = 20,
+				/obj/item/clothing/head/soft/robotics = 20,
 				/obj/item/clothing/head/soft/black = 20,
 				/obj/item/clothing/gloves/fingerless = 20,
 				/obj/item/clothing/shoes/laceup = 30,

code/modules/client/preference/loadout/loadout_hat.dm

@@ -100,12 +100,17 @@
 /datum/gear/hat/capengi
 	display_name = "Cap, engineer"
 	path = /obj/item/clothing/head/soft/engineer
-	allowed_roles = list("Chief Engineer, Station Engineer")
+	allowed_roles = list("Chief Engineer", "Station Engineer")
 
 /datum/gear/hat/capatmos
 	display_name = "Cap, atmospheric technician"
 	path = /obj/item/clothing/head/soft/atmos
-	allowed_roles = list("Chief Engineer, Life Support Specialist")
+	allowed_roles = list("Chief Engineer", "Life Support Specialist")
+
+/datum/gear/hat/caprobo
+	display_name = "Cap, roboticist"
+	path = /obj/item/clothing/head/soft/robotics
+	allowed_roles = list("Research Director", "Roboticist")
 
 /datum/gear/hat/capred
 	display_name = "Cap, red"
@@ -265,18 +270,38 @@
 /datum/gear/hat/beret_job/sci
 	display_name = "Beret, science"
 	path = /obj/item/clothing/head/beret/sci
-	allowed_roles = list("Research Director", "Scientist", "Geneticist", "Xenobiologist")
+	allowed_roles = list("Research Director", "Scientist", "Xenobiologist")
+
+/datum/gear/hat/beret_job/sci_alt
+	display_name = "Beret, science corporate"
+	path = /obj/item/clothing/head/beret/sci_alt
+	allowed_roles = list("Research Director", "Scientist", "Xenobiologist")
 
 /datum/gear/hat/beret_job/robowhite
-	display_name = "Beret, robotics"
+	display_name = "Beret, bioengineer"
 	path = /obj/item/clothing/head/beret/robowhite
 	allowed_roles = list("Research Director", "Roboticist")
 
 /datum/gear/hat/beret_job/roboblack
-	display_name = "Beret, bioengineer"
+	display_name = "Beret, robotics"
 	path = /obj/item/clothing/head/beret/roboblack
 	allowed_roles = list("Research Director", "Roboticist")
 
+/datum/gear/hat/beret_job/gene
+	display_name = "Beret, geneticist"
+	path = /obj/item/clothing/head/beret/gene
+	allowed_roles = list("Research Director", "Geneticist")
+
+/datum/gear/hat/beret_job/gene_alt
+	display_name = "Beret, geneticist corporate"
+	path = /obj/item/clothing/head/beret/gene_alt
+	allowed_roles = list("Research Director", "Geneticist")
+
+/datum/gear/hat/beret_job/gene_wine
+	display_name = "Beret, geneticist wine"
+	path = /obj/item/clothing/head/beret/gene_wine
+	allowed_roles = list("Research Director", "Geneticist")
+
 /datum/gear/hat/beret_job/rd
 	display_name = "Beret, research director"
 	path = /obj/item/clothing/head/beret/rd

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -276,15 +276,63 @@
 	allowed_roles = list("Chief Engineer")
 
 //Research
+/datum/gear/uniform/sci
+	main_typepath = /datum/gear/uniform/sci
+
 /datum/gear/uniform/skirt/job/sci
 	display_name = "Skirt, scientist"
 	path = /obj/item/clothing/under/rank/rnd/scientist/skirt
 	allowed_roles = list("Research Director", "Scientist", "Xenobiologist")
 
+/datum/gear/uniform/sci/sci_alt
+	display_name = "Uniform, scientist corporate"
+	path = /obj/item/clothing/under/rank/rnd/scientist/corporate
+	allowed_roles = list("Research Director", "Scientist", "Xenobiologist")
+
+/datum/gear/uniform/skirt/job/sci_alt
+	display_name = "Skirt, scientist corporate"
+	path = /obj/item/clothing/under/rank/rnd/scientist/skirt/corporate
+	allowed_roles = list("Research Director", "Scientist", "Xenobiologist")
+
 /datum/gear/uniform/skirt/job/roboticist
 	display_name = "Skirt, roboticist"
 	path = /obj/item/clothing/under/rank/rnd/roboticist/skirt
-	allowed_roles = list("Research Director","Roboticist")
+	allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/uniform/sci/robo_alt
+	display_name = "Jumpsuit, bioengineer"
+	path = /obj/item/clothing/under/rank/rnd/roboticist/corporate
+	allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/uniform/skirt/job/robo_alt
+	display_name = "Skirt, bioengineer"
+	path = /obj/item/clothing/under/rank/rnd/roboticist/skirt/corporate
+	allowed_roles = list("Research Director", "Scientist")
+
+/datum/gear/uniform/sci/robo_corp
+	display_name = "Uniform, roboticist corporate"
+	path = /obj/item/clothing/under/rank/rnd/roboticist/corporate/alt
+	allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/uniform/overalls/job/roboticist
+	display_name = "Overalls, roboticist"
+	path = /obj/item/clothing/under/rank/rnd/roboticist/overalls
+	allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/uniform/skirt/job/geneticist
+	display_name = "Skirt, geneticist"
+	path = /obj/item/clothing/under/rank/rnd/geneticist/skirt
+	allowed_roles = list("Research Director", "Geneticist")
+
+/datum/gear/uniform/sci/gen_alt
+	display_name = "Uniform, geneticist corporate"
+	path = /obj/item/clothing/under/rank/rnd/geneticist/corporate
+	allowed_roles = list("Research Director", "Geneticist")
+
+/datum/gear/uniform/skirt/job/gen_alt
+	display_name = "Skirt, geneticist corporate"
+	path = /obj/item/clothing/under/rank/rnd/geneticist/skirt/corporate
+	allowed_roles = list("Research Director", "Geneticist")
 
 /datum/gear/uniform/skirt/job/rd
 	display_name = "Skirt, rd"

code/modules/clothing/head/beret.dm

@@ -147,19 +147,73 @@
 
 /obj/item/clothing/head/beret/sci
 	name = "science beret"
-	desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
+	desc = "A purple beret with a lavender science insignia emblazoned on it. It has that authentic smell of burning plasma."
 	icon_state = "beret_science"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
+
+/obj/item/clothing/head/beret/sci_alt
+	name = "corporate science beret"
+	desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
+	icon_state = "beret_science_alt"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
 
 /obj/item/clothing/head/beret/robowhite
-	name = "robotics beret"
+	name = "bioengineer beret"
 	desc = "A white beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
 	icon_state = "beret_roboticswhite"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
 
 /obj/item/clothing/head/beret/roboblack
-	name = "bioengineer beret"
+	name = "robotics beret"
 	desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
 	icon_state = "beret_roboticsblack"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
 
+/obj/item/clothing/head/beret/gene
+	name = "genetics beret"
+	desc = "A purple beret with a wine colored science insignia emblazoned on it. It smells of mutagens."
+	icon_state = "beret_genetics"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
+
+/obj/item/clothing/head/beret/gene_alt
+	name = "corporate genetics beret"
+	desc = "A white beret with a wine colored science insignia emblazoned on it. It smells of mutagens."
+	icon_state = "beret_genetics_alt"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
+
+/obj/item/clothing/head/beret/gene_wine
+	name = "wine genetics beret"
+	desc = "A wine colored beret with a white science insignia emblazoned on it. It smells of mutagens."
+	icon_state = "beret_genetics_wine"
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+		)
 //Service
 /obj/item/clothing/head/beret/hop
 	name = "head of personnel's beret"

code/modules/clothing/head/soft_caps.dm

@@ -144,6 +144,11 @@
 	icon_state = "paramedic"
 	dog_fashion = /datum/dog_fashion/head/paramedic
 
+/obj/item/clothing/head/soft/robotics
+	name = "robotics cap"
+	desc = "It's a black baseball hat with a red research shield."
+	icon_state = "robo"
+
 /obj/item/clothing/head/soft/sec
 	name = "security cap"
 	desc = "It's baseball hat in tasteful red colour."

code/modules/clothing/under/jobs/rnd.dm

@@ -39,34 +39,76 @@
 
 /obj/item/clothing/under/rank/rnd/scientist
 	name = "scientist's jumpsuit"
-	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
+	desc = "A breathable purple jumpsuit with light markings, designating the wearer a scientist."
 	icon_state = "science"
 	permeability_coefficient = 0.50
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 0)
 
 /obj/item/clothing/under/rank/rnd/scientist/skirt
 	name = "scientist's jumpskirt"
-	icon_state = "sciencewhitef"
+	desc = "A breathable purple jumpskirt with light markings, designating the wearer a scientist."
+	icon_state = "science_skirt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
+/obj/item/clothing/under/rank/rnd/scientist/corporate
+	name = "scientist's corporate uniform"
+	desc = "A sterile white uniform with purple markings, for the mad scientist who favors style."
+	icon_state = "sci_corporate"
+
+/obj/item/clothing/under/rank/rnd/scientist/skirt/corporate
+	name = "scientist's corporate skirt"
+	desc = "A sterile white skirt with purple markings, for the mad scientist who favors style."
+	icon_state = "sci_corp_skirt"
+
 /obj/item/clothing/under/rank/rnd/roboticist
 	name = "roboticist's jumpsuit"
-	desc = "It's a slimming black with reinforced seams; great for industrial work."
+	desc = "A slimming black jumpsuit with reinforced seams; great for industrial work."
 	icon_state = "robotics"
 	resistance_flags = NONE
 
 /obj/item/clothing/under/rank/rnd/roboticist/skirt
 	name = "roboticist's jumpskirt"
-	desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
-	icon_state = "roboticsf"
+	desc = "A slimming black jumpskirt with reinforced seams; a great look for industrial work."
+	icon_state = "robotics_skirt"
+
+/obj/item/clothing/under/rank/rnd/roboticist/corporate
+	name = "bioengineer's jumpsuit"
+	desc = "A sterile white jumpsuit with reinforced seams; a great look for surgical work."
+	icon_state = "bioengineer"
+
+/obj/item/clothing/under/rank/rnd/roboticist/skirt/corporate
+	name = "bioengineer's jumpskirt"
+	desc = "A sterile white jumpskirt with reinforced seams; a great look for surgical work."
+	icon_state = "bioengineer_skirt"
+
+/obj/item/clothing/under/rank/rnd/roboticist/corporate/alt
+	name = "roboticist's coveralls"
+	desc = "A mechanic's red coveralls with black markings and chest pockets, for those who aren't afraid to get covered in oil and blood."
+	icon_state = "robo_corporate"
+
+/obj/item/clothing/under/rank/rnd/roboticist/overalls
+	name = "roboticist's overalls"
+	desc = "A red set of overalls over a black turtleneck, for those who aren't afraid to get covered in oil and blood."
+	icon_state = "robo_overalls"
 
 /obj/item/clothing/under/rank/rnd/geneticist
 	name = "geneticist's jumpsuit"
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+	desc = "A tear-proof purple jumpsuit with wine colored markings, designating the wearer a geneticist."
 	icon_state = "genetics"
 	permeability_coefficient = 0.50
 
 /obj/item/clothing/under/rank/rnd/geneticist/skirt
 	name = "geneticist's jumpskirt"
-	icon_state = "geneticswhitef"
+	desc = "A tear-proof purple jumpskirt with wine colored markings, designating the wearer a geneticist."
+	icon_state = "genetics_skirt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/rnd/geneticist/corporate
+	name = "geneticist's corporate uniform"
+	desc = "A tear-proof sterile white uniform with wine colored markings, for those who prefer a clean look while scrambling their genetic code."
+	icon_state = "gen_corporate"
+
+/obj/item/clothing/under/rank/rnd/geneticist/skirt/corporate
+	name = "geneticist's corporate skirt"
+	desc = "A tear-proof sterile white skirt with wine colored markings, for those who prefer a clean look while scrambling their genetic code."
+	icon_state = "gen_corp_skirt"