diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 6d7da649f7..4d0ba6f6c5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -349,3 +349,27 @@ /datum/gear/accessory/pressbadge display_name = "freelance press pass" path = /obj/item/clothing/accessory/badge/press/independent + +/datum/gear/accessory/wristband + display_name = "wristband (recolourable)" + path = /obj/item/clothing/accessory/wristband + +/datum/gear/accessory/wristband/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/accessory/wristband_collection + display_name = "wristbands (selection)" + path = /obj/item/clothing/accessory/wristbandcollection + +/datum/gear/accessory/wristband_collection/New() + ..() + var/list/wristband_lists = list( + "Green, Blue and Yellow" = /obj/item/clothing/accessory/wristbandcollection, + "Pink, Black and Red" = /obj/item/clothing/accessory/wristbandcollection/pink, + "Red and Orange" = /obj/item/clothing/accessory/wristbandcollection/les, + "White, Pink and Blue" = /obj/item/clothing/accessory/wristbandcollection/trans, + "Blue, Purple and Pink" = /obj/item/clothing/accessory/wristbandcollection/bi, + "Black, White and Grey" = /obj/item/clothing/accessory/wristbandcollection/ace + ) + gear_tweaks += new/datum/gear_tweak/path(wristband_lists) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 9de23cb7d8..30d75b262f 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -493,6 +493,70 @@ icon_state = "sash" slot = ACCESSORY_SLOT_OVER +/obj/item/clothing/accessory/wristband + name = "wristband" + desc = "A simple plastic wristband." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection/pink + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection2" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection/les + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection3" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection/trans + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection4" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection/bi + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection5" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/wristbandcollection/ace + name = "wristband collection" + desc = "A mix of colourable plastic wristbands." + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "wristband_collection6" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE + slot = ACCESSORY_SLOT_DECOR + + //Gaiter scarves /obj/item/clothing/accessory/gaiter name = "red neck gaiter" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 45ef2af07e..9a7bd37ba2 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -600,6 +600,13 @@ /obj/item/clothing/accessory/wcoat/swvest = 5, /obj/item/clothing/accessory/wcoat/swvest/blue = 5, /obj/item/clothing/accessory/wcoat/swvest/red = 5, + /obj/item/clothing/accessory/wristband = 5, + /obj/item/clothing/accessory/wristbandcollection = 5, + /obj/item/clothing/accessory/wristbandcollection/pink = 5, + /obj/item/clothing/accessory/wristbandcollection/les = 5, + /obj/item/clothing/accessory/wristbandcollection/bi = 5, + /obj/item/clothing/accessory/wristbandcollection/trans = 5, + /obj/item/clothing/accessory/wristbandcollection/ace = 5, /obj/item/weapon/storage/wallet = 5, /obj/item/weapon/storage/wallet/poly = 5, /obj/item/weapon/storage/wallet/womens = 5, @@ -729,6 +736,13 @@ /obj/item/clothing/accessory/wcoat/swvest = 50, /obj/item/clothing/accessory/wcoat/swvest/blue = 50, /obj/item/clothing/accessory/wcoat/swvest/red = 50, + /obj/item/clothing/accessory/wristband = 10, + /obj/item/clothing/accessory/wristbandcollection = 30, + /obj/item/clothing/accessory/wristbandcollection/pink = 30, + /obj/item/clothing/accessory/wristbandcollection/les = 30, + /obj/item/clothing/accessory/wristbandcollection/bi = 30, + /obj/item/clothing/accessory/wristbandcollection/trans = 30, + /obj/item/clothing/accessory/wristbandcollection/ace = 30, /obj/item/weapon/storage/wallet = 50, /obj/item/weapon/storage/wallet/poly = 50, /obj/item/weapon/storage/wallet/womens = 50, diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 2fc09f9efb..22d585b770 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 dae029fcde..a8281d1a2e 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ