Merge remote-tracking branch 'upstream/master' into kk-rings

code/modules/vore/eating/vorepanel_vr.dm

@@ -415,7 +415,9 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			host.vore_selected = NB
 			unsaved_changes = TRUE
 			return TRUE
-
+		if("importpanel")
+			import_belly(host)
+			return TRUE
 		if("bellypick")
 			host.vore_selected = locate(params["bellypick"])
 			return TRUE

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -668,7 +668,9 @@
 
 /obj/item/clothing/head/fluff/avida/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
 	if(..())
-		if(H.ear_style && (H.ear_style.name == "Bnnuy Ears" || H.ear_style.name == "Bnnuy Ears 2")) //check if wearer's ear sprite is compatible with trimmed icon
+		var/static/list/allowed_ear_names = list("Bnnuy Ears", "Bnnuy Ears 2")
+		//check if wearer's ear sprite is compatible with trimmed icon
+		if((H.ear_style?.name in allowed_ear_names) || (H.ear_secondary_style?.name in allowed_ear_names))
 			item_state = initial(src.item_state)
 		else //if not, just use a generic icon
 			item_state = "avidahatnoears"

code/modules/vore/persist/persist_vr.dm

@@ -146,6 +146,11 @@
 	prefs.r_ears3			= character.r_ears3
 	prefs.g_ears3			= character.g_ears3
 	prefs.b_ears3			= character.b_ears3
+
+	// secondary ears
+	prefs.ear_secondary_style = character.ear_secondary_style?.name
+	prefs.ear_secondary_colors = character.ear_secondary_colors
+
 	prefs.r_tail			= character.r_tail
 	prefs.b_tail			= character.b_tail
 	prefs.g_tail			= character.g_tail