cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 19:15:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added more cup sizes

Browse Source 
Added tall, grande and venti cups that get named similarly to the normal cups.

Added ginger and gingerbread syrups, on request of my wife, lol.
This commit is contained in:
SatinIsle
2024-12-03 20:06:57 +00:00
parent 35503f3113
commit 4cf5beeabe
9 changed files with 189 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/drinkingglass/glass_boxes.dm
+13 -1
View File
@@ -81,4 +81,16 @@
/obj/item/storage/box/glasses/coffeemug
name = "box of coffee mugs"
starts_with = list(/obj/item/reagent_containers/food/drinks/glass2/coffeemug = 7)
starts_with = list(/obj/item/reagent_containers/food/drinks/glass2/coffeemug = 7)
/obj/item/storage/box/glasses/coffeecup_tall
name = "box of tall cups"
starts_with = list(/obj/item/reagent_containers/food/drinks/tall = 7)
/obj/item/storage/box/glasses/coffeecup_grande
name = "box of grande cups"
starts_with = list(/obj/item/reagent_containers/food/drinks/grande = 7)
/obj/item/storage/box/glasses/coffeecup_venti
name = "box of venti cups"
starts_with = list(/obj/item/reagent_containers/food/drinks/venti = 7)
code/modules/food/food/drinks/drinkingglass.dm
+144
View File
@@ -166,3 +166,147 @@
reagents.add_reagent("iron", 10)
reagents.add_reagent("protein", 15)
reagents.add_reagent("water", 45)
////////////////Fancy coffee cups
/obj/item/reagent_containers/food/drinks/tall
name = "tall cup"
desc = "A larger coffee cup."
icon_state = "tall_cup_empty"
amount_per_transfer_from_this = 5
volume = 40
center_of_mass = list("x"=16, "y"=16)
/obj/item/reagent_containers/food/drinks/tall/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "tall_cup_empty"
name = "tall cup"
desc = "A larger coffee cup."
center_of_mass = list("x"=16, "y"=16)
return
var/datum/reagent/R = reagents.get_master_reagent()
if(R.cup_icon_state)
icon_state = "tall_[R.cup_icon_state]"
else
icon_state = "tall_cup_brown"
if(R.cup_name)
var/prefix = " "
for(var/datum/reagent/S in reagents.reagent_list)
if(S.cup_prefix)
var/current_prefix = prefix
prefix = "[current_prefix][S.cup_prefix] "
name = "tall[prefix][R.cup_name]"
else
name = "tall.. what?"
if(R.cup_desc)
desc = R.cup_desc
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass = R.cup_center_of_mass
else
center_of_mass = list("x"=16, "y"=16)
if(R.price_tag)
price_tag = R.price_tag
else
price_tag = null
/obj/item/reagent_containers/food/drinks/grande
name = "grande cup"
desc = "A much taller coffee cup for people who really need their coffee."
icon_state = "grande_cup_empty"
amount_per_transfer_from_this = 5
volume = 50
center_of_mass = list("x"=16, "y"=16)
/obj/item/reagent_containers/food/drinks/grande/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "grande_cup_empty"
name = "grande cup"
desc = "A much taller coffee cup for people who really need their coffee."
center_of_mass = list("x"=16, "y"=16)
return
var/datum/reagent/R = reagents.get_master_reagent()
if(R.cup_icon_state)
icon_state = "grande_[R.cup_icon_state]"
else
icon_state = "grande_cup_brown"
if(R.cup_name)
var/prefix = " "
for(var/datum/reagent/S in reagents.reagent_list)
if(S.cup_prefix)
var/current_prefix = prefix
prefix = "[current_prefix][S.cup_prefix] "
name = "grande[prefix][R.cup_name]"
else
name = "grande.. what?"
if(R.cup_desc)
desc = R.cup_desc
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass = R.cup_center_of_mass
else
center_of_mass = list("x"=16, "y"=16)
if(R.price_tag)
price_tag = R.price_tag
else
price_tag = null
/obj/item/reagent_containers/food/drinks/venti
name = "venti cup"
desc = "A huge coffee cup for people who literally cannot function without it."
icon_state = "venti_cup_empty"
amount_per_transfer_from_this = 5
volume = 60
center_of_mass = list("x"=16, "y"=16)
/obj/item/reagent_containers/food/drinks/venti/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "venti_cup_empty"
name = "venti cup"
desc = "A huge coffee cup for people who literally cannot function without it."
center_of_mass = list("x"=16, "y"=16)
return
var/datum/reagent/R = reagents.get_master_reagent()
if(R.cup_icon_state)
icon_state = "venti_[R.cup_icon_state]"
else
icon_state = "venti_cup_brown"
if(R.cup_name)
var/prefix = " "
for(var/datum/reagent/S in reagents.reagent_list)
if(S.cup_prefix)
var/current_prefix = prefix
prefix = "[current_prefix][S.cup_prefix] "
name = "venti[prefix][R.cup_name]"
else
name = "venti.. what?"
if(R.cup_desc)
desc = R.cup_desc
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass = R.cup_center_of_mass
else
center_of_mass = list("x"=16, "y"=16)
if(R.price_tag)
price_tag = R.price_tag
else
price_tag = null
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+4
View File
@@ -183,6 +183,10 @@
spawn_reagent = "syrup_strawberry"
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
spawn_reagent = "syrup_coconut"
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger
spawn_reagent = "syrup_ginger"
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
spawn_reagent = "syrup_gingerbread"
// ERT
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
code/modules/reagents/machinery/dispenser/dispenser_presets.dm
+3 -1
View File
@@ -177,5 +177,7 @@
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate,
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate,
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry,
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut,
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger,
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
)
code/modules/reagents/reagents/food_drinks.dm
+16
View File
@@ -2931,6 +2931,22 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
/datum/reagent/drink/syrup/ginger
name = "ginger syrup"
id = "syrup_ginger"
description = "A sugary syrup that tastes of ginger."
taste_description = "ginger"
color = "#d09740"
cup_prefix = "ginger"
/datum/reagent/drink/syrup/gingerbread
name = "gingerbread syrup"
id = "syrup_gingerbread"
description = "A sugary syrup that tastes of gingerbread."
taste_description = "gingerbread"
color = "#b6790f"
cup_prefix = "gingerbread"
/* Alcohol */
// Basic