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

Standardizes casing on drinks.

Browse Source
This commit is contained in:
Shadeykins
2019-02-05 19:51:54 -07:00
parent a9e7267994
commit e80ea2bbe9
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+11 -11
View File
@@ -197,13 +197,13 @@
list_reagents = list("coffee" = 30)
/obj/item/reagent_containers/food/drinks/ice
name = "Ice Cup"
name = "ice cup"
desc = "Careful, cold ice, do not chew."
icon_state = "icecup"
list_reagents = list("ice" = 30)
/obj/item/reagent_containers/food/drinks/tea
name = "Duke Purple Tea"
name = "Duke Purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "teacup"
item_state = "coffee"
@@ -215,34 +215,34 @@
reagents.add_reagent("mugwort", 3)
/obj/item/reagent_containers/food/drinks/mugwort
name = "Mugwort Tea"
name = "mugwort tea"
desc = "A bitter herbal tea."
icon_state = "manlydorfglass"
item_state = "coffee"
list_reagents = list("mugwort" = 30)
/obj/item/reagent_containers/food/drinks/h_chocolate
name = "Dutch Hot Coco"
name = "Dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
item_state = "coffee"
list_reagents = list("hot_coco" = 30, "sugar" = 5)
/obj/item/reagent_containers/food/drinks/chocolate
name = "Hot Chocolate"
name = "hot chocolate"
desc = "Made in Space Switzerland."
icon_state = "hot_coco"
item_state = "coffee"
list_reagents = list("chocolate" = 30)
/obj/item/reagent_containers/food/drinks/weightloss
name = "Weight-Loss Shake"
name = "weight-loss shake"
desc = "A shake designed to cause weight loss. The package proudly proclaims that it is 'tapeworm free.'"
icon_state = "weightshake"
list_reagents = list("lipolicide" = 30, "chocolate" = 5)
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
name = "cup ramen"
desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
item_state = "ramen"
@@ -254,7 +254,7 @@
reagents.add_reagent("enzyme", 3)
/obj/item/reagent_containers/food/drinks/chicken_soup
name = "Canned Chicken Soup"
name = "canned chicken soup"
desc = "A delicious and soothing can of chicken noodle soup; just like spessmom used to microwave it."
icon_state = "soupcan"
item_state = "soupcan"
@@ -331,7 +331,7 @@
volume = 50
/obj/item/reagent_containers/food/drinks/flask/lithium
name = "Lithium Flask"
name = "lithium flask"
desc = "A flask with a Lithium Atom symbol on it."
icon = 'icons/obj/custom_items.dmi'
icon_state = "lithiumflask"
@@ -353,13 +353,13 @@
/obj/item/reagent_containers/food/drinks/bag
name = "Drink bag"
name = "drink bag"
desc = "Normally put in wine boxes, or down pants at stadium events."
icon_state = "goonbag"
volume = 70
/obj/item/reagent_containers/food/drinks/bag/goonbag
name = "Goon from a Blue Toolbox special edition"
name = "goon from a Blue Toolbox special edition"
desc = "Wine from the land down under, where the dingos roam and the roos do wander."
icon_state = "goonbag"
list_reagents = list("wine" = 70)
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+8 -8
View File
@@ -192,7 +192,7 @@
list_reagents = list("rum" = 100)
/obj/item/reagent_containers/food/drinks/bottle/holywater
name = "Flask of Holy Water"
name = "flask of holy water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)
@@ -232,8 +232,8 @@
list_reagents = list("wine" = 100)
/obj/item/reagent_containers/food/drinks/bottle/absinthe
name = "Extra-Strong Absinthe"
desc = "A strong alcoholic drink brewed and distributed by REDACTED."
name = "Yellow Marquee Absinthe"
desc = "A strong alcoholic drink brewed and distributed by Yellow Marquee."
icon_state = "absinthebottle"
list_reagents = list("absinthe" = 100)
@@ -252,7 +252,7 @@
//////////////////////////JUICES AND STUFF ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "Orange Juice"
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
item_state = "carton"
@@ -260,7 +260,7 @@
list_reagents = list("orangejuice" = 100)
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
item_state = "carton"
@@ -268,7 +268,7 @@
list_reagents = list("cream" = 100)
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "Tomato Juice"
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
item_state = "carton"
@@ -276,7 +276,7 @@
list_reagents = list("tomatojuice" = 100)
/obj/item/reagent_containers/food/drinks/bottle/limejuice
name = "Lime Juice"
name = "lime juice"
desc = "Sweet-sour goodness."
icon_state = "limejuice"
item_state = "carton"
@@ -284,7 +284,7 @@
list_reagents = list("limejuice" = 100)
/obj/item/reagent_containers/food/drinks/bottle/milk
name = "Milk"
name = "milk"
desc = "Soothing milk."
icon_state = "milk"
item_state = "carton"
code/modules/food_and_drinks/drinks/drinks/cans.dm
+6 -6
View File
@@ -59,34 +59,34 @@
return ..(target, user, proximity)
/obj/item/reagent_containers/food/drinks/cans/cola
name = "Space Cola"
name = "space cola"
desc = "Cola. in space."
icon_state = "cola"
list_reagents = list("cola" = 30)
/obj/item/reagent_containers/food/drinks/cans/beer
name = "Space Beer"
name = "space beer"
desc = "Contains only water, malt and hops."
icon_state = "beer"
is_glass = 1
list_reagents = list("beer" = 30)
/obj/item/reagent_containers/food/drinks/cans/adminbooze
name = "Admin Booze"
name = "admin booze"
desc = "Bottled Griffon tears. Drink with caution."
icon_state = "adminbooze"
is_glass = 1
list_reagents = list("adminordrazine" = 5, "capsaicin" = 5, "methamphetamine"= 20, "thirteenloko" = 20)
/obj/item/reagent_containers/food/drinks/cans/madminmalt
name = "Madmin Malt"
name = "madmin malt"
desc = "Bottled essence of angry admins. Drink with <i>EXTREME</i> caution."
icon_state = "madminmalt"
is_glass = 1
list_reagents = list("hell_water" = 20, "neurotoxin" = 15, "thirteenloko" = 15)
/obj/item/reagent_containers/food/drinks/cans/badminbrew
name = "Badmin Brew"
name = "badmin brew"
desc = "Bottled trickery and terrible admin work. Probably shouldn't drink this one at all."
icon_state = "badminbrew"
is_glass = 1
@@ -156,7 +156,7 @@
list_reagents = list("tonic" = 50)
/obj/item/reagent_containers/food/drinks/cans/sodawater
name = "Soda Water"
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
icon_state = "sodawater"
list_reagents = list("sodawater" = 50)