Merge branch 'master' into upstream-merge-14220

code/modules/client/preference_setup/general/03_body.dm

@@ -405,14 +405,17 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		var/obj/item/organ/external/O = character.organs_by_name[N]
 		O.markings.Cut()
 
+	var/priority = 0
 	for(var/M in pref.body_markings)
+		priority += 1
 		var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M]
 		var/mark_color = "[pref.body_markings[M]]"
 
 		for(var/BP in mark_datum.body_parts)
 			var/obj/item/organ/external/O = character.organs_by_name[BP]
 			if(O)
-				O.markings[M] = list("color" = mark_color, "datum" = mark_datum)
+				O.markings[M] = list("color" = mark_color, "datum" = mark_datum, "priority" = priority)
+	character.markings_len = priority
 
 	var/list/last_descriptors = list()
 	if(islist(pref.body_descriptors))

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -126,6 +126,14 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/head/halo
+	display_name = "halo (colorable)"
+	path = /obj/item/clothing/head/halo
+
+/datum/gear/head/halo/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/head/cap/mbill
 	display_name = "cap, major bill's"
 	path = /obj/item/clothing/head/soft/mbill
@@ -436,4 +444,4 @@
 
 /datum/gear/head/wheat
 	display_name = "straw hat"
-	path = /obj/item/clothing/head/wheat
+	path = /obj/item/clothing/head/wheat

code/modules/client/preference_setup/loadout/loadout_suit_vr.dm

@@ -137,6 +137,7 @@ Talon winter coat
 	path = /obj/item/clothing/suit/storage/hooded/hoodie
 
 /datum/gear/suit/hoodie_vr/New()
+	..()
 	var/list/hoodies = list()
 	for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie))
 		var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style