Idris cafe (#16884)

* freezer, teal decals

* mappin

* a

* cafesign

* a

* coffeemenu

* pumpkinspice

* coffeemenu

* pspice in condi box

* mapping

* a

* a

* a

* takeaway cup

* chocolate syrup

* mappp

* table

* syrup icon

* syrup reagentfillings icon

* takeaway cup volume

* syrup bottles

* freez

* condiment box

* map

* c

* a

* firealarm

* oops

* Update DreamySkrell-idris-cafe-0.yml

* post merge fix?

---------

Co-authored-by: DreamySkrell <>

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -100,6 +100,11 @@
 	volume = 40
 	reagents_to_add = list(/singleton/reagent/nutriment/sprinkles = 40)
 
+/obj/item/reagent_containers/food/condiment/shaker/pumpkinspice
+	icon_state = "spacespicebottle"
+	volume = 40
+	reagents_to_add = list(/singleton/reagent/spacespice/pumpkinspice = 40)
+
 /obj/item/reagent_containers/food/condiment/flour
 	name = "flour sack"
 	desc = "A big bag of flour. Good for baking!"
@@ -260,3 +265,30 @@
 
 
 //End of MRE stuff.
+
+//syrups
+
+/obj/item/reagent_containers/glass/bottle/syrup
+	name = "syrup dispenser"
+	desc = "A small bottle dispenser."
+	icon = 'icons/obj/syrup.dmi'
+	icon_state = "syrup"
+	filling_states = "20;40;60;80;100"
+	flags = OPENCONTAINER
+	volume = 50
+
+/obj/item/reagent_containers/glass/bottle/syrup/chocolate
+	name = "chocolate syrup dispenser"
+	reagents_to_add = list(/singleton/reagent/drink/syrup_chocolate = 50)
+
+/obj/item/reagent_containers/glass/bottle/syrup/pumpkin
+	name = "pumpkin spice syrup dispenser"
+	reagents_to_add = list(/singleton/reagent/drink/syrup_pumpkin = 50)
+
+/obj/item/reagent_containers/glass/bottle/syrup/vanilla
+	name = "vanilla syrup dispenser"
+	reagents_to_add = list(/singleton/reagent/drink/syrup_vanilla = 50)
+
+/obj/item/reagent_containers/glass/bottle/syrup/caramel
+	name = "caramel syrup dispenser"
+	reagents_to_add = list(/singleton/reagent/drink/syrup_caramel = 50)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -321,6 +321,15 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 	else
 		icon_state = "water_cup_e"
 
+/obj/item/reagent_containers/food/drinks/takeaway_cup_idris
+	name = "takeaway cup"
+	desc = "A takeaway cup, sporting the Idris logo."
+	icon_state = "takeaway_cup_idris"
+	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
+	possible_transfer_amounts = null
+	volume = 30
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/reagent_containers/food/drinks/carton