Merge branch 'master' into SILENCEDMP5A5_FLUFF

code/modules/vore/appearance/sprite_accessories_vr.dm

@@ -976,7 +976,8 @@
 /datum/sprite_accessory/tail/special/seromitailfeathered
 	name = "seromi tail w/ feathers"
 	desc = ""
-	icon_state = "seromitail_feathers_s"
+	icon_state = "seromitail_s"
+	extra_overlay = "seromitail_feathers_s"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1448,24 +1448,27 @@
 
 	//Destination beacon vore checking
 	var/atom/real_dest = dT
-	var/televored = FALSE //UR GONNA GET VORED
 
 	var/atom/real_loc = destination.loc
 	if(isbelly(real_loc))
 		real_dest = real_loc
-		televored = TRUE
 	if(isliving(real_loc))
 		var/mob/living/L = real_loc
 		if(L.vore_selected)
 			real_dest = L.vore_selected
-			televored = TRUE
 		else if(L.vore_organs.len)
 			real_dest = pick(L.vore_organs)
-			televored = TRUE
 
-	//Televore fluff stuff
-	if(televored)
-		to_chat(target,"<span class='warning'>\The [src] teleports you right into \a [lowertext(real_dest.name)]!</span>")
+	//Confirm televore
+	var/televored = FALSE
+	if(isbelly(real_dest))
+		var/obj/belly/B = real_dest
+		if(!target.can_be_drop_prey && B.owner != user)
+			to_chat(target,"<span class='warning'>\The [src] narrowly avoids teleporting you right into \a [lowertext(real_dest.name)]!</span>")
+			real_dest = dT //Nevermind!
+		else
+			televored = TRUE
+			to_chat(target,"<span class='warning'>\The [src] teleports you right into \a [lowertext(real_dest.name)]!</span>")
 
 	//Phase-out effect
 	phase_out(target,get_turf(target))
@@ -1496,7 +1499,7 @@
 		ready = 1
 		update_icon()
 
-	logged_events["[world.time]"] = "[user] teleported [target] to [real_dest] [televored ? "(Belly: [lowertext(real_loc.name)])" : null]"
+	logged_events["[world.time]"] = "[user] teleported [target] to [real_dest] [televored ? "(Belly: [lowertext(real_dest.name)])" : null]"
 
 /obj/item/device/perfect_tele/proc/phase_out(var/mob/M,var/turf/T)
 

code/modules/vore/resizing/resize_vr.dm

@@ -64,7 +64,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 /mob/living/proc/resize(var/new_size, var/animate = TRUE)
 	if(size_multiplier == new_size)
 		return 1
-	
+
 	size_multiplier = new_size //Change size_multiplier so that other items can interact with them
 	if(animate)
 		var/change = new_size - size_multiplier