diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 18cd673d5f..d22bdcc20e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/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 \ No newline at end of file + 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 diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 070502d772..c5a80a9e67 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/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 diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 32157af5eb..c7803fc0e9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/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 diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 7b68ced88a..4c8e2c6143 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -1033,3 +1033,13 @@ desc = "A studded belt for holding your pants up and looking cool." icon_state = "belt_studded" item_state = "belt_studded" + +/obj/item/clothing/accessory/bunny_tail + name = "Bunny Tail" + desc = "A little fluffy bunny tail to spice up your outfit." + icon = 'icons/inventory/accessory/item.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' + icon_state = "bunny_tail" + item_state = "bunny_tail" + slot_flags = SLOT_TIE | SLOT_BELT + slot = ACCESSORY_SLOT_DECOR diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 152b107ecf..83063a48b6 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1723,3 +1723,36 @@ name = "fiendish dress" desc = "A red and black dress befitting someone from the dark pits themselves… Or someone way too edgy." icon_state = "fienddress" + +//bunny suits + +/obj/item/clothing/under/bunnysuit_maid + name = "bunny suit" + desc = "A black and white bunny suit, extremely skimpy. Tails and ears sold seperately." + icon_state = "bunnysuit_maid" + +/obj/item/clothing/under/bunnysuit + name = "bunny suit" + desc = "A bunny suit, extremely skimpy. Tails and ears sold seperately." + icon_state = "bunnysuit_colour" + + +/obj/item/clothing/under/reverse_bunnysuit + name = "reverse bunny suit" + desc = "A reverse bunny suit, literally just covers everything except the bits you're supposed to. Tails and ears sold seperately." + icon_state = "reverse_bunnysuit_colour" + +/obj/item/clothing/under/reverse_bunnysuit_maid + name = "reverse bunny suit" + desc = "A maid themed reverse bunny suit, literally just covers everything except the bits you're supposed to. Tails and ears sold seperately." + icon_state = "reverse_bunnysuit_maid" + +/obj/item/clothing/under/reverse_bunnytop + name = "reverse bunny suit" + desc = "A reverse bunny suit, literally just covers everything except the bits you're supposed to. Tails and ears sold seperately." + icon_state = "reverse_bunnytop_colour" + +/obj/item/clothing/under/reverse_bunnytop_maid + name = "reverse bunny suit" + desc = "A maid themed reverse bunny suit, literally just covers everything except the bits you're supposed to. Tails and ears sold seperately." + icon_state = "reverse_bunnytop_maid" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 8af2af8139..c62361aee9 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1540,6 +1540,14 @@ /obj/item/clothing/accessory/maid_arms = 3, /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, + /obj/item/clothing/under/bunnysuit = 3, + /obj/item/clothing/under/bunnysuit_maid = 3, + /obj/item/clothing/under/reverse_bunnysuit = 3, + /obj/item/clothing/under/reverse_bunnysuit_maid = 3, + /obj/item/clothing/under/reverse_bunnytop = 3, + /obj/item/clothing/under/reverse_bunnytop_maid = 3, + /obj/item/clothing/head/rabbitears = 3, + /obj/item/clothing/accessory/bunny_tail = 3, /obj/item/clothing/suit/shrine_maiden = 3) prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, /obj/item/clothing/suit/storage/hooded/costume/carp = 200, @@ -1617,6 +1625,14 @@ /obj/item/clothing/accessory/maid_arms = 25, /obj/item/clothing/head/headband/maid/modern = 25, /obj/item/clothing/accessory/maidcorset = 25, + /obj/item/clothing/under/bunnysuit = 50, + /obj/item/clothing/under/bunnysuit_maid = 50, + /obj/item/clothing/under/reverse_bunnysuit = 50, + /obj/item/clothing/under/reverse_bunnysuit_maid = 50, + /obj/item/clothing/under/reverse_bunnytop = 50, + /obj/item/clothing/under/reverse_bunnytop_maid = 50, + /obj/item/clothing/head/rabbitears = 25, + /obj/item/clothing/accessory/bunny_tail = 25, /obj/item/clothing/suit/shrine_maiden = 200) premium = list(/obj/item/clothing/suit/imperium_monk = 3, /obj/item/clothing/suit/barding/agatha = 2, diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 2782922a7a..2e2f0fa9e6 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index 587ec87128..8b67d7d7de 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 16b3b53f64..a08ddf8ed3 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index f6ec8e9285..ab3112edf9 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ