Skip to content

Commit

Permalink
is this really that fucking esoteric
Browse files Browse the repository at this point in the history
  • Loading branch information
alsoandanswer committed Sep 5, 2023
1 parent a43b39e commit 5b238c7
Show file tree
Hide file tree
Showing 37 changed files with 258 additions and 241 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/biogenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

/singleton/biorecipe/food/milk
name = "Space Milk (50u)"
object = /obj/item/reagent_containers/food/drinks/carton/milk
object = /obj/item/reagent_containers/food/drinks/milk
cost = 100

/singleton/biorecipe/food/nutrispread
Expand Down
14 changes: 7 additions & 7 deletions code/game/machinery/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
)
contraband = list(
/obj/item/reagent_containers/food/drinks/ice = 10,
/obj/item/reagent_containers/food/drinks/carton/soymilk = 2
/obj/item/reagent_containers/food/drinks/soymilk = 2
)
prices = list(
/obj/item/reagent_containers/food/drinks/coffee = 20,
Expand Down Expand Up @@ -404,9 +404,9 @@
/obj/item/reagent_containers/food/drinks/cans/peach_soda = 10,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10,
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 10,
/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
/obj/item/reagent_containers/food/drinks/milk = 10,
/obj/item/reagent_containers/food/drinks/milk/choco = 10,
/obj/item/reagent_containers/food/drinks/milk/strawberry = 10,
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10
)
contraband = list(
Expand Down Expand Up @@ -434,9 +434,9 @@
/obj/item/reagent_containers/food/drinks/cans/koispunch = 50,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5,
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35,
/obj/item/reagent_containers/food/drinks/carton/small/milk = 18,
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18,
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18,
/obj/item/reagent_containers/food/drinks/milk = 18,
/obj/item/reagent_containers/food/drinks/milk/choco = 18,
/obj/item/reagent_containers/food/drinks/milk/strawberry = 18,
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 16
)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
/obj/structure/closet/secure_closet/freezer/fridge/fill()
..()
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
new /obj/item/reagent_containers/food/drinks/milk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/box/fancy/egg_box(src)

Expand Down Expand Up @@ -86,10 +86,10 @@
/obj/structure/closet/secure_closet/freezer/cafe/fill()
..()
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
new /obj/item/reagent_containers/food/drinks/milk(src)
for(var/i = 0, i < 3, i++)
new /obj/item/storage/box/fancy/egg_box(src)
new /obj/item/reagent_containers/food/condiment/flour(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
4 changes: 2 additions & 2 deletions code/modules/random_map/drop/drop_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
Expand Down
130 changes: 130 additions & 0 deletions code/modules/reagents/reagent_containers/food/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,136 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
/// Drinks. END
////////////////////////////////////////////////////////////////////////////////

/obj/item/reagent_containers/food/drinks/carton
name = "carton"
desc = "An abstract way to organize bottles that are really cartons. Finally!"
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
icon_state = "carton"
item_state = "carton" //dear contributors, item_state handles inhands and onmob sprites. do not touch if you do not have added/changed the inhands. thanks. -wezzy
volume = 100
center_of_mass = list("x"=16, "y"=6)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'

/obj/item/reagent_containers/food/drinks/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
reagents_to_add = list(/singleton/reagent/drink/milk = 50)
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
item_state = "carton"
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'

/obj/item/reagent_containers/food/drinks/soymilk
name = "soymilk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
reagents_to_add = list(/singleton/reagent/drink/milk/soymilk = 50)
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
item_state = "carton"
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'

/obj/item/reagent_containers/food/drinks/carton/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
reagents_to_add = list(/singleton/reagent/drink/orangejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
reagents_to_add = list(/singleton/reagent/drink/milk/cream = 100)

/obj/item/reagent_containers/food/drinks/carton/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
reagents_to_add = list(/singleton/reagent/drink/tomatojuice = 100)

/obj/item/reagent_containers/food/drinks/carton/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
icon_state = "limejuice"
reagents_to_add = list(/singleton/reagent/drink/limejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/lemonjuice
name = "lemon juice"
desc = "This juice is VERY sour."
icon_state = "lemoncarton"
reagents_to_add = list(/singleton/reagent/drink/lemonjuice = 100)

/obj/item/reagent_containers/food/drinks/carton/dynjuice
name = "dyn juice"
desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
icon_state = "dyncarton"
reagents_to_add = list(/singleton/reagent/drink/dynjuice = 100)

/obj/item/reagent_containers/food/drinks/carton/applejuice
name = "apple juice"
desc = "Juice from an apple. Yes."
icon_state = "applejuice"
reagents_to_add = list(/singleton/reagent/drink/applejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/fatshouters
name = "fatshouters milk carton"
desc = "Fatty fatshouters milk in a carton."
reagents_to_add = list(/singleton/reagent/drink/milk/adhomai = 100)

/obj/item/reagent_containers/food/drinks/carton/mutthir
name = "mutthir carton"
icon_state = "mutthir"
desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
desc_extended = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
were quick to adopt the drink to their diet."
reagents_to_add = list(/singleton/reagent/drink/milk/adhomai/mutthir = 100)

/obj/item/reagent_containers/food/drinks/carton/eggnog
name = "eggnog carton"
icon_state = "cream"
desc = "A beverage, made out of egg, sugar alcohol and in this case, cream."
desc_extended = "Eggnog, also called Egg flip, is an alcoholic beverage, made out of egg, milk or cream, sugar and alcohol. Eggnog is by principle a longdrink and they can be served \
hot or cold. Originally it was served in winter and hot. Every serving uses one egg. It is a classic Christmas beverage, loved by every species, universe-wide. Or so you heard."
reagents_to_add = list(/singleton/reagent/alcohol/eggnog = 100)

//small carton

/obj/item/reagent_containers/food/drinks/milk
name = "small milk carton"
desc = "It's milk. White and nutritious goodness!"
reagents_to_add = list(/singleton/reagent/drink/milk = 20)
icon_state = "mini-milk"
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
volume = 30
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'

/obj/item/reagent_containers/food/drinks/milk/choco
name = "small chocolate milk carton"
desc = "It's milk. This one is in delicious chocolate flavor."
icon_state = "mini-milk_choco"
reagents_to_add = list(/singleton/reagent/drink/milk/chocolate = 20)
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
volume = 30
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'

/obj/item/reagent_containers/food/drinks/milk/strawberry
name = "small strawberry milk carton"
desc = "It's milk. This one is in delicious strawberry flavor."
icon_state = "mini-milk_strawberry"
reagents_to_add = list(/singleton/reagent/drink/milk/strawberry = 20)
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
volume = 30
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'

///////////////////////////////////////////////Drinks
//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
Expand Down
113 changes: 0 additions & 113 deletions code/modules/reagents/reagent_containers/food/drinks/carton.dm
Original file line number Diff line number Diff line change
@@ -1,113 +0,0 @@
/obj/item/reagent_containers/food/drinks/carton
name = "carton"
desc = "An abstract way to organize bottles that are really cartons. Finally!"
icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
icon_state = "carton"
item_state = "carton" //dear contributors, item_state handles inhands and onmob sprites. do not touch if you do not have added/changed the inhands. thanks. -wezzy
volume = 100
center_of_mass = list("x"=16, "y"=6)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'

/obj/item/reagent_containers/food/drinks/carton/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
reagents_to_add = list(/singleton/reagent/drink/milk = 50)

/obj/item/reagent_containers/food/drinks/carton/soymilk
name = "soymilk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
reagents_to_add = list(/singleton/reagent/drink/milk/soymilk = 50)

/obj/item/reagent_containers/food/drinks/carton/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
reagents_to_add = list(/singleton/reagent/drink/orangejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
reagents_to_add = list(/singleton/reagent/drink/milk/cream = 100)

/obj/item/reagent_containers/food/drinks/carton/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
reagents_to_add = list(/singleton/reagent/drink/tomatojuice = 100)

/obj/item/reagent_containers/food/drinks/carton/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
icon_state = "limejuice"
reagents_to_add = list(/singleton/reagent/drink/limejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/lemonjuice
name = "lemon juice"
desc = "This juice is VERY sour."
icon_state = "lemoncarton"
reagents_to_add = list(/singleton/reagent/drink/lemonjuice = 100)

/obj/item/reagent_containers/food/drinks/carton/dynjuice
name = "dyn juice"
desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
icon_state = "dyncarton"
reagents_to_add = list(/singleton/reagent/drink/dynjuice = 100)

/obj/item/reagent_containers/food/drinks/carton/applejuice
name = "apple juice"
desc = "Juice from an apple. Yes."
icon_state = "applejuice"
reagents_to_add = list(/singleton/reagent/drink/applejuice = 100)

/obj/item/reagent_containers/food/drinks/carton/fatshouters
name = "fatshouters milk carton"
desc = "Fatty fatshouters milk in a carton."
reagents_to_add = list(/singleton/reagent/drink/milk/adhomai = 100)

/obj/item/reagent_containers/food/drinks/carton/mutthir
name = "mutthir carton"
icon_state = "mutthir"
desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
desc_extended = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
were quick to adopt the drink to their diet."
reagents_to_add = list(/singleton/reagent/drink/milk/adhomai/mutthir = 100)

/obj/item/reagent_containers/food/drinks/carton/eggnog
name = "eggnog carton"
icon_state = "cream"
desc = "A beverage, made out of egg, sugar alcohol and in this case, cream."
desc_extended = "Eggnog, also called Egg flip, is an alcoholic beverage, made out of egg, milk or cream, sugar and alcohol. Eggnog is by principle a longdrink and they can be served \
hot or cold. Originally it was served in winter and hot. Every serving uses one egg. It is a classic Christmas beverage, loved by every species, universe-wide. Or so you heard."
reagents_to_add = list(/singleton/reagent/alcohol/eggnog = 100)

//small carton

/obj/item/reagent_containers/food/drinks/carton/small
name = "small_carton"
icon_state = "mini-milk"
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
volume = 30

/obj/item/reagent_containers/food/drinks/carton/small/milk
name = "small milk carton"
desc = "It's milk. White and nutritious goodness!"
reagents_to_add = list(/singleton/reagent/drink/milk = 20)

/obj/item/reagent_containers/food/drinks/carton/small/milk/choco
name = "small chocolate milk carton"
desc = "It's milk. This one is in delicious chocolate flavor."
icon_state = "mini-milk_choco"
reagents_to_add = list(/singleton/reagent/drink/milk/chocolate = 20)

/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry
name = "small strawberry milk carton"
desc = "It's milk. This one is in delicious strawberry flavor."
icon_state = "mini-milk_strawberry"
reagents_to_add = list(/singleton/reagent/drink/milk/strawberry = 20)
6 changes: 3 additions & 3 deletions code/modules/reagents/reagent_containers/food/lunch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ var/list/lunchables_drinks_ = list(
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda,
/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water,
/obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz,
/obj/item/reagent_containers/food/drinks/carton/small/milk,
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco,
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk/choco,
/obj/item/reagent_containers/food/drinks/milk/strawberry,
/obj/item/reagent_containers/food/drinks/cans/melon_soda
)

Expand Down
10 changes: 5 additions & 5 deletions maps/aurora/aurora-1_centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11539,10 +11539,10 @@
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
/turf/unsimulated/floor{
icon_state = "lino_diamond"
},
Expand Down Expand Up @@ -37191,7 +37191,7 @@
},
/area/shuttle/escape)
"uql" = (
/obj/item/reagent_containers/food/drinks/carton/soymilk{
/obj/item/reagent_containers/food/drinks/soymilk{
pixel_x = 6;
pixel_y = 12
},
Expand Down
8 changes: 4 additions & 4 deletions maps/aurora/aurora-4_mainlevel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -49668,10 +49668,10 @@
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/structure/extinguisher_cabinet/east{
pixel_y = -1
},
Expand Down
Loading

0 comments on commit 5b238c7

Please sign in to comment.