diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
index 97fc97d5e47..27cda478dad 100644
--- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
+++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
@@ -6,7 +6,7 @@
#define CONE_CHOC 6
/obj/machinery/icecream_vat
- name = "icecream vat"
+ name = "ice cream vat"
desc = "Ding-aling ding dong. Get your Nanotrasen-approved ice cream!"
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_vat"
@@ -60,6 +60,9 @@
reagents.add_reagent("flour", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent("ice", 5)
+ reagents.add_reagent("cocoa", 5)
+ reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent("singulo", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user)
user.set_machine(src)
@@ -92,18 +95,18 @@
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
if(!I.ice_creamed)
if(product_types[dispense_flavour] > 0)
- src.visible_message("\icon[src] [user] scoops delicious [flavour_name] icecream into [I].")
+ src.visible_message("\icon[src] [user] scoops delicious [flavour_name] ice cream into [I].")
product_types[dispense_flavour] -= 1
-
+ I.flavour_type = flavour_name
I.add_ice_cream(flavour_name)
// if(beaker)
// beaker.reagents.trans_to(I, 10)
if(I.reagents.total_volume < 10)
I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
else
- user << "There is not enough icecream left!"
+ user << "There is not enough ice cream left!"
else
- user << "[O] already has icecream in it."
+ user << "[O] already has ice cream in it."
return 1
else if(O.is_open_container())
return
@@ -134,7 +137,7 @@
if(href_list["select"])
dispense_flavour = text2num(href_list["select"])
flavour_name = get_flavour_name(dispense_flavour)
- src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured icecream.")
+ src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured ice cream.")
if(href_list["cone"])
var/dispense_cone = text2num(href_list["cone"])
@@ -144,6 +147,12 @@
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc)
I.cone_type = cone_name
I.icon_state = "icecream_cone_[cone_name]"
+ switch (I.cone_type)
+ if ("waffle")
+ I.reagents.add_reagent("nutriment", 1)
+ if ("chocolate")
+ I.reagents.add_reagent("cocoa", 1) // chocolate ain't as nutritious kids
+
I.desc = "Delicious [cone_name] cone, but no ice cream."
src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].")
else
@@ -175,16 +184,28 @@
layer = 3.1
var/ice_creamed = 0
var/cone_type
+ var/flavour_type
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/icecream/New()
create_reagents(20)
- reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("nutriment", 4)
/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name)
name = "[flavour_name] icecream"
src.overlays += "icecream_[flavour_name]"
- desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream."
+ switch (flavour_type) // adding the actual reagents advertised in the ingredient list
+ if ("vanilla")
+ desc = "A delicious [cone_type] cone filled with vanilla ice cream. All the other ice creams take content from it."
+ if ("chocolate")
+ desc = "A delicious [cone_type] cone filled with chocolate ice cream. Surprisingly, made with real cocoa."
+ reagents.add_reagent("cocoa", 2)
+ if ("strawberry")
+ desc = "A delicious [cone_type] cone filled with strawberry ice cream. Definitely not made with real strawberries."
+ reagents.add_reagent("berryjuice", 2)
+ if ("blue")
+ desc = "A delicious [cone_type] cone filled with blue ice cream. Made with real... blue?"
+ reagents.add_reagent("singulo", 2)
ice_creamed = 1
#undef ICECREAM_VANILLA
diff --git a/html/changelogs/bgobandit - weallscreamforreagents.yml b/html/changelogs/bgobandit - weallscreamforreagents.yml
new file mode 100644
index 00000000000..11dcf2502b5
--- /dev/null
+++ b/html/changelogs/bgobandit - weallscreamforreagents.yml
@@ -0,0 +1,5 @@
+
+author: bgobandit
+delete-after: True
+changes:
+ - rscadd: "After multiple complaints from WaffleCo food activists, Nanotrasen has added real chocolate, berry juice and blue flavouring to its ice cream products."
\ No newline at end of file