Swaps adjust_mob_overlay() for apply_additional_mob_overlays() where …

…appropriate.

code/game/objects/item_mob_overlay.dm

@@ -145,25 +145,27 @@ var/global/list/icon_state_cache = list()
 	if(!draw_on_mob_when_equipped && !(slot in global.all_hand_slots))
 		return overlay
 
-	var/decl/bodytype/root_bodytype = user_mob?.get_bodytype()
-	if(root_bodytype && root_bodytype.bodytype_category != bodytype)
-		var/list/overlays_to_offset = overlay.overlays
-		overlay = root_bodytype.get_offset_overlay_image(user_mob, overlay.icon, overlay.icon_state, color, (bodypart || slot))
-		for(var/thing in overlays_to_offset)
-			var/image/I = thing // Technically an appearance but don't think we can cast to those
-			var/image/adjusted_overlay = root_bodytype.get_offset_overlay_image(user_mob, I.icon, I.icon_state, I.color, (bodypart || slot))
-			adjusted_overlay.appearance_flags = I.appearance_flags
-			adjusted_overlay.plane =            I.plane
-			adjusted_overlay.layer =            I.layer
-			overlay.overlays += adjusted_overlay
-
 	if(overlay)
+
 		if(is_held_twohanded())
 			var/wielded_state = "[overlay.icon_state]-wielded"
 			if(check_state_in_icon(wielded_state, overlay.icon))
 				overlay.icon_state = wielded_state
 		apply_additional_mob_overlays(user_mob, bodytype, overlay, slot, bodypart, use_fallback_if_icon_missing)
 
+		var/decl/bodytype/root_bodytype = user_mob?.get_bodytype()
+		if(root_bodytype && root_bodytype.bodytype_category != bodytype)
+			var/list/overlays_to_offset = overlay.overlays
+			overlay = root_bodytype.get_offset_overlay_image(user_mob, overlay.icon, overlay.icon_state, color, (bodypart || slot))
+			if(overlay)
+				for(var/thing in overlays_to_offset)
+					var/image/I = thing // Technically an appearance but don't think we can cast to those
+					var/image/adjusted_overlay = root_bodytype.get_offset_overlay_image(user_mob, I.icon, I.icon_state, I.color, (bodypart || slot))
+					adjusted_overlay.appearance_flags = I.appearance_flags
+					adjusted_overlay.plane =            I.plane
+					adjusted_overlay.layer =            I.layer
+					overlay.overlays += adjusted_overlay
+
 	return overlay
 
 /obj/item/proc/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)

code/game/objects/items/blades/_blade.dm

@@ -112,7 +112,7 @@
 			add_overlay(I)
 	update_held_icon()
 
-// We handle this in the post-proc so wielding status is updated for polearms/broadswords/etc/
+// We handle this in the post-proc so wielding status is updated for polearms/broadswords/etc
 /obj/item/bladed/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(istype(hilt_material))

code/game/objects/items/devices/paint_sprayer.dm

@@ -86,7 +86,7 @@
 		var/mob/M = loc
 		M.update_inhand_overlays()
 
-/obj/item/paint_sprayer/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/paint_sprayer/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && check_state_in_icon("[overlay.icon_state]_color", overlay.icon))
 		overlay.overlays += overlay_image(overlay.icon, "[overlay.icon_state]_color", spray_color)
 	. = ..()

code/game/objects/items/flame/flame_fuelled_lantern.dm

@@ -32,7 +32,7 @@
 	if(lit)
 		add_overlay(overlay_image(icon, "[icon_state]-over", lit_light_color, flags = RESET_COLOR))
 
-/obj/item/flame/fuelled/lantern/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE, skip_offset = FALSE)
+/obj/item/flame/fuelled/lantern/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && lit && (slot == slot_belt_str || (slot in global.all_hand_slots)))
 		overlay.overlays += overlay_image(overlay.icon, "[overlay.icon_state]-over", lit_light_color, flags = RESET_COLOR)
 	return ..()

code/game/objects/items/flame/flame_torch.dm

@@ -58,7 +58,7 @@
 		desc = "A torch. This one has seen better days."
 		update_icon()
 
-/obj/item/flame/torch/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE, skip_offset = FALSE)
+/obj/item/flame/torch/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(head_material)
 			var/decl/material/head_mat = GET_DECL(head_material)

code/game/objects/items/flashlights/_flashlight.dm

@@ -175,7 +175,7 @@
 
 	//if someone wants to implement inspecting robot eyes here would be the place to do it.
 
-/obj/item/flashlight/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/flashlight/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && on)
 		var/icon_state_on = "[overlay.icon_state]-on"
 		if(check_state_in_icon(icon_state_on, overlay.icon))

code/game/objects/items/umbrella.dm

@@ -43,7 +43,7 @@
 	I.appearance_flags |= RESET_COLOR
 	add_overlay(I)
 
-/obj/item/umbrella/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/umbrella/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(is_open && check_state_in_icon("[overlay.icon_state]-open", overlay.icon))
 			overlay.icon_state = "[overlay.icon_state]-open"

code/game/objects/items/weapons/broom.dm

@@ -26,7 +26,7 @@
 			var/decl/material/bristle_mat = GET_DECL(bristle_material)
 			add_overlay(overlay_image(icon, bristle_state, bristle_mat.color, RESET_COLOR))
 
-/obj/item/staff/broom/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing)
+/obj/item/staff/broom/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && bristle_material)
 		var/bristle_state = "[overlay.icon_state]-bristles"
 		if(check_state_in_icon(bristle_state, overlay.icon))

code/game/objects/items/weapons/cards_ids.dm

@@ -186,7 +186,7 @@ var/global/const/NO_EMAG_ACT = -50
 	. = ..()
 	update_icon()
 
-/obj/item/card/id/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/card/id/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && detail_color)
 		overlay.overlays += overlay_image(overlay.icon, "[overlay.icon_state]-colors", detail_color, RESET_COLOR)
 	. = ..()

code/game/objects/items/weapons/melee/energy.dm

@@ -166,7 +166,7 @@
 			add_overlay(emissive_overlay(icon, "[icon_state]-extended"))
 			z_flags |= ZMM_MANGLE_PLANES
 
-/obj/item/energy_blade/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/energy_blade/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && active && check_state_in_icon("[overlay.icon_state]-extended", overlay.icon))
 		overlay.overlays += emissive_overlay(overlay.icon, "[overlay.icon_state]-extended")
 	. = ..()

code/game/objects/items/weapons/melee/energy_sword.dm

@@ -43,7 +43,7 @@
 		I.color = blade_color
 		add_overlay(I)
 
-/obj/item/energy_blade/sword/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/energy_blade/sword/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && active && check_state_in_icon("[overlay.icon_state]-extended-glow", overlay.icon))
 		overlay.overlays += emissive_overlay(overlay.icon, "[overlay.icon_state]-extended-glow", color = blade_color)
 	return ..()

code/game/objects/items/weapons/staff.dm

@@ -54,7 +54,7 @@
 	. = ..()
 	update_icon()
 
-/obj/item/staff/crystal/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing)
+/obj/item/staff/crystal/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		var/crystal_state = "[overlay.icon_state]-crystal"
 		if(check_state_in_icon(crystal_state, overlay.icon))

code/modules/clothing/_clothing.dm

@@ -167,30 +167,37 @@
 		if(check_state_in_icon(new_state, overlay.icon))
 			overlay.icon_state = new_state
 
-	// Apply any marking overlays that we have defined.
-	if(markings_state_modifier && markings_color)
-		new_state = JOINTEXT(list(overlay.icon_state, markings_state_modifier))
-		if(check_state_in_icon(new_state, overlay.icon))
-			overlay.overlays += mutable_appearance(overlay.icon, new_state, markings_color)
-
-	// Apply a bloodied effect if the mob has been besmirched.
-	// Don't do this for inhands as the overlay is generally not slot based.
-	// TODO: make this slot based and masked to the onmob overlay?
-	if(!(slot in user_mob?.get_held_item_slots()) && blood_DNA && blood_overlay_type)
-		var/mob_blood_overlay = user_mob?.get_bodytype()?.get_blood_overlays(user_mob)
-		if(mob_blood_overlay)
-			var/image/bloodsies = overlay_image(mob_blood_overlay, blood_overlay_type, blood_color, RESET_COLOR)
-			bloodsies.appearance_flags |= NO_CLIENT_COLOR
-			overlay.overlays += bloodsies
-
 	// We apply accessory overlays after calling parent so accessories are not offset twice.
 	overlay = ..()
 	if(overlay && length(accessories))
 		for(var/obj/item/clothing/accessory in accessories)
 			if(accessory.should_overlay())
 				overlay.overlays += accessory.get_mob_overlay(user_mob, slot, bodypart)
+
 	return overlay
 
+/obj/item/clothing/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+
+	if(overlay)
+
+		// Apply any marking overlays that we have defined.
+		if(markings_state_modifier && markings_color)
+			var/new_state = JOINTEXT(list(overlay.icon_state, markings_state_modifier))
+			if(check_state_in_icon(new_state, overlay.icon))
+				overlay.overlays += mutable_appearance(overlay.icon, new_state, markings_color)
+
+		// Apply a bloodied effect if the mob has been besmirched.
+		// Don't do this for inhands as the overlay is generally not slot based.
+		// TODO: make this slot based and masked to the onmob overlay?
+		if(!(slot in user_mob?.get_held_item_slots()) && blood_DNA && blood_overlay_type)
+			var/mob_blood_overlay = user_mob?.get_bodytype()?.get_blood_overlays(user_mob)
+			if(mob_blood_overlay)
+				var/image/bloodsies = overlay_image(mob_blood_overlay, blood_overlay_type, blood_color, RESET_COLOR)
+				bloodsies.appearance_flags |= NO_CLIENT_COLOR
+				overlay.overlays += bloodsies
+
+	. = ..()
+
 /obj/item/clothing/set_dir(ndir)
 	// Avoid rendering the profile or back sides of the mob overlay we used when accessories are rendered.
 	if(length(accessories))

code/modules/clothing/glasses/eyepatch.dm

@@ -65,7 +65,7 @@
 		eye.color = eye_color
 		add_overlay(eye)
 
-/obj/item/clothing/glasses/eyepatch/hud/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/glasses/eyepatch/hud/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && active && check_state_in_icon("[overlay.icon_state]-eye", overlay.icon))
 		var/image/eye = emissive_overlay(overlay.icon, "[overlay.icon_state]-eye")
 		eye.color = eye_color

code/modules/clothing/gloves/thick.dm

@@ -42,7 +42,7 @@
 	. = ..()
 	add_overlay(overlay_image(icon, "[icon_state]-botany_fingertips", flags = RESET_COLOR))
 
-/obj/item/clothing/gloves/thick/botany/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/gloves/thick/botany/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && slot == slot_gloves_str)
 		var/image/I = image(overlay.icon, "[overlay.icon_state]-botany_fingertips")
 		I.appearance_flags |= RESET_COLOR

code/modules/clothing/head/_head.dm

@@ -47,7 +47,7 @@
 			light_overlay.appearance_flags |= RESET_COLOR
 			add_overlay(light_overlay)
 
-/obj/item/clothing/head/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/head/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && on && check_state_in_icon("[overlay.icon_state]_light", overlay.icon))
 		var/light_overlay
 		if(user_mob?.get_bodytype_category() != bodytype)

code/modules/clothing/head/misc_special.dm

@@ -225,7 +225,7 @@
 	if(overlay && check_state_in_icon("[overlay.icon_state]-flame", overlay.icon))
 		return emissive_overlay(overlay.icon, "[overlay.icon_state]-flame")
 
-/obj/item/clothing/head/cakehat/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/head/cakehat/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && is_on_fire)
 		var/image/I = get_mob_flame_overlay(overlay, bodytype)
 		if(I)

code/modules/clothing/masks/monitor.dm

@@ -47,7 +47,7 @@
 	. = ..()
 	update_icon()
 
-/obj/item/clothing/mask/monitor/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/mask/monitor/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(!(monitor_state_index in monitor_states))
 			monitor_state_index = initial(monitor_state_index)

code/modules/clothing/shoes/_shoes.dm

@@ -179,7 +179,7 @@
 		S.blend_mode = BLEND_ADD
 		add_overlay(S)
 
-/obj/item/clothing/shoes/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/shoes/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && shine > 0 && slot == slot_shoes_str)
 		var/mutable_appearance/S = mutable_appearance(overlay.icon, "shine")
 		S.alpha = 127 * shine / 100

code/modules/clothing/spacesuits/rig/rig.dm

@@ -585,7 +585,7 @@
 		for(var/slot in update_rig_slots)
 			wearer.update_equipment_overlay(slot)
 
-/obj/item/rig/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/rig/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && slot == slot_back_str && !offline && equipment_overlay_icon && LAZYLEN(installed_modules))
 		for(var/obj/item/rig_module/module in installed_modules)
 			if(module.suit_overlay)

code/modules/clothing/spacesuits/void/void.dm

@@ -281,6 +281,7 @@ else if(##equipment_var) {\
 	return TRUE
 
 /obj/item/clothing/suit/space/void/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+	overlay = ..() // Apply tank last so it doesn't get offset twice.
 	if(overlay && tank && slot == slot_back_str)
 		overlay.overlays += tank.get_mob_overlay(user_mob, slot_back_str)
-	. = ..()
+	return overlay

code/modules/clothing/suits/armor/forged/_forged.dm

@@ -49,7 +49,7 @@
 	if(detail_material)
 		add_overlay(overlay_image(icon, "[icon_state]-detail", detail_material.color, RESET_COLOR))
 
-/obj/item/clothing/suit/armor/forged/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/suit/armor/forged/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(strap_material)
 			overlay.overlays += overlay_image(overlay.icon, "[overlay.icon_state]-straps", strap_material.color, RESET_COLOR)

code/modules/clothing/suits/miscellaneous.dm

@@ -173,7 +173,7 @@
 			shine = material.reflectiveness
 		desc = "A long, thick [material.use_name] coat."
 
-/obj/item/clothing/suit/leathercoat/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/suit/leathercoat/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && shine > 0 && slot == slot_wear_suit_str)
 		var/mutable_appearance/S = mutable_appearance(overlay.icon, "shine")
 		S.alpha = max(shine, artificial_shine)/100 * 255

code/modules/fishing/fishing_rod.dm

@@ -152,7 +152,7 @@
 		if(bait)
 			to_chat(user, "\The [src] has been baited with \a [bait].")
 
-/obj/item/fishing_rod/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/fishing_rod/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(line)
 			overlay.overlays += overlay_image(overlay.icon, "[overlay.icon_state]-line", line.color, RESET_COLOR | RESET_ALPHA)

code/modules/projectiles/guns/energy.dm

@@ -114,7 +114,7 @@ var/global/list/registered_cyborg_weapons = list()
 	if(charge_meter)
 		update_charge_meter()
 
-/obj/item/gun/energy/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/gun/energy/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && charge_meter)
 		var/charge_state = get_charge_state(overlay.icon_state)
 		if(charge_state && check_state_in_icon(charge_state, overlay.icon))

code/modules/projectiles/guns/launcher/bows/_bow.dm

@@ -157,7 +157,7 @@
 		if(check_state_in_icon(string_state, icon))
 			add_overlay(overlay_image(icon, string_state, string.color, RESET_COLOR))
 
-/obj/item/gun/launcher/bow/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/gun/launcher/bow/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		if(string)
 			var/string_state = "[overlay.icon_state]-string"

code/modules/reagents/reagent_containers/food/sliceable/pizza/pizza_box.dm

@@ -31,7 +31,7 @@
 	events_repository.unregister(/decl/observ/moved, src, src)
 	return ..()
 
-/obj/item/pizzabox/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/pizzabox/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && length(stacked_boxes))
 		var/i = 1
 		for(var/obj/item/pizzabox/box in stacked_boxes)

mods/content/corporate/items/wristcomp.dm

@@ -8,7 +8,7 @@
 	color = COLOR_GUNMETAL
 	light_color = LIGHT_COLOR_GREEN
 
-/obj/item/modular_computer/pda/wrist/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/modular_computer/pda/wrist/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		var/datum/extension/interactive/os/os = get_extension(src, /datum/extension/interactive/os)
 		var/datum/extension/assembly/modular_computer/assembly = get_extension(src, /datum/extension/assembly)

mods/species/vox/gear/gear_head.dm

@@ -28,7 +28,7 @@
 	color = "#486e6e"
 	var/lights_color = "#00ffff"
 
-/obj/item/clothing/head/helmet/space/vox/carapace/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/head/helmet/space/vox/carapace/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && lights_color && check_state_in_icon("[overlay.icon_state]-lights", overlay.icon))
 		var/image/I = emissive_overlay(overlay.icon, "[overlay.icon_state]-lights")
 		I.color = lights_color

mods/species/vox/gear/gear_suit.dm

@@ -43,7 +43,7 @@
 	desc = "An armoured, segmented carapace with glowing purple lights. It looks pretty run-down."
 	var/lights_color = "#00ffff"
 
-/obj/item/clothing/suit/space/vox/carapace/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
+/obj/item/clothing/suit/space/vox/carapace/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay && lights_color && check_state_in_icon("[overlay.icon_state]-lights", overlay.icon))
 		var/image/I = emissive_overlay(overlay.icon, "[overlay.icon_state]-lights")
 		I.color = lights_color