diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index ab221b89bfe2..fdc44382b53d 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -34,6 +34,23 @@ w_class = SIZE_LARGE //Changed becuase of in-game abuse storage_flags = STORAGE_FLAGS_BOX +/obj/item/storage/box/pride + name = "box of prideful crayons" + desc = "A box of every flavor of pride." + storage_slots = 8 + w_class = SIZE_SMALL + can_hold = list(/obj/item/toy/crayon/pride) + +/obj/item/storage/box/pride/fill_preset_inventory() + new /obj/item/toy/crayon/pride/gay(src) + new /obj/item/toy/crayon/pride/lesbian(src) + new /obj/item/toy/crayon/pride/bi(src) + new /obj/item/toy/crayon/pride/ace(src) + new /obj/item/toy/crayon/pride/pan(src) + new /obj/item/toy/crayon/pride/trans(src) + new /obj/item/toy/crayon/pride/enby(src) + new /obj/item/toy/crayon/pride/fluid(src) + /obj/item/storage/box/survival w_class = SIZE_MEDIUM diff --git a/code/game/objects/items/toys/crayons.dm b/code/game/objects/items/toys/crayons.dm index 1d9e2e1a4d54..636f1a50fc52 100644 --- a/code/game/objects/items/toys/crayons.dm +++ b/code/game/objects/items/toys/crayons.dm @@ -61,6 +61,62 @@ colorName = "rainbow" uses = 0 +/obj/item/toy/crayon/pride/lesbian + icon_state = "crayonlesbian" + crayon_color = "#bd1471" + shade_color = "#d46b15" + colorName = "lesbian" + uses = 0 + +/obj/item/toy/crayon/pride/gay + icon_state = "crayongay" + crayon_color = "#33cc9e" + shade_color = "#7f1fa5" + colorName = "gay" + uses = 0 + +/obj/item/toy/crayon/pride/bi + icon_state = "crayonbi" + crayon_color = "#c01b6e" + shade_color = "#281dc5" + colorName = "bisexual" + uses = 0 + +/obj/item/toy/crayon/pride/pan + icon_state = "crayonpan" + crayon_color = "#da1778" + shade_color = "#229bff" + colorName = "pansexual" + uses = 0 + +/obj/item/toy/crayon/pride/ace + icon_state = "crayonace" + crayon_color = "#272727" + shade_color = "#570c3e" + colorName = "asexual" + uses = 0 + +/obj/item/toy/crayon/pride/trans + icon_state = "crayontrans" + crayon_color = "#f57ecd" + shade_color = "#4bbdeb" + colorName = "transgender" + uses = 0 + +/obj/item/toy/crayon/pride/enby + icon_state = "crayonenby" + crayon_color = "#272727" + shade_color = "#e9cf3a" + colorName = "nonbinary" + uses = 0 + +/obj/item/toy/crayon/pride/fluid + icon_state = "crayonfluid" + crayon_color = "#b64791" + shade_color = "#000FFF" + colorName = "genderfluid" + uses = 0 + /obj/item/toy/crayon/rainbow/attack_self(mob/living/user) ..() crayon_color = input(user, "Please select the main color.", "Crayon color") as color diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 13a31b59fa97..79fd34b2660c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -547,6 +547,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "Crayon" path = /obj/item/toy/crayon/rainbow +/datum/gear/toy/pride + display_name = "Box of Prideful Crayons" + path = /obj/item/storage/box/pride + /datum/gear/plush category = "Plushies" cost = 4 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1e691261a747..273715488392 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -326,6 +326,15 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/toy/crayon/blue = "crayonblue", /obj/item/toy/crayon/purple = "crayonpurple", /obj/item/toy/crayon/rainbow = "crayonrainbow", + /obj/item/toy/crayon/pride/trans = "crayontrans", + /obj/item/toy/crayon/pride/gay = "crayongay", + /obj/item/toy/crayon/pride/lesbian = "crayonlesbian", + /obj/item/toy/crayon/pride/bi = "crayonbi", + /obj/item/toy/crayon/pride/pan = "crayonpan", + /obj/item/toy/crayon/pride/ace = "crayonace", + /obj/item/toy/crayon/pride/trans = "crayontrans", + /obj/item/toy/crayon/pride/enby = "crayonenby", + /obj/item/toy/crayon/pride/fluid = "crayonfluid", /obj/item/paper = "paper", /obj/item/device/flashlight/flare = "flare", /obj/item/clothing/head/headset = "headset", diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index 9876dd8629ad..5611d28c8480 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/obj/items/crayons.dmi b/icons/obj/items/crayons.dmi index 7ebabd5a81ef..37770b0fc26a 100644 Binary files a/icons/obj/items/crayons.dmi and b/icons/obj/items/crayons.dmi differ