Merge pull request #3840 from MDReckless/dev

Grape Soda addition
This commit is contained in:
DJSnapshot
2013-10-29 17:06:16 -07:00
4 changed files with 22 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass
name = "glass"
desc = "Your standard drinking glass."
@@ -434,6 +434,10 @@
icon_state = "grapejuice"
name = "Glass of grape juice"
desc = "It's grrrrrape!"
if("grapesoda")
icon_state = "grapesoda"
name = "Can of Grape Soda"
desc = "Looks like a delicious drank!"
if("icetea")
icon_state = "icedteaglass"
name = "Iced Tea"
@@ -499,4 +503,4 @@
New()
..()
reagents.add_reagent("cola", 50)
on_reagent_change()
on_reagent_change()