Merge remote-tracking branch 'upstream/master' into kk-rings

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

@@ -568,4 +568,12 @@ Talon pin
 	"Studded Belt" = /obj/item/clothing/accessory/belt/studded
 	)
 	gear_tweaks += new/datum/gear_tweak/path(wristband_lists)
-	gear_tweaks += gear_tweak_free_color_choice
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/accessory/bunny_tail
+	display_name = "bunny tail, colorable"
+	path = /obj/item/clothing/accessory/bunny_tail
+
+/datum/gear/accessory/bunny_tail/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice

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

@@ -239,6 +239,10 @@
 	display_name = "rabbit ears"
 	path = /obj/item/clothing/head/rabbitears
 
+/datum/gear/head/rabbit/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/head/beanie
 	display_name = "beanie"
 	path = /obj/item/clothing/head/beanie

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

@@ -635,3 +635,22 @@
 	"black tabard-dress"=/obj/item/clothing/under/dress/tabard/black
 	)
 	gear_tweaks += list(new/datum/gear_tweak/path(tabarddress))
+
+//bunny suits
+
+/datum/gear/uniform/bunnysuit
+	display_name = "bunny suit selection, colorable"
+	path = /obj/item/clothing/under/bunnysuit
+
+/datum/gear/uniform/bunnysuit/New()
+	..()
+	var/list/bunnysuit = list(
+	"bunnysuit"=/obj/item/clothing/under/bunnysuit,
+	"maid bunnysuit"=/obj/item/clothing/under/bunnysuit_maid,
+	"reverse bunnysuit"=/obj/item/clothing/under/reverse_bunnysuit,
+	"maid reverse bunnysuit"=/obj/item/clothing/under/reverse_bunnysuit_maid,
+	"reverse bunnysuit, no legs"=/obj/item/clothing/under/reverse_bunnytop,
+	"maid reverse bunnysuit, no legs"=/obj/item/clothing/under/reverse_bunnytop_maid
+	)
+	gear_tweaks += list(new/datum/gear_tweak/path(bunnysuit))
+	gear_tweaks += gear_tweak_free_color_choice