diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index c76c31aa43b..14d81da4f1e 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -209,7 +209,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10, - /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 5 + /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 5, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk = 10 ) contraband = list( /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5, @@ -225,7 +226,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 113, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 16, - /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 50 + /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 50, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk = 5 ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. temperature_setting = -1 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 52fee808eb2..ab7c9dd9ac6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -991,6 +991,17 @@ if(alien != IS_TAJARA && prob(5)) H.delayed_vomit() +/datum/reagent/drink/milk/beetle + name = "Hakhma Milk" + id = "beetle_milk" + description = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." + nutrition = 4 + color = "#FFF8AD" + taste_description = "alien milk" + + glass_name = "glass of hakhma milk" + glass_desc = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." + /datum/reagent/drink/tea name = "Tea" id = "tea" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 69efb1e2757..cf5a6dfe311 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -254,4 +254,14 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk/Initialize() . = ..() - reagents.add_reagent("adhomai_milk", 30) \ No newline at end of file + reagents.add_reagent("adhomai_milk", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk + name = "\improper Hakhma Milk" + desc = "A can of Hakhma beetle milk, sourced from Scarab and Drifter communities." + icon_state = "beetlemilk" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk/Initialize() + . = ..() + reagents.add_reagent("beetle_milk", 30) diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 148a0bb8fbd..4c699794e9c 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -64,7 +64,8 @@ var/list/lunchables_drinks_ = list( /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, /obj/item/weapon/reagent_containers/food/drinks/cans/tonic, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, - /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk + /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk ) // This default list is a bit different, it contains items we don't want diff --git a/html/changelogs/paradoxspace-buggalos.yml b/html/changelogs/paradoxspace-buggalos.yml new file mode 100644 index 00000000000..67df08c3ff4 --- /dev/null +++ b/html/changelogs/paradoxspace-buggalos.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the nutrient-rich milk of the small-car sized Hakhma beetle to vendors and lunchboxes." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 99df283fbd9..c0385a6faa8 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ