diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm
index 55e11a4509..6f88446441 100644
--- a/code/_helpers/global_lists_vr.dm
+++ b/code/_helpers/global_lists_vr.dm
@@ -426,8 +426,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
 				SPECIES_XENO_QUEEN,
 				SPECIES_SHADOW,
 				SPECIES_GOLEM,					//Some special species that may or may not be ever used in event too,
-				SPECIES_SHADEKIN, //Shadefluffers just poof away
-				SPECIES_SHADEKIN_YW)			 //YW edits
+				SPECIES_SHADEKIN) //Shadefluffers just poof away
 
 /var/global/list/existing_solargrubs = list()
 
diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
index ba3f84483a..1c078e67a8 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
@@ -210,13 +210,13 @@
 	character_name = list("Korei Laskor")
 
 //championfire
-//Anoki Windroar
+//Yuki Windroar
 /datum/gear/fluff/anoki_implant
-	path = /obj/item/weapon/implanter/reagent_generator/roiz/anoki
+	path = /obj/item/weapon/implanter/reagent_generator/roiz/yuki
 	display_name = "Egg laying implanter"
 	description = "This is an implant that allows the user to lay eggs."
 	ckeywhitelist = list("championfire")
-	character_name = list("Anoki Windroar")
+	character_name = list("Yuki Windroar")
 
 //Ivy Kaeire
 /datum/gear/fluff/ivy_under
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
index e61baab61f..9d75d1ee11 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
@@ -8,11 +8,12 @@
 		SPECIES_SERGAL			= 'icons/mob/species/sergal/helmet_vr.dmi',
 		SPECIES_ZORREN_FLAT		= 'icons/mob/species/fennec/helmet_vr.dmi',
 		SPECIES_ZORREN_HIGH 	= 'icons/mob/species/fox/helmet_vr.dmi',
-		SPECIES_VULPKANI 		= 'icons/mob/species/vulpkanin/helmet.dmi',
+		SPECIES_VULPKANIN 		= 'icons/mob/species/vulpkanin/helmet.dmi',
 		SPECIES_PROMETHEAN		= 'icons/mob/species/skrell/helmet.dmi',
 		SPECIES_XENOHYBRID		= 'icons/mob/species/unathi/helmet.dmi',
 		SPECIES_VOX 			= 'icons/mob/species/vox/head.dmi',
-		SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi'
+		SPECIES_TESHARI         = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_GREY_YW         = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
 		)
 
 
diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm
index 4b15e28795..9bbe440400 100644
--- a/code/modules/clothing/spacesuits/void/void_vr.dm
+++ b/code/modules/clothing/spacesuits/void/void_vr.dm
@@ -18,7 +18,8 @@
 		"Highlander Zorren" 	= 'icons/mob/species/fox/helmet_vr.dmi',
 		"Vulpkanin"				= 'icons/mob/species/vulpkanin/helmet.dmi',
 		"Promethean"			= 'icons/mob/species/skrell/helmet.dmi',
-		"Xenomorph Hybrid"		= 'icons/mob/species/unathi/helmet.dmi'
+		"Xenomorph Hybrid"		= 'icons/mob/species/unathi/helmet.dmi',
+		"Grey"                  = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
 		)
 
 	sprite_sheets_obj = list(
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_yw.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_yw.dm
index fc3cf034e8..2ebe0b2d80 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_yw.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_yw.dm
@@ -42,7 +42,6 @@
 
 	has_glowing_eyes = TRUE
 
-	death_message = "phases to somewhere far away!"
 	male_cough_sounds = null
 	female_cough_sounds = null
 	male_sneeze_sound = null
@@ -86,12 +85,6 @@
 		BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
 		)
 
-/datum/species/shadekin_yw/handle_death(var/mob/living/carbon/human/H)
-	spawn(1)
-		for(var/obj/item/W in H)
-			H.drop_from_inventory(W)
-		qdel(H)
-
 /datum/species/shadekin_yw/get_bodytype()
 	return SPECIES_SHADEKIN
 
diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
index a2514a549c..4788d55af6 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -515,7 +515,7 @@ datum/species/harpy
 	heat_level_3 = 1150
 
 	flags =  NO_SCAN
-	spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE
+	spawn_flags = SPECIES_CAN_JOIN //YW Edit: Removed whitelist
 
 	reagent_tag = IS_SHADEKIN		// for shadekin-unqiue chem interactions
 
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index d942e8a529..781b6a8b9f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -781,7 +781,6 @@
 				)
 
 /obj/item/weapon/robot_module/robot/booze/New(var/mob/living/silicon/robot/R)
-	..()
 	src.modules += new /obj/item/weapon/gripper/service(src)
 	//src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src)
 	//src.modules += new /obj/item/weapon/material/minihoe(src)
diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
index e8949f54d1..17a77d2472 100644
--- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
@@ -179,7 +179,7 @@
 		/obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag,
 		/obj/item/clothing/suit/armor/pcarrier/navy/fluff/saur_pccarrier
 		)
-
+/*
 // ************
 // championfire
 // ************
@@ -191,7 +191,7 @@
 	desc = "A kit containing Anoki's equipment."
 	has_items = list(
 		/obj/item/weapon/implanter/reagent_generator/roiz/anoki)
-
+*/
 //Ivy Kaeire
 
 /obj/item/weapon/storage/box/fluff/ivy
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index 32c8215359..b461a9aead 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -213,12 +213,12 @@
 // championfire
 // ************
 
-//Anoki Windroar
+//Yuki Windroar
 
-/obj/item/weapon/implanter/reagent_generator/roiz/anoki
-	implant_type = /obj/item/weapon/implant/reagent_generator/roiz/anoki
+/obj/item/weapon/implanter/reagent_generator/roiz/yuki
+	implant_type = /obj/item/weapon/implant/reagent_generator/roiz/yuki
 
-/obj/item/weapon/implant/reagent_generator/roiz/anoki
+/obj/item/weapon/implant/reagent_generator/roiz/yuki
 	name = "egg laying implant"
 	desc = "This is an implant that allows the user to lay eggs."
 	usable_volume = 500
@@ -226,7 +226,7 @@
 
 	empty_message = list("Your lower belly feels smooth and empty. Sorry, we're out of eggs!", "The reduced pressure in your lower belly tells you there are no more eggs.")
 	full_message = list("Your lower belly looks swollen with irregular bumps, and it feels heavy.", "Your lower abdomen feels really heavy, making it a bit hard to walk.")
-	emote_descriptor = list("an egg right out of Anoki's lower belly!", "into Anoki' belly firmly, forcing him to lay an egg!", "Anoki really tight, who promptly lays an egg!")
+	emote_descriptor = list("an egg right out of Yuki's lower belly!", "into Yuki's belly firmly, forcing him to lay an egg!", "Yuki really tight, who promptly lays an egg!")
 
 // ********
 // Vitorhks
diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/species/grey/helmet.dmi
new file mode 100644
index 0000000000..2efb3a54d9
Binary files /dev/null and b/icons/mob/species/grey/helmet.dmi differ
diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/species/grey/mask.dmi
index 041cbb1267..f095387fdc 100644
Binary files a/icons/mob/species/grey/mask.dmi and b/icons/mob/species/grey/mask.dmi differ
diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi
index 74d62beb33..c41491527d 100644
Binary files a/icons/mob/species/grey/uniform.dmi and b/icons/mob/species/grey/uniform.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index cc139aa4e5..54155361c9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2464,6 +2464,7 @@
 #include "code\modules\mob\living\silicon\login.dm"
 #include "code\modules\mob\living\silicon\say.dm"
 #include "code\modules\mob\living\silicon\silicon.dm"
+#include "code\modules\mob\living\silicon\silicon_vr.dm"
 #include "code\modules\mob\living\silicon\subystems.dm"
 #include "code\modules\mob\living\silicon\ai\ai.dm"
 #include "code\modules\mob\living\silicon\ai\ai_movement.dm"