Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""

This reverts commit 27a099c6bf.

code/modules/vore/eating/living.dm

@@ -342,21 +342,23 @@
 		to_chat(src, "<span class='warning'>You can't do that so fast, slow down.</span>")
 		return
 
-	var/list/choices
+	DelayNextAction(CLICK_CD_MELEE, flush = TRUE)
+
+	var/list/lickable = list()
 	for(var/mob/living/L in view(1))
 		if(L != src && (!L.ckey || L.client?.prefs.vore_flags & LICKABLE) && Adjacent(L))
-			LAZYADD(choices, L)
+			LAZYADD(lickable, L)
+	for(var/mob/living/listed in lickable)
+		lickable[listed] = new /mutable_appearance(listed)
 
-	if(!choices)
+	if(!lickable)
 		return
 
-	var/mob/living/tasted = input(src, "Who would you like to lick? (Excluding yourself and those with the preference disabled)", "Licking") as null|anything in choices
+	var/mob/living/tasted = show_radial_menu(src, src, lickable, radius = 40, require_near = TRUE)
 
 	if(QDELETED(tasted) || (tasted.ckey && !(tasted.client?.prefs.vore_flags & LICKABLE)) || !Adjacent(tasted) || incapacitated(ignore_restraints = TRUE))
 		return
 
-	DelayNextAction(CLICK_CD_MELEE)
-
 	visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")
 
 /mob/living/proc/get_taste_message(allow_generic = TRUE, datum/species/mrace)

code/modules/vore/eating/vorepanel.dm

@@ -661,7 +661,7 @@
 	if(href_list["saveprefs"])
 		if(!(user.client?.prefs))
 			return FALSE
-		if(!user.client.prefs.save_character())
+		if(!user.copy_to_prefs_vr() || !user.client.prefs.save_character())
 			to_chat(user, "<span class='warning'>Belly Preferences not saved!</span>")
 			log_admin("Could not save vore prefs on USER: [user].")
 		else