Merge branch 'master' into reagentToDefines

code/modules/vore/eating/vorepanel_vr.dm

@@ -891,6 +891,9 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			if(!istype(H))
 				return
 
+			if(!H.allow_spontaneous_tf)
+				return
+
 			var/datum/tgui_module/appearance_changer/vore/V = new(host, H)
 			V.tgui_interact(user)
 			return TRUE

code/modules/vore/resizing/resize_vr.dm

@@ -62,13 +62,14 @@
 
 /atom/movable/proc/size_range_check(size_select)		//both objects and mobs needs to have that
 	var/area/A = get_area(src) //Get the atom's area to check for size limit.
-	if((A?.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1))
+	size_select = size_select / 100
+	if((!A?.flag_check(AREA_ALLOW_LARGE_SIZE) && (size_select > RESIZE_MAXIMUM || size_select < RESIZE_MINIMUM)) || (size_select > RESIZE_MAXIMUM_DORMS || size_select < RESIZE_MINIMUM_DORMS))
 		return FALSE
 	return TRUE
 
 /atom/movable/proc/has_large_resize_bounds()
 	var/area/A = get_area(src) //Get the atom's area to check for size limit.
-	return !A.limit_mob_size
+	return A ? A.flag_check(AREA_ALLOW_LARGE_SIZE) : FALSE
 
 /proc/is_extreme_size(size)
 	return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM)
@@ -134,6 +135,9 @@
 	if(!resizable && !ignore_prefs)
 		return 1
 	. = ..()
+	if(!ishuman(temporary_form) && isliving(temporary_form))
+		var/mob/living/temp_form = temporary_form
+		temp_form.resize(new_size, animate, uncapped, ignore_prefs, aura_animation)
 	if(LAZYLEN(hud_list) && has_huds)
 		var/new_y_offset = vis_height * (size_multiplier - 1)
 		for(var/index = 1 to hud_list.len)