Fixing conflicts

code/modules/organs/internal/lungs_ch.dm

@@ -0,0 +1,4 @@
+//TFF backport 31/12/19 - Erik's Lungs return to haunt us all!
+/obj/item/organ/internal/lungs/erikLungs
+	name = "Erik's lungs"
+	desc = "These lungs supposedly belonged to someone named 'Erik', he loses them so often they've been displayed here for whenever they might be needed."

code/modules/organs/organ_external.dm

@@ -855,6 +855,8 @@ Note that amputating the affected organ does in fact remove the infection from t
 	else if(disintegrate == DROPLIMB_EDGE && nonsolid) //VOREStation Add End
 		disintegrate = DROPLIMB_BLUNT //splut
 
+	GLOB.lost_limbs_shift_roundstat++
+
 	switch(disintegrate)
 		if(DROPLIMB_EDGE)
 			if(!clean)

code/modules/organs/robolimbs_ch.dm

@@ -0,0 +1,6 @@
+/datum/robolimb/valehoundhead
+	company = "VALE Hound- Head"
+	desc = "A VALE hound head meant for synthetics."
+	icon = 'icons/mob/human_races/cyberlimbs/vale/vale_head.dmi' //Sprited by: Skits
+	skin_tone = 1
+	parts = list(BP_HEAD)

code/modules/organs/robolimbs_yw.dm

@@ -0,0 +1,66 @@
+/datum/robolimb/eioni
+	company = "Eio'ni Co."
+	desc = "Eio'ni's brand prosthetic limbs."
+	icon = 'icons/mob/human_races/cyberlimbs/eioni/eioni_main.dmi' //Sprited by: Unleashed Mana
+
+/datum/robolimb/eioni_alt1
+	company = "Eio'ni Co. - Heads"
+	desc = "Eio'ni's brand heads with mounted display."
+	icon = 'icons/mob/human_races/cyberlimbs/eioni/eioni_alt1.dmi' //Sprited by: Unleashed Mana
+	parts = list(BP_HEAD)
+	monitor_styles = standard_monitor_styles
+
+/datum/robolimb/s_Ind
+	company = "S.Ind"
+	desc = "S.Ind brand prosthetic limbs."
+	icon = 'icons/mob/human_races/cyberlimbs/S.Ind/sind_main.dmi' //Sprited by: Generalpantsu
+
+/datum/robolimb/Hperformance
+	company = "Hperformance."
+	desc = "Hperformance brand prosthetic limbs."
+	icon = 'icons/mob/human_races/cyberlimbs/Hperformance/hperformance_main.dmi' //Sprited by: Generalpantsu
+
+/datum/robolimb/xionalt
+	company = "Xion (alt yw)."
+	desc = "Xion brand prosthetic limbs."
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt5.dmi' //Sprited by: Whiteout
+
+/datum/robolimb/aphrodite_cyberdoe
+	company = "Aphrodite - Cyberdoe"
+	desc = "This limb feels soft and fluffy, realistic in design and squish. By Aphrodite Ltd."
+	icon = 'icons/mob/human_races/cyberlimbs/aphrodite/andy_taj.dmi'
+	blood_color = "#ffe2ff"
+	lifelike = 1
+	unavailable_to_build = 1
+	includes_tail = 0
+	suggested_species = "Tajara"
+	whitelisted_to = list("dameonowen")
+
+/datum/robolimb/aphrodite_cyberdragon
+	company = "Aphrodite - Cyberdragon"
+	desc = "This limb feels smooth and scalie, realistic in design and squish. By Aphrodite Ltd."
+	icon = 'icons/mob/human_races/cyberlimbs/aphrodite/andy_liz.dmi'
+	blood_color = "#ffe2ff"
+	lifelike = 1
+	unavailable_to_build = 1
+	includes_tail = 0
+	suggested_species = "Unathi"
+	whitelisted_to = list("dameonowen")
+
+/datum/robolimb/dopiotl_jeanne
+	company = "Jeanne - Nanovulp"
+	desc = ""
+	icon = 'icons/mob/human_races/cyberlimbs/dopiotl/jeanne_nanovulp.dmi'
+	monitor_icon = 'icons/mob/human_races/cyberlimbs/dopiotl/nanovulp_animations.dmi'
+	lifelike = 1
+	unavailable_to_build = 1
+	includes_tail = 0
+	suggested_species = "Vuplkanin"
+	whitelisted_to = list("dopiotl")
+	monitor_styles = "idle=idle;\
+		idle-eye=eyeidle;\
+		emptyinput=emptyinput;\
+		rainbow=rainbow;\
+		snow=snow;\
+		robocop=robocop;\
+		rainbowcop=rainbowcop"

code/modules/organs/subtypes/standard_vr.dm

@@ -69,3 +69,9 @@
 
 	eye_icons_vr = 'icons/mob/human_face_vr.dmi'
 	eye_icon_vr = "eyes_shadekin"
+
+	//yw edit
+/obj/item/organ/external/head/vr/grey
+	eye_icons_vr = 'icons/mob/human_face_yw.dmi'
+	eye_icon_vr = "eyes_grey"
+	//yw edit