diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 792708b5bb..182e58c1f7 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -7,6 +7,7 @@ //backpack #define LOADOUT_CATEGORY_BACKPACK "In backpack" #define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory +#define LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES "Accessories" //maybe one day someone will make loadouts have accessory compatibility #define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys" //neck #define LOADOUT_CATEGORY_NECK "Neck" diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm index 4a61a94dc7..5dd7220676 100644 --- a/code/_globalvars/lists/loadout_categories.dm +++ b/code/_globalvars/lists/loadout_categories.dm @@ -1,5 +1,5 @@ GLOBAL_LIST_INIT(loadout_categories, list( - LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_TOYS), + LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES, LOADOUT_SUBCATEGORY_BACKPACK_TOYS), LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES), LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE, LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE, diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 4d967be1eb..6d477a0590 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -65,7 +65,7 @@ /obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user) return -/obj/item/clothing/accessory/AltClick(mob/user) +/obj/item/clothing/accessory/CtrlClick(mob/user) . = ..() if(istype(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) if(initial(above_suit)) @@ -77,7 +77,7 @@ . = ..() . += "\The [src] can be attached to a uniform. Alt-click to remove it once attached." if(initial(above_suit)) - . += "\The [src] can be worn above or below your suit. Alt-click to toggle." + . += "\The [src] can be worn above or below your suit. Ctrl-click to toggle." ////////////// //Waistcoats// @@ -557,3 +557,18 @@ obj_flags = UNIQUE_RENAME custom_materials = list(/datum/material/iron=100) resistance_flags = FIRE_PROOF + + +/obj/item/clothing/accessory/pride + name = "pride pin" + desc = "A Nanotrasen Diversity & Inclusion Center-sponsored holographic pin to show off your pride of sexuality or gender identity, reminding the crew of their unwavering commitment to equity, diversity, and inclusion!" + icon_state = "pride" + above_suit = TRUE + obj_flags = UNIQUE_RENAME + unique_reskin = list("Rainbow Pride" = "pride", + "Bisexual Pride" = "pride_bi", + "Pansexual Pride" = "pride_pan", + "Asexual Pride" = "pride_ace", + "Non-binary Pride" = "pride_enby", + "Transgender Pride" = "pride_trans", + ) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 5551152b85..3e889328a4 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -11,6 +11,7 @@ /obj/item/clothing/head/beret/black = 3, /obj/item/clothing/head/beret/purple = 3, /obj/item/clothing/head/beret/blue = 3, + /obj/item/clothing/accessory/pride = 25, /obj/item/clothing/glasses/monocle = 3, /obj/item/clothing/suit/jacket = 4, /obj/item/clothing/suit/jacket/flannel = 4, diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index f801c483f1..5c212f3f45 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index f633f030c3..b92d65092e 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 0573a1a22a..5879426041 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -172,12 +172,21 @@ path = /obj/item/storage/fancy/ringbox/diamond cost = 5 -/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories +/datum/gear/backpack/necklace //this is here because loadout doesn't support proper accessories name = "A renameable necklace" path = /obj/item/clothing/accessory/necklace + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES /datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories name = "Polychromic maid apron" path = /obj/item/clothing/accessory/maidapron/polychromic loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC loadout_initial_colors = list("#333333", "#FFFFFF") + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES + +/datum/gear/backpack/pridepin //what the two comments above said + name = "Pride pin" + path = /obj/item/clothing/accessory/pride + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES + cost = 0