diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index ee3817d6465..5e7cd54cc99 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -285,6 +285,7 @@ /obj/item/reagent_containers/food/snacks/chocolatebar = 6, /obj/item/storage/box/fancy/cookiesnack = 6, /obj/item/storage/box/fancy/gum = 4, + /obj/item/storage/box/fancy/vkrexitaffy = 5, /obj/item/clothing/mask/chewable/candy/lolli = 8, /obj/item/storage/box/fancy/admints = 4, /obj/item/reagent_containers/food/snacks/skrellsnacks = 3, @@ -320,6 +321,7 @@ /obj/item/clothing/mask/chewable/candy/lolli = 2, /obj/item/storage/box/fancy/admints = 12, /obj/item/storage/box/fancy/cookiesnack = 20, + /obj/item/storage/box/fancy/vkrexitaffy = 12, /obj/item/reagent_containers/food/snacks/skrellsnacks = 40, /obj/item/reagent_containers/food/snacks/meatsnack = 22, /obj/item/reagent_containers/food/snacks/maps = 23, diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ce38beea550..a456dd874b4 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -229,3 +229,7 @@ /obj/item/trash/seaweed name = "empty moss pack" icon_state = "seaweed" + +/obj/item/trash/vkrexitaffy + name = "V'krexi Snax" + icon_state = "vkrexitaffy" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 396b6430ee1..17173750bd6 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -713,7 +713,8 @@ /obj/item/reagent_containers/food/snacks/tuna, /obj/item/storage/box/fancy/gum, /obj/item/storage/box/fancy/cookiesnack, - /obj/item/storage/box/fancy/admints + /obj/item/storage/box/fancy/admints, + /obj/item/storage/box/fancy/vkrexitaffy ) for (var/i = 0,i<7,i++) var/type = pick(snacks) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index a2ef4be2859..e6462945828 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1479,3 +1479,15 @@ to_chat(H, SPAN_WARNING(pick("You feel a clot shoot through your heart!", "Your veins feel like they're being shredded!"))) var/obj/item/organ/internal/heart/heart = H.internal_organs_by_name[BP_HEART] heart.take_internal_damage(1, TRUE) + +/decl/reagent/mental/vkrexi + name = "V'krexi taffy" + description = "V'krexi meat, processed to become a chewy, sticky candy." + reagent_state = SOLID + scannable = TRUE + color = "#d6ec57" + metabolism = 0.4 * REM + taste_description = "bittersweetness, insect meat and regret" + metabolism_min = 0.5 + breathe_mul = 0 + goodmessage = list("You feel strange, in a good way.") \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 2f0631e2550..f83c21ad3c8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5191,3 +5191,32 @@ filling_color = "#dcd9cd" reagents_to_add = list(/decl/reagent/kois = 20, /decl/reagent/toxin/phoron = 20) bitesize = 2 + +/obj/item/storage/box/fancy/vkrexitaffy + name = "V'krexi Snax" + desc = "A packet of V'krexi taffy. Made from free-range V'krexi!" + desc_fluff = "V'krexi, while edible, hold no nutritional value, either for humans or Vaurca. The V'krexi meat was mostly neglected until human food-processing techniques were introduced to the Zo'ra Hive." + icon = 'icons/obj/food.dmi' + icon_state = "vkrexitaffy" + icon_type = "vkrexi taffy" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/vkrexitaffy = 6) + can_hold = list(/obj/item/reagent_containers/food/snacks/vkrexitaffy) + max_storage_space = 6 + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/vkrexitaffy + closable = FALSE + icon_overlays = FALSE + +/obj/item/reagent_containers/food/snacks/vkrexitaffy + name = "V'krexi taffy" + desc = "A delicious V'krexi chewy candy." + icon_state = "vkrexichewy" + slot_flags = SLOT_EARS + filling_color = "#dcd9cd" + reagents_to_add = list(/decl/reagent/mental/vkrexi = 0.5) + bitesize = 1 \ No newline at end of file diff --git a/html/changelogs/desven-bugsnax.yml b/html/changelogs/desven-bugsnax.yml new file mode 100644 index 00000000000..e60c8b957b5 --- /dev/null +++ b/html/changelogs/desven-bugsnax.yml @@ -0,0 +1,6 @@ +author: Desven & BunkyB + +delete-after: True + +changes: + - rscadd: "Adds V'krexi Snax, you can find them in the Getmore vendor." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index e748ef0c4ab..9067b7984c1 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 7419b7c891a..42cd51de45d 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ