Ports a bunch of fluff stuff

code/modules/admin/verbs/debug.dm

@@ -560,7 +560,7 @@
 		if("masked killer")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/sterile/latex(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)

code/modules/client/preference_setup/loadout/loadout_gloves.dm

@@ -28,7 +28,11 @@
 
 /datum/gear/gloves/latex
 	display_name = "gloves, latex"
-	path = /obj/item/clothing/gloves/latex
+	path = /obj/item/clothing/gloves/sterile/latex
+
+/datum/gear/gloves/nitrile
+	display_name = "gloves, nitrile"
+	path = /obj/item/clothing/gloves/sterile/nitrile
 
 /datum/gear/gloves/orange
 	display_name = "gloves, orange"

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -236,11 +236,6 @@
 	display_name = "santa hat, green (holiday)"
 	path = /obj/item/clothing/head/santa/green
 
-/datum/gear/head/zhan_scarf
-	display_name = "Zhan headscarf"
-	path = /obj/item/clothing/head/tajaran/scarf
-	whitelisted = "Tajara"
-
 /datum/gear/head/hijab
 	display_name = "hijab"
 	path = /obj/item/clothing/head/hijab

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -118,6 +118,10 @@
 	display_name = "labcoat, blue"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/blue
 
+/datum/gear/suit/labcoat/blue_edge
+	display_name = "labcoat, blue-edged"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
+
 /datum/gear/suit/labcoat/green
 	display_name = "labcoat, green"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/green
@@ -147,6 +151,11 @@
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
 
+/datum/gear/suit/roles/surgical_apron
+	display_name = "surgical apron"
+	path = /obj/item/clothing/suit/surgicalapron
+	allowed_roles = list("Medical Doctor","Chief Medical Officer")
+
 /datum/gear/suit/overalls
 	display_name = "overalls"
 	path = /obj/item/clothing/suit/apron/overalls

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -4,6 +4,11 @@
 	path = /obj/item/clothing/suit/tajaran/furs
 	sort_category = "Xenowear"
 
+/datum/gear/head/zhan_scarf
+	display_name = "Zhan headscarf"
+	path = /obj/item/clothing/head/tajaran/scarf
+	whitelisted = "Tajara"
+
 /datum/gear/suit/unathi_mantle
 	display_name = "hide mantle (Unathi)"
 	path = /obj/item/clothing/suit/unathi/mantle
@@ -121,3 +126,9 @@
 	display_name = "gear harness (Full Body Prosthetic, Diona)"
 	path = /obj/item/clothing/under/harness
 	sort_category = "Xenowear"
+
+/datum/gear/shoes/footwraps
+	display_name = "cloth footwraps"
+	path = /obj/item/clothing/shoes/footwraps
+	sort_category = "Xenowear"
+	cost = 1

code/modules/clothing/clothing.dm

@@ -560,6 +560,11 @@
 		if((worn_state + "_d_s") in icon_states('icons/mob/uniform.dmi'))
 			rolled_down = 0
 
+	if(rolled_down == -1)
+		verbs -= /obj/item/clothing/under/verb/rollsuit
+	if(rolled_sleeves == -1)
+		verbs -= /obj/item/clothing/under/verb/rollsleeves
+
 /obj/item/clothing/under/proc/update_rolldown_status()
 	var/mob/living/carbon/human/H
 	if(istype(src.loc, /mob/living/carbon/human))

code/modules/clothing/gloves/miscellaneous.dm

@@ -48,14 +48,31 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
 
-/obj/item/clothing/gloves/latex
-	name = "latex gloves"
-	desc = "Sterile latex gloves."
+/obj/item/clothing/gloves/sterile
+	name = "sterile gloves"
+	desc = "Sterile gloves."
 	icon_state = "latex"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
 	siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
 	permeability_coefficient = 0.01
 	germ_level = 0
+//	var/balloonPath = /obj/item/latexballon
+
+//TODO: Make inflating gloves a thing
+/*/obj/item/clothing/gloves/sterile/proc/Inflate(/mob/living/carbon/human/user)
+	user.visible_message("<span class='notice'>\The [src] expands!</span>")
+	qdel(src)*/
+
+/obj/item/clothing/gloves/sterile/latex
+	name = "latex gloves"
+	desc = "Sterile latex gloves."
+
+/obj/item/clothing/gloves/sterile/nitrile
+	name = "nitrile gloves"
+	desc = "Sterile nitrile gloves"
+	icon_state = "nitrile"
+	item_state = "ngloves"
+//	balloonPath = /obj/item/nitrileballoon
 
 /obj/item/clothing/gloves/botanic_leather
 	desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."

code/modules/clothing/shoes/colour.dm

@@ -126,4 +126,41 @@
 /obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob)
 	..()
 	if (istype(H, /obj/item/weapon/handcuffs))
-		attach_cuffs(H, user)
+		attach_cuffs(H, user)
+
+/obj/item/clothing/shoes/hightops
+	name = "white high tops"
+	desc = "A pair of shoes that extends past the ankle. Based on a centuries-old, timeless design."
+	icon_state = "whitehi"
+
+/obj/item/clothing/shoes/hightops/red
+	name = "red high tops"
+	icon_state = "redhi"
+
+/obj/item/clothing/shoes/hightops/brown
+	name = "brown high tops"
+	icon_state = "brownhi"
+
+/obj/item/clothing/shoes/hightops/black
+	name = "black high tops"
+	icon_state = "blackhi"
+
+/obj/item/clothing/shoes/hightops/orange
+	name = "orange high tops"
+	icon_state = "orangehi"
+
+/obj/item/clothing/shoes/hightops/blue
+	name = "blue high tops"
+	icon_state = "bluehi"
+
+/obj/item/clothing/shoes/hightops/green
+	name = "green high tops"
+	icon_state = "greenhi"
+
+/obj/item/clothing/shoes/hightops/purple
+	name = "purple high tops"
+	icon_state = "purplehi"
+
+/obj/item/clothing/shoes/hightops/yellow
+	name = "yellow high tops"
+	icon_state = "yellowhi"

code/modules/clothing/shoes/miscellaneous.dm

@@ -201,3 +201,12 @@
 	desc = "A pair of wide shoes with thick soles.  Designed for skating."
 	icon_state = "skatershoe"
 	item_state_slots = list(slot_r_hand_str = "skaterheld", slot_l_hand_str = "skaterheld")
+
+/obj/item/clothing/shoes/footwraps
+	name = "cloth footwraps"
+	desc = "A roll of treated canvas used for wrapping claws or paws"
+	icon_state = "clothwrap"
+	item_state = "clothwrap"
+	force = 0
+	w_class = ITEMSIZE_SMALL
+	species_restricted = null

code/modules/clothing/suits/labcoat.dm

@@ -130,4 +130,11 @@
 	icon_state = "labcoat_emt_open"
 	icon_open = "labcoat_emt_open"
 	icon_closed = "labcoat_emt"
-	item_state_slots = list(slot_r_hand_str = "emt_labcoat", slot_l_hand_str = "emt_labcoat")
+	item_state_slots = list(slot_r_hand_str = "emt_labcoat", slot_l_hand_str = "emt_labcoat")
+
+/obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
+	name = "blue-edged labcoat"
+	desc = "A suit that protects against minor chemical spills. This one has blue trim."
+	icon_state = "blue_edge_labcoat_open"
+	icon_open = "blue_edge_labcoat_open"
+	icon_closed = "blue_edge_labcoat"

code/modules/mob/new_player/sprite_accessories.dm

@@ -61,6 +61,10 @@
 		name = "Short Hair 2"
 		icon_state = "hair_shorthair3"
 
+	twintail
+		name = "Twintail"
+		icon_state = "hair_twintail"
+
 	cut
 		name = "Cut Hair"
 		icon_state = "hair_c"

code/modules/xenoarcheaology/effect.dm

@@ -139,7 +139,7 @@
 		protected += 0.2
 
 	//latex gloves and science goggles also give a bit of bonus protection
-	if(istype(H.gloves,/obj/item/clothing/gloves/latex))
+	if(istype(H.gloves,/obj/item/clothing/gloves/sterile))
 		protected += 0.1
 
 	if(istype(H.glasses,/obj/item/clothing/glasses/science))