shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update drinks.dm

Browse Source
This commit is contained in:
deathride58
2017-12-08 14:07:33 -05:00
committed by GitHub
parent 10d50dd283
commit 4600a6eb87
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/food_and_drinks/drinks/drinks.dm
View File

@@ -440,15 +440,9 @@
list_reagents = list("lemon_lime" = 30)
foodtype = FRUIT
<<<<<<< HEAD
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
..()
name = "Lemon-Lime Soda"
=======
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
. = ..()
name = "lemon-lime soda"
>>>>>>> eddf889... Merge pull request #33341 from ShizCalev/31-bottles-of-beer
/obj/item/reagent_containers/food/drinks/soda_cans/space_up
name = "Space-Up!"