diff options
45 files changed, 49 insertions, 49 deletions
diff --git a/graphics/items/use/food/acorn.png b/graphics/items/use/food/acorn.png Binary files differindex acf6f919..5c5311c2 100644 --- a/graphics/items/use/food/acorn.png +++ b/graphics/items/use/food/acorn.png diff --git a/graphics/items/use/food/acornroasted.png b/graphics/items/use/food/acornroasted.png Binary files differindex 1a279b8c..5a89a066 100644 --- a/graphics/items/use/food/acornroasted.png +++ b/graphics/items/use/food/acornroasted.png diff --git a/graphics/items/use/food/apple.png b/graphics/items/use/food/apple.png Binary files differindex b2fc3d53..3b7a1e69 100644 --- a/graphics/items/use/food/apple.png +++ b/graphics/items/use/food/apple.png diff --git a/graphics/items/use/food/beer.png b/graphics/items/use/food/beer.png Binary files differindex b80ad2f5..767386a1 100644 --- a/graphics/items/use/food/beer.png +++ b/graphics/items/use/food/beer.png diff --git a/graphics/items/use/food/bigcake.png b/graphics/items/use/food/bigcake.png Binary files differindex 7cc92b53..faab6622 100644 --- a/graphics/items/use/food/bigcake.png +++ b/graphics/items/use/food/bigcake.png diff --git a/graphics/items/use/food/blueberries.png b/graphics/items/use/food/blueberries.png Binary files differindex e96f399f..b1f4265e 100644 --- a/graphics/items/use/food/blueberries.png +++ b/graphics/items/use/food/blueberries.png diff --git a/graphics/items/use/food/cake.png b/graphics/items/use/food/cake.png Binary files differindex 21b90867..ed7a3e20 100644 --- a/graphics/items/use/food/cake.png +++ b/graphics/items/use/food/cake.png diff --git a/graphics/items/use/food/candy.png b/graphics/items/use/food/candy.png Binary files differindex e3d75c21..dbf7c52d 100644 --- a/graphics/items/use/food/candy.png +++ b/graphics/items/use/food/candy.png diff --git a/graphics/items/use/food/candycane.png b/graphics/items/use/food/candycane.png Binary files differindex 67b7d946..a0243106 100644 --- a/graphics/items/use/food/candycane.png +++ b/graphics/items/use/food/candycane.png diff --git a/graphics/items/use/food/candypumpkin.png b/graphics/items/use/food/candypumpkin.png Binary files differindex c5b40eaf..b7aa2068 100644 --- a/graphics/items/use/food/candypumpkin.png +++ b/graphics/items/use/food/candypumpkin.png diff --git a/graphics/items/use/food/caramelapple.png b/graphics/items/use/food/caramelapple.png Binary files differindex 637bed4d..4afef801 100644 --- a/graphics/items/use/food/caramelapple.png +++ b/graphics/items/use/food/caramelapple.png diff --git a/graphics/items/use/food/cherry.png b/graphics/items/use/food/cherry.png Binary files differindex 4ccda9b2..1aae9307 100644 --- a/graphics/items/use/food/cherry.png +++ b/graphics/items/use/food/cherry.png diff --git a/graphics/items/use/food/cherrycake.png b/graphics/items/use/food/cherrycake.png Binary files differindex 50a05824..b4f9e009 100644 --- a/graphics/items/use/food/cherrycake.png +++ b/graphics/items/use/food/cherrycake.png diff --git a/graphics/items/use/food/chickenleg.png b/graphics/items/use/food/chickenleg.png Binary files differindex 1031a3b5..683c027f 100644 --- a/graphics/items/use/food/chickenleg.png +++ b/graphics/items/use/food/chickenleg.png diff --git a/graphics/items/use/food/chocolatebar.png b/graphics/items/use/food/chocolatebar.png Binary files differindex 7ba87bfe..e1494010 100644 --- a/graphics/items/use/food/chocolatebar.png +++ b/graphics/items/use/food/chocolatebar.png diff --git a/graphics/items/use/food/decorcandy.png b/graphics/items/use/food/decorcandy.png Binary files differindex a148ed31..cf361088 100644 --- a/graphics/items/use/food/decorcandy.png +++ b/graphics/items/use/food/decorcandy.png diff --git a/graphics/items/use/food/easteregg.png b/graphics/items/use/food/easteregg.png Binary files differindex b6c0f447..3d073da3 100644 --- a/graphics/items/use/food/easteregg.png +++ b/graphics/items/use/food/easteregg.png diff --git a/graphics/items/use/food/gingerbreadman.png b/graphics/items/use/food/gingerbreadman.png Binary files differindex 14972c99..8b85da6e 100644 --- a/graphics/items/use/food/gingerbreadman.png +++ b/graphics/items/use/food/gingerbreadman.png diff --git a/graphics/items/use/food/honey.png b/graphics/items/use/food/honey.png Binary files differindex 8a4d5e35..93485163 100644 --- a/graphics/items/use/food/honey.png +++ b/graphics/items/use/food/honey.png diff --git a/graphics/items/use/food/jello.png b/graphics/items/use/food/jello.png Binary files differindex fc91ece6..9d0fa76a 100644 --- a/graphics/items/use/food/jello.png +++ b/graphics/items/use/food/jello.png diff --git a/graphics/items/use/food/jellyskull.png b/graphics/items/use/food/jellyskull.png Binary files differindex bfdd49c8..24b3c361 100644 --- a/graphics/items/use/food/jellyskull.png +++ b/graphics/items/use/food/jellyskull.png diff --git a/graphics/items/use/food/juice.png b/graphics/items/use/food/juice.png Binary files differindex b21e7ce2..8e527ddc 100644 --- a/graphics/items/use/food/juice.png +++ b/graphics/items/use/food/juice.png diff --git a/graphics/items/use/food/lady-fingers.png b/graphics/items/use/food/lady-fingers.png Binary files differindex 9c8cc3b9..69a69587 100644 --- a/graphics/items/use/food/lady-fingers.png +++ b/graphics/items/use/food/lady-fingers.png diff --git a/graphics/items/use/food/lollipop.png b/graphics/items/use/food/lollipop.png Binary files differindex 97e99061..7cca0014 100644 --- a/graphics/items/use/food/lollipop.png +++ b/graphics/items/use/food/lollipop.png diff --git a/graphics/items/use/food/lollipop2.png b/graphics/items/use/food/lollipop2.png Binary files differindex bafcacb7..ac932a0a 100644 --- a/graphics/items/use/food/lollipop2.png +++ b/graphics/items/use/food/lollipop2.png diff --git a/graphics/items/use/food/marshmallow.png b/graphics/items/use/food/marshmallow.png Binary files differindex 91cf206b..7b7bcc38 100644 --- a/graphics/items/use/food/marshmallow.png +++ b/graphics/items/use/food/marshmallow.png diff --git a/graphics/items/use/food/milk.png b/graphics/items/use/food/milk.png Binary files differindex 59466865..a953221d 100644 --- a/graphics/items/use/food/milk.png +++ b/graphics/items/use/food/milk.png diff --git a/graphics/items/use/food/orange.png b/graphics/items/use/food/orange.png Binary files differindex 48435f48..a96b790a 100644 --- a/graphics/items/use/food/orange.png +++ b/graphics/items/use/food/orange.png diff --git a/graphics/items/use/food/orangecupcake.png b/graphics/items/use/food/orangecupcake.png Binary files differindex ea9da086..b8cfe2dd 100644 --- a/graphics/items/use/food/orangecupcake.png +++ b/graphics/items/use/food/orangecupcake.png diff --git a/graphics/items/use/food/pear.png b/graphics/items/use/food/pear.png Binary files differindex 080d1720..e7224ff6 100644 --- a/graphics/items/use/food/pear.png +++ b/graphics/items/use/food/pear.png diff --git a/graphics/items/use/food/pickled_beets.png b/graphics/items/use/food/pickled_beets.png Binary files differindex 061c6eb6..8902b831 100644 --- a/graphics/items/use/food/pickled_beets.png +++ b/graphics/items/use/food/pickled_beets.png diff --git a/graphics/items/use/food/plum.png b/graphics/items/use/food/plum.png Binary files differindex b7ac8c21..ee4f7523 100644 --- a/graphics/items/use/food/plum.png +++ b/graphics/items/use/food/plum.png diff --git a/graphics/items/use/food/roastedmaggot.png b/graphics/items/use/food/roastedmaggot.png Binary files differindex 2936c820..183e9f31 100644 --- a/graphics/items/use/food/roastedmaggot.png +++ b/graphics/items/use/food/roastedmaggot.png diff --git a/graphics/items/use/food/shock-candy.png b/graphics/items/use/food/shock-candy.png Binary files differindex f69df9c7..ce658182 100644 --- a/graphics/items/use/food/shock-candy.png +++ b/graphics/items/use/food/shock-candy.png diff --git a/graphics/items/use/food/skull-mug.png b/graphics/items/use/food/skull-mug.png Binary files differindex 7ca071fe..cc5945bc 100644 --- a/graphics/items/use/food/skull-mug.png +++ b/graphics/items/use/food/skull-mug.png diff --git a/graphics/items/use/food/snake-egg.png b/graphics/items/use/food/snake-egg.png Binary files differindex f98d6def..eadb9876 100644 --- a/graphics/items/use/food/snake-egg.png +++ b/graphics/items/use/food/snake-egg.png diff --git a/graphics/items/use/food/snapple.png b/graphics/items/use/food/snapple.png Binary files differindex d5502c50..d5ac642a 100644 --- a/graphics/items/use/food/snapple.png +++ b/graphics/items/use/food/snapple.png diff --git a/graphics/items/use/food/steak.png b/graphics/items/use/food/steak.png Binary files differindex 859600f4..8053dcb5 100644 --- a/graphics/items/use/food/steak.png +++ b/graphics/items/use/food/steak.png diff --git a/graphics/items/use/food/tonoridelight.png b/graphics/items/use/food/tonoridelight.png Binary files differindex c65566d6..9ef73fce 100644 --- a/graphics/items/use/food/tonoridelight.png +++ b/graphics/items/use/food/tonoridelight.png diff --git a/graphics/items/use/food/water.png b/graphics/items/use/food/water.png Binary files differindex 3079db97..0aa606cd 100644 --- a/graphics/items/use/food/water.png +++ b/graphics/items/use/food/water.png diff --git a/graphics/items/use/food/wine.png b/graphics/items/use/food/wine.png Binary files differindex 6b7c49c1..e72be29f 100644 --- a/graphics/items/use/food/wine.png +++ b/graphics/items/use/food/wine.png diff --git a/graphics/items/use/food/xmascake.png b/graphics/items/use/food/xmascake.png Binary files differindex 496e5fea..18bf58c7 100644 --- a/graphics/items/use/food/xmascake.png +++ b/graphics/items/use/food/xmascake.png diff --git a/graphics/items/use/food/xmascandycane.png b/graphics/items/use/food/xmascandycane.png Binary files differindex cf7e9e96..838f790b 100644 --- a/graphics/items/use/food/xmascandycane.png +++ b/graphics/items/use/food/xmascandycane.png @@ -3145,21 +3145,21 @@ weight="2"/> <!-- ID 837 RESERVED - "Witch Root" --> <item id="838" - image="use/food/lollipop2.png|M:#c21439,e81844,ffffff" + image="use/food/lollipop2.png|W:#ff5a7d,ff92a9,ffffff;R:#ff0338" name="Cranberry Lollipop" description="A lollipop with cranberry flavor." type="usable" hp="750" weight="1"/> <item id="839" - image="use/food/lollipop2.png" + image="use/food/lollipop2.png|W:#a32de7,c18fde,ffffff;R:#a200ff" name="Grape Lollipop" description="A lollipop with grape flavor." type="usable" hp="750" weight="1"/> <item id="840" - image="use/food/lollipop2.png|M:#f4950d,f4be40,ffffff" + image="use/food/lollipop2.png|W:#f4950d,f4be40,ffffff;R:#ff9600" name="Orange Lollipop" description="A lollipop with orange flavor." type="usable" diff --git a/license.txt b/license.txt index 26639566..227b38aa 100644 --- a/license.txt +++ b/license.txt @@ -317,7 +317,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/dry-branch.png (????, Enchilado) (GPLv2) graphics/items/generic/ear-zombie.png (Goku, Enchilado) (GPLv2) graphics/items/generic/easterbasket.png (Salmondine, Enchilado) (GPLv2) - graphics/items/generic/easteregg.png (Crush, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/easteregg.png (Crush, Enchilado, wushin) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/eyeball.png (Yosuhara, Enchilado) (GPLv2) graphics/items/generic/fabric.png (Crush, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/fakefangs.png (????, Enchilado) (GPLv2) @@ -410,51 +410,51 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/yeti-claw.png (Nami, Enchilado) (GPLv2), (CC BY-SA 3.0) ## Use ### Food - graphics/items/use/food/acorn.png (Meway) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/acornroasted.png (Nami, V0id) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/apple.png (????) (GPLv2) - graphics/items/use/food/beer.png (????) (GPLv2) - graphics/items/use/food/bigcake.png (Freeyorp101, Kr0n05931) (GPLv2) - graphics/items/use/food/blueberries.png (Meway) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/cake.png (????) (GPLv2) - graphics/items/use/food/candy.png (Kekskiller) (GPLv2) - graphics/items/use/food/candycane.png (Kekskiller) (GPLv2) - graphics/items/use/food/candypumpkin.png (????) (GPLv2) - graphics/items/use/food/caramelapple.png (????) (GPLv2) - graphics/items/use/food/cherry.png (Alige, Len) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/cherrycake.png (????) (GPLv2) - graphics/items/use/food/chickenleg.png (Modanung) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/chocolatebar.png (Kinwa) (GPLv2) - graphics/items/use/food/decorcandy.png (????) (GPLv2) - graphics/items/use/food/easteregg.png (????) (GPLv2) - graphics/items/use/food/gingerbreadman.png (Kekskiller) (GPLv2) - graphics/items/use/food/golden-apple.png (????) (GPLv2) - graphics/items/use/food/honey.png (????) (GPLv2) - graphics/items/use/food/jello.png (Nmaligec, Salmondine) (GPLv2) - graphics/items/use/food/jellyskull.png (????) (GPLv2) - graphics/items/use/food/juice.png (Nmaligec, Skipy) (GPLv2) - graphics/items/use/food/lady-fingers.png (ChefChelios) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/lollipop.png (????, Wombat) (GPLv2) - graphics/items/use/food/lollipop2.png (Lizandra) (GPLv2) - graphics/items/use/food/marshmallow.png (????) (GPLv2) - graphics/items/use/food/milk.png (????) (GPLv2) - graphics/items/use/food/orange.png (EJlol) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/orangecupcake.png (????) (GPLv2) - graphics/items/use/food/pear.png (????) (GPLv2) - graphics/items/use/food/pickled_beets.png (Nami) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/plum.png (Alige, Meway) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/roastedmaggot.png (????) (GPLv2) - graphics/items/use/food/shock-candy.png (Kekskiller) (GPLv2) - graphics/items/use/food/skull-mug.png (????) (GPLv2) - graphics/items/use/food/snake-egg.png (Fate) (GPLv2) - graphics/items/use/food/snapple.png (Nmaligec, Salmondine) (GPLv2) - graphics/items/use/food/steak.png (Otacke) (GPLv2) - graphics/items/use/food/tonoridelight.png (Meway) (GPLv2) - graphics/items/use/food/water.png (FotherJ) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/wine.png (Nmaligec, Salmondine) (GPLv2) - graphics/items/use/food/xmascake.png (????) (GPLv2) - graphics/items/use/food/xmascandycane.png (????) (GPLv2) - graphics/items/use/food/zombie-nachos.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/acorn.png (Meway, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/acornroasted.png (Nami, V0id, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/apple.png (????, Enchilado) (GPLv2) + graphics/items/use/food/beer.png (????, Enchilado) (GPLv2) + graphics/items/use/food/bigcake.png (Freeyorp101, Kr0n05931, Enchilado) (GPLv2) + graphics/items/use/food/blueberries.png (Meway, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/cake.png (????, Enchilado) (GPLv2) + graphics/items/use/food/candy.png (Kekskiller, Enchilado) (GPLv2) + graphics/items/use/food/candycane.png (Kekskiller, Enchilado) (GPLv2) + graphics/items/use/food/candypumpkin.png (????, Enchilado) (GPLv2) + graphics/items/use/food/caramelapple.png (????, Enchilado) (GPLv2) + graphics/items/use/food/cherry.png (Alige, Len, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/cherrycake.png (????, Enchilado) (GPLv2) + graphics/items/use/food/chickenleg.png (Modanung, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/chocolatebar.png (Kinwa, Enchilado) (GPLv2) + graphics/items/use/food/decorcandy.png (????, Enchilado) (GPLv2) + graphics/items/use/food/easteregg.png (????, Enchilado) (GPLv2) + graphics/items/use/food/gingerbreadman.png (Kekskiller, Enchilado) (GPLv2) + graphics/items/use/food/golden-apple.png (????, Enchilado) (GPLv2) + graphics/items/use/food/honey.png (????, Enchilado) (GPLv2) + graphics/items/use/food/jello.png (Nmaligec, Salmondine, Enchilado) (GPLv2) + graphics/items/use/food/jellyskull.png (????, Enchilado) (GPLv2) + graphics/items/use/food/juice.png (Nmaligec, Skipy, Enchilado) (GPLv2) + graphics/items/use/food/lady-fingers.png (ChefChelios, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/lollipop.png (????, Wombat, Enchilado) (GPLv2) + graphics/items/use/food/lollipop2.png (Lizandra, Enchilado, wushin) (GPLv2) + graphics/items/use/food/marshmallow.png (????, Enchilado) (GPLv2) + graphics/items/use/food/milk.png (????, Enchilado) (GPLv2) + graphics/items/use/food/orange.png (EJlol, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/orangecupcake.png (????, Enchilado) (GPLv2) + graphics/items/use/food/pear.png (????, Enchilado) (GPLv2) + graphics/items/use/food/pickled_beets.png (Nami, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/plum.png (Alige, Meway, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/roastedmaggot.png (????, Enchilado) (GPLv2) + graphics/items/use/food/shock-candy.png (Kekskiller, Enchilado) (GPLv2) + graphics/items/use/food/skull-mug.png (????, Enchilado) (GPLv2) + graphics/items/use/food/snake-egg.png (Fate, Enchilado) (GPLv2) + graphics/items/use/food/snapple.png (Nmaligec, Salmondine, Enchilado) (GPLv2) + graphics/items/use/food/steak.png (Otacke, Enchilado) (GPLv2) + graphics/items/use/food/tonoridelight.png (Meway, Enchilado) (GPLv2) + graphics/items/use/food/water.png (FotherJ, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/use/food/wine.png (Nmaligec, Salmondine, Enchilado) (GPLv2) + graphics/items/use/food/xmascake.png (????, Enchilado) (GPLv2) + graphics/items/use/food/xmascandycane.png (????, Enchilado) (GPLv2) + graphics/items/use/food/zombie-nachos.png (FotherJ, Enchilado) (GPLv2), (CC BY-SA 3.0) ### Others graphics/items/use/others/warp-towel.png (Bjorn, ChefChelios) (GPLv2), (CC BY-SA 3.0) ### Potions |
