Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
# Conflicts:
#	Assets/Custom/Door_Ice.png.meta
#	Assets/Custom/Door_Nature.png.meta
#	Assets/Custom/Parchment.png.meta
  • Loading branch information
OctarineSourcerer committed Jan 30, 2016
2 parents 18daa6b + 43bbbf6 commit 0cd91d4
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 16 deletions.
12 changes: 7 additions & 5 deletions Assets/Custom/Door_Ice.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Assets/Custom/Door_Nature.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Assets/Custom/Parchment.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion Assets/Scripts/ReagentList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,23 @@ public class ReagentList {
new Reagent("Flask",
"'I swear, this is water. I guarantee it!' *hic*",
Resources.Load<Sprite>("Item_Flask")),
new Reagent("Rocks",
"A bunch of rocks. Useful for making tools, and hitting someone in the head. Both are equally funny.",
Resources.Load<Sprite>("Item_Rock")),
new Reagent("Battery",
"A very modern invention, harnessing energy in a small, cylindrical container. DO NOT LICK!",
Resources.Load<Sprite>("Item_BatteryBox")),
new Reagent("Dark Beads",
"These orbs contain the very essence of darkness and evil, able to corrupt the minds of lesser men. They are totally not marbles that have painted black. Totally evil marbles…",
Resources.Load<Sprite>("Item_Marbles")),
new Reagent("Leaf",
"A collection of leafs from a multitude of flowers, carefully assembled using your neighbour’s flowerbed that he treated for years. In case of vegetarians attack, throw them at the vegetarian and run.",
Resources.Load<Sprite>("Item_Flower")),
new Reagent("Ice",
"The holy grail of mankind. Cooling drinks, mitigating pain, making people slip, ice is the solution to all of your problems.",
Resources.Load<Sprite>("Item_IceCubeTray"))

};
};

public static List<Reagent> elem = ArrayGenerator.elem;

Expand Down
Binary file added Assets/Sound/Activate.wav
Binary file not shown.
Binary file added Assets/Sound/Break.wav
Binary file not shown.

0 comments on commit 0cd91d4

Please sign in to comment.