Merge pull request #1632 from seb3sec/patch-2

Fix for compile error "Item listed twice..."
This commit is contained in:
vbawol
2015-04-03 22:14:27 -05:00

View File

@@ -75,7 +75,6 @@ class ItemHempSeed: CA_Magazine {
class ItemHempPlant: CA_Magazine { class ItemHempPlant: CA_Magazine {
scope = public; scope = public;
count = 1; count = 1;
type = 256;
displayName = "A Hemp Plant"; displayName = "A Hemp Plant";
descriptionShort = "A Hemp Plant"; descriptionShort = "A Hemp Plant";
weight = 0.1; weight = 0.1;
@@ -90,4 +89,4 @@ class ItemHempPlant: CA_Magazine {
create = "MAP_c_fern"; // TODO: model for Hemp Stage 1 create = "MAP_c_fern"; // TODO: model for Hemp Stage 1
}; };
}; };
}; };