contnuing on with that

code/game/atoms.dm

@@ -443,6 +443,7 @@
 
 	. = NONE
 	updates &= ~SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON, updates)
+
 	if(updates & UPDATE_ICON_STATE)
 		update_icon_state()
 		. |= UPDATE_ICON_STATE

code/game/turfs/simulated.dm

@@ -25,10 +25,14 @@
 	var/edge_icon_state
 
 /turf/simulated/Initialize(mapload)
+	PROFILE_SET
 	. = ..()
+	PROFILE_TICK
 	levelupdate()
+	PROFILE_TICK
 	// HOOK FOR MOB/FREELOOK SYSTEM
 	updateVisibility(src)
+	PROFILE_TICK
 
 // This is not great.
 /turf/simulated/proc/wet_floor(var/wet_val = 1)

code/game/turfs/simulated/floor.dm

@@ -78,21 +78,27 @@
 			make_indoors()
 
 /turf/simulated/floor/proc/set_flooring(decl/flooring/newflooring, mapload)
+	PROFILE_SET
 	make_plating(null, TRUE, TRUE)
+	PROFILE_TICK
 	flooring = newflooring
 	footstep_sounds = newflooring.footstep_sounds
+	PROFILE_TICK
 	// VOREStation Edit - We are plating switching to flooring, swap out old_decals for decals
 	var/list/overfloor_decals = old_decals
 	old_decals = decals
 	decals = overfloor_decals
 	// VOREStation Edit End
+	PROFILE_TICK
 	QUEUE_SMOOTH(src)
 	QUEUE_SMOOTH_NEIGHBORS(src)
 	levelupdate()
+	PROFILE_TICK
 
 //This proc will set floor_type to null and the update_icon() proc will then change the icon_state of the turf
 //This proc auto corrects the grass tiles' siding.
 /turf/simulated/floor/proc/make_plating(place_product, defer_icon_update, strip_bare)
+	PROFILE_SET
 	if(!defer_icon_update)
 		name = base_name
 		desc = base_desc
@@ -104,6 +110,8 @@
 		QUEUE_SMOOTH_NEIGHBORS(src)
 		levelupdate()
 
+	PROFILE_TICK
+
 	if(flooring)
 		// VOREStation Edit - We are flooring switching to plating, swap out old_decals for decals.
 		var/list/underfloor_decals = old_decals
@@ -119,6 +127,8 @@
 		else
 			flooring = null
 
+	PROFILE_TICK
+
 	broken = null
 	burnt = null
 	flooring_override = null

code/game/turfs/simulated/floor_icon.dm

@@ -6,8 +6,11 @@ GLOBAL_DATUM_INIT(no_ceiling_image, /image, generate_no_ceiling_image())
 	return I
 
 /turf/simulated/floor/custom_smooth()
+	PROFILE_SET
 	update_icon()
+	PROFILE_TICK
 	update_border_spillover()
+	PROFILE_TICK
 
 /turf/simulated/floor/calculate_adjacencies()
 	return NONE
@@ -96,6 +99,8 @@ var/list/flooring_cache = list()
 	if(LAZYLEN(decals))
 		add_overlay(decals)
 
+	PROFILE_TICK
+
 	// Show 'ceilingless' overlay.
 	var/turf/above = Above(src)
 	if(isopenturf(above) && !istype(src, /turf/simulated/floor/outdoors)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways.

code/game/turfs/simulated/wall.dm

@@ -46,7 +46,7 @@
 	girder_material = get_material_by_name(girdertype)
 	if(!isnull(rmaterialtype))
 		reinf_material = get_material_by_name(rmaterialtype)
-	update_material()
+	update_material(TRUE)
 	if(material?.radioactivity || reinf_material?.radioactivity || girder_material?.radioactivity)
 		START_PROCESSING(SSturfs, src)
 
@@ -56,7 +56,6 @@
 	material = get_material_by_name("placeholder")
 	reinf_material = null
 	girder_material = null
-	QUEUE_SMOOTH_NEIGHBORS(src)
 	return ..()
 
 /turf/simulated/wall/process(delta_time)

code/game/turfs/simulated/wall_composition.dm

@@ -1,14 +1,16 @@
-/turf/simulated/wall/proc/set_material(var/datum/material/newmaterial, var/datum/material/newrmaterial, var/datum/material/newgmaterial)
+/turf/simulated/wall/proc/set_material(datum/material/newmaterial, datum/material/newrmaterial, datum/material/newgmaterial, defer_icon)
 	material = newmaterial
 	reinf_material = newrmaterial
 	if(!newgmaterial)
 		girder_material = MAT_STEEL
 	else
 		girder_material = newgmaterial
-	update_material()
-
-/turf/simulated/wall/proc/update_material()
+	if(!defer_icon)
+		QUEUE_SMOOTH(src)
+		QUEUE_SMOOTH_NEIGHBORS(src)
+	update_material(TRUE)
 
+/turf/simulated/wall/proc/update_material(defer_icon)
 	if(!material)
 		return
 
@@ -31,4 +33,5 @@
 		desc = "It seems to be a section of hull plated with [material.display_name]."
 
 	SSradiation.resistance_cache.Remove(src)
-	QUEUE_SMOOTH(src)
+	if(!defer_icon)
+		update_icon()

code/game/turfs/turf.dm

@@ -74,6 +74,7 @@
  * Doesn't call parent, see [/atom/proc/Initialize]
  */
 /turf/Initialize(mapload)
+	PROFILE_SET
 	SHOULD_CALL_PARENT(FALSE)
 	if(flags & INITIALIZED)
 		stack_trace("Warning: [src]([type]) initialized multiple times!")
@@ -82,8 +83,12 @@
 	// by default, vis_contents is inherited from the turf that was here before
 	vis_contents.Cut()
 
+	PROFILE_TICK
+
 	assemble_baseturfs()
 
+	PROFILE_TICK
+
 	//atom color stuff
 	if(color)
 		add_atom_colour(color, FIXED_COLOUR_PRIORITY)
@@ -93,9 +98,13 @@
 		canSmoothWith = typelist("canSmoothWith", canSmoothWith)
 */
 
+	PROFILE_TICK
+
 	for(var/atom/movable/AM in src)
 		Entered(AM)
 
+	PROFILE_TICK
+
 	var/area/A = loc
 	if(!IS_DYNAMIC_LIGHTING(src) && IS_DYNAMIC_LIGHTING(A))
 		add_overlay(/obj/effect/fullbright)
@@ -103,6 +112,8 @@
 	if (light_power && light_range)
 		update_light()
 
+	PROFILE_TICK
+
 	if (opacity)
 		has_opaque_atom = TRUE
 
@@ -110,8 +121,12 @@
 	if(movement_cost && pathweight == 1)	// This updates pathweight automatically.
 		pathweight = movement_cost
 
+	PROFILE_TICK
+
 	ComponentInitialize()
 
+	PROFILE_TICK
+
 	return INITIALIZE_HINT_NORMAL
 
 /turf/Destroy(force)

code/modules/mining/mine_turfs.dm

@@ -127,9 +127,6 @@ turf/simulated/mineral/floor/light_corner
 			MineralSpread()
 		else
 			UpdateMineral()	// this'll work because we're INITIALIZED
-	if(!mapload)
-		QUEUE_SMOOTH(src)
-		QUEUE_SMOOTH_NEIGHBORS(src)
 
 /* custom smoothing code */
 /turf/simulated/mineral/find_type_in_direction(direction)