Merge branch 'master' into areaStuff

code/modules/vore/resizing/resize_vr.dm

@@ -69,7 +69,7 @@
 
 /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.flag_check(AREA_ALLOW_LARGE_SIZE)
+	return A ? A.flag_check(AREA_ALLOW_LARGE_SIZE) : FALSE
 
 /proc/is_extreme_size(size)
 	return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM)
@@ -135,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)