Merge branch 'master' of https://github.com/Repede/YawnWiderStation

code/modules/vore/fluffstuff/custom_boxes_yw.dm

@@ -256,6 +256,23 @@
 	has_items = list(
 		/obj/item/weapon/fluff/chemset)
 
+//Mitsuko Jiao
+
+/obj/item/weapon/storage/box/fluff/jiao
+	name = "Mitsuko's kit"
+	desc = "A kit containing Mituko's equipment"
+	has_items = list(
+		/obj/item/clothing/suit/storage/toggle/labcoat/fluff/jiao_labcoat,
+		/obj/item/clothing/glasses/hud/health/aviator/fluff/jiao_glasses,
+		/obj/item/clothing/under/rank/medical/fluff/jiao_uniform,
+		/obj/item/clothing/head/beret/fluff/jiao_beret,
+		/obj/item/clothing/shoes/boots/jackboots/fluff/jiao_boots,
+		/obj/item/weapon/storage/belt/medical/fluff/jiao_belt,
+		/obj/item/clothing/gloves/sterile/fluff/jiao_gloves,
+		/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a,
+		/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b,
+		/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c)
+
 // ************
 // RadiantFlash
 // ************

code/modules/vore/fluffstuff/custom_clothes_yw.dm

@@ -890,6 +890,66 @@
 	slot_flags = SLOT_TIE | SLOT_OCLOTHING
 	w_class = 2
 
+//Mitsuko Jiao
+
+/obj/item/clothing/suit/storage/toggle/labcoat/fluff/jiao_labcoat
+	name = "Fluffy elongated labcoat"
+	desc = "A white labcoat that seems to have been extended down to cover the legs as well, around the cuffs and bottom is a lay of fluff."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_labcoat"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+
+/obj/item/clothing/glasses/hud/health/aviator/fluff/jiao_glasses
+	name = "Mitsuko's AR glasses"
+	desc = "A set of metal frame glasses that seem to be modified to fit easier on a elongated snout. On the glasses is a set of low perspiration lenses with a thin overlay for medical hub to be turned on."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_glasses"
+	off_state = "jiao_glasses_off"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+	override = 1
+	item_state = "jiao_glasses"
+	species_restricted = list("Akula")
+
+/obj/item/clothing/under/rank/medical/fluff/jiao_uniform
+	name = "A Kanghu Navy Force medical doctor uniform"
+	desc = "A slandered issue Kanghu Navy Force medical doctor uniform, it has a a white base with blue ocean camo overlaying the shoulders, waist, and back, with deep blue accents, and light blue highlights. The uniform is loose fitting, and has a set of buttons running up the middle to take it on and off. This one seems to have the shoulder straps vacant of any epaulettes."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_uniform"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+	item_state = "jiao_uniform"
+	rolled_sleeves = -1
+
+/obj/item/clothing/head/beret/fluff/jiao_beret
+	name = "A Kanghu Navy Beret"
+	desc = "This camo beret has a white flash signifying the person as medical personnel, however, there is no rank or insignia on the flash, and it is left blank."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_beret"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+
+/obj/item/clothing/shoes/boots/jackboots/fluff/jiao_boots
+	name = "Modified Navy Boots"
+	desc = "This is a set of boots from the Kanghu navy, as denoted by the seal in the sole of the boot, that has been modified to fit not human feet."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_boots"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+
+/obj/item/weapon/storage/belt/medical/fluff/jiao_belt
+	name = "Navy medical belt"
+	desc = "A customized medical belt to sport the navy colors of the Kanghu force."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_belt"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+
+/obj/item/clothing/gloves/sterile/fluff/jiao_gloves
+	name = "Padded Sterile Gloves"
+	desc = "These light gray latex gloves have a blue, thick pad on the back of the hand, and on the back of the fingers, designed to survive all the life toughest that a field medic would face."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "jiao_gloves"
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+	force = 2
+	punch_force = 2
+
+
 // ************
 // RadiantFlash
 // ************
@@ -1050,4 +1110,4 @@
 	desc = "A sweater with a skirt attached to it. Under the skirt is a set of shorts that cling to the body, showing a bulge very well if there is one."
 	icon = 'icons/vore/custom_clothes_yw.dmi'
 	icon_state = "noel_uniform"
-	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+	icon_override = 'icons/vore/custom_onmob_yw.dmi'

code/modules/vore/fluffstuff/custom_items_yw.dm

@@ -248,6 +248,56 @@
 	icon = 'icons/vore/custom_items_yw.dmi'
 	icon_state = "chemset"
 
+//Mitsuko Jiao
+
+/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a
+	name = "Mitsuko's modkit Mk1"
+	desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/device/healthanalyzer
+	to_suit = /obj/item/device/healthanalyzer/fluff/jiao_health
+
+/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b
+	name = "Mitsuko's modkit Mk2"
+	desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/device/healthanalyzer/improved
+	to_suit = /obj/item/device/healthanalyzer/improved/fluff/jiao_health
+
+/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c
+	name = "Mitsuko's modkit Mk3"
+	desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/device/healthanalyzer/advanced
+	to_suit = /obj/item/device/healthanalyzer/advanced/fluff/jiao_health
+
+/obj/item/device/healthanalyzer/fluff/jiao_health
+	name = "Kanghu medical scanner MK1"
+	desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is a basic unit."
+	icon = 'icons/vore/custom_items_yw.dmi'
+	icon_state = "scanner_mk1"
+
+/obj/item/device/healthanalyzer/improved/fluff/jiao_health
+	name = "Kanghu medical scanner MK2"
+	desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is a improved unit."
+	icon = 'icons/vore/custom_items_yw.dmi'
+	icon_state = "scanner_mk2"
+
+/obj/item/device/healthanalyzer/advanced/fluff/jiao_health
+	name = "Kanghu medical scanner MK3"
+	desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is a advanced unit."
+	icon = 'icons/vore/custom_items_yw.dmi'
+	icon_state = "scanner_mk3"
+
 // **************
 // VanesaFancyFin
 // **************
@@ -265,12 +315,12 @@
 		slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi',
 		slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi',
 		)
-		
+
 // **************
 // Belsima
 // **************
 
-//I'm going to fix this code later. 
+//I'm going to fix this code later.
 
 /obj/item/weapon/implant/reagent_generator/belle/ysaline
 	name = "lactation implant"

config/custom_items.txt

@@ -268,6 +268,13 @@ ckey: lukevale
 character_name: Eryn Wolfe
 item_path: /obj/item/weapon/storage/box/fluff/eryn
 }
+
+{
+ckey: lukevale
+character_name: Mitsuko Jiao
+item_path: /obj/item/weapon/storage/box/fluff/jiao
+}
+
 # ######## M CKEYS
 {
 ckey: maxiefoxie