From 0f99799bacdeaa25ec90c9cebbe47ec16199ec23 Mon Sep 17 00:00:00 2001 From: azulez Date: Thu, 5 Feb 2026 01:12:33 -0500 Subject: [PATCH] SolGov Marine Snacks (#31501) * Adding SolGov Marine Snack (rev 1) * Added crayon-mannitol, flavors, and every color of the rainbow. * Polling complete * Minor fixes for lines and commas, because of course. --- code/datums/outfits/outfit_admin.dm | 1 + code/game/objects/items/crayons.dm | 37 +++++++++++++++++++++++- code/game/objects/items/storage/fancy.dm | 15 ++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index aa9214900af..c223eeb0ef7 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -745,6 +745,7 @@ backpack_contents = list( /obj/item/clothing/shoes/magboots = 1, /obj/item/whetstone = 1, + /obj/item/storage/fancy/crayons/marine = 1, /obj/item/clothing/mask/gas/explorer/marines = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 ) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 92e6f8083e3..93cd861920c 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -19,6 +19,8 @@ var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z") var/uses = 30 //0 for unlimited uses var/instant = 0 + var/list/list_reagents = null // Note that reagents are transferred PER BITE! + var/flavor = "Delicious!" /// What color will this crayon dye clothes, cables, etc? used for for updateIcon purposes on other objs var/dye_color = DYE_RED var/dat @@ -155,8 +157,9 @@ times_eaten++ playsound(loc, 'sound/items/eatfood.ogg', 50, 0) user.adjust_nutrition(5) + user.reagents.add_reagent_list(list_reagents) if(times_eaten < max_bites) - to_chat(user, SPAN_NOTICE("You take a bite of the [name]. Delicious!")) + to_chat(user, SPAN_NOTICE("You take a bite of the [name]. [flavor]")) else to_chat(user, SPAN_WARNING("There is no more of [name] left!")) qdel(src) @@ -244,6 +247,38 @@ crayon_color = "#FFFFFF" dye_color = DYE_WHITE +/obj/item/toy/crayon/red/marine + list_reagents = list("mannitol" = 1) + flavor = "It tastes like victory!" + +/obj/item/toy/crayon/orange/marine + list_reagents = list("mannitol" = 1) + flavor = "It tastes like a round fruit, the name of which you can't quite recall..." + +/obj/item/toy/crayon/yellow/marine + list_reagents = list("mannitol" = 1) + flavor = "Just like a spicy cheese MRE!" + +/obj/item/toy/crayon/green/marine + list_reagents = list("mannitol" = 1) + flavor = "Mmm.. Minty!" + +/obj/item/toy/crayon/blue/marine + list_reagents = list("mannitol" = 2) // Best tasting color according to community polling. + flavor = "Tastes like blue!" + +/obj/item/toy/crayon/purple/marine + list_reagents = list("mannitol" = 1) + flavor = "It's grrrape!" + +/obj/item/toy/crayon/black/marine + list_reagents = list("mannitol" = 1) + flavor = "Licorice delicious!" + +/obj/item/toy/crayon/white/marine + list_reagents = list("mannitol" = 1) + flavor = "Its flavor remains a mystery!" + /obj/item/toy/crayon/white/chalk name = "detective's chalk" desc = "A stick of white chalk for marking crime scenes." diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d6a4c5f785a..15014b96a43 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -153,6 +153,21 @@ new /obj/item/toy/crayon/black(src) update_icon() +/obj/item/storage/fancy/crayons/marine + name = "box of TSF Standard Issue crayons" + desc = "A box of a SolGov Marine's favorite mid-operational snack." + +/obj/item/storage/fancy/crayons/marine/populate_contents() + new /obj/item/toy/crayon/white/marine(src) + new /obj/item/toy/crayon/red/marine(src) + new /obj/item/toy/crayon/orange/marine(src) + new /obj/item/toy/crayon/yellow/marine(src) + new /obj/item/toy/crayon/green/marine(src) + new /obj/item/toy/crayon/blue/marine(src) + new /obj/item/toy/crayon/purple/marine(src) + new /obj/item/toy/crayon/black/marine(src) + update_icon() + /obj/item/storage/fancy/crayons/update_overlays() . = ..() . += image('icons/obj/crayons.dmi',"crayonbox")