- Fixed issue 810. reagent assignment in the harvested goods is now delayed by 0.5s, so the proc that creates the harvested goods upon harvest actually has the time to set the correct potency value and other values which affect the amount of reagents that harvested goods have.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4476 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-17 14:34:57 +00:00
parent 4ac7df8917
commit ff55c845c1

View File

@@ -1082,6 +1082,7 @@
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1094,6 +1095,7 @@
potency = 30
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("bicaridine", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 3, 1)
@@ -1106,6 +1108,7 @@
potency = 1
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 3, 1)
@@ -1118,6 +1121,7 @@
New()
..()
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
spawn(5) //So potency can be set in the proc that creates these crops
bitesize = reagents.total_volume
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes
@@ -1127,6 +1131,7 @@
icon_state = "grapes"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("sugar", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1139,6 +1144,7 @@
potency = 25
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("kelotane", 3+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1151,6 +1157,7 @@
potency = 25
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = reagents.total_volume
@@ -1161,6 +1168,7 @@
icon_state = "berrypile"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1173,6 +1181,7 @@
icon_state = "glowberrypile"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", round((potency / 10), 1))
reagents.add_reagent("radium", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1198,6 +1207,7 @@
potency = 50
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("coco", 4+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1210,6 +1220,7 @@
potency = 50
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("sugar", 4+round((potency / 5), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries
@@ -1221,6 +1232,7 @@
potency = 15
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("toxin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1234,6 +1246,7 @@
potency = 50
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("toxin", 3+round(potency / 3, 1))
reagents.add_reagent("lexorin", 1+round(potency / 5, 1))
@@ -1247,6 +1260,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("space_drugs", 1+round(potency / 8, 1))
reagents.add_reagent("kelotane", 1+round(potency / 8, 1))
@@ -1262,6 +1276,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("bicaridine", 1+round(potency / 8, 1))
reagents.add_reagent("synaptizine", 1+round(potency / 8, 1))
@@ -1277,6 +1292,7 @@
potency = 15
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1288,6 +1304,7 @@
potency = 15
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("gold", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1306,6 +1323,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 6), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1317,6 +1335,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 6), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1328,6 +1347,7 @@
potency = 20
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1339,6 +1359,7 @@
potency = 20
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1350,6 +1371,7 @@
potency = 20
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1361,6 +1383,7 @@
potency = 15
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("sugar", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1376,6 +1399,7 @@
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("banana", 1+round((potency / 10), 1))
bitesize = 5
src.pixel_x = rand(-5.0, 5)
@@ -1388,6 +1412,7 @@
icon_state = "chilipepper"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
reagents.add_reagent("capsaicin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1404,6 +1429,7 @@
icon_state = "eggplant"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1415,6 +1441,7 @@
icon_state = "soybeans"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1426,6 +1453,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1444,6 +1472,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
if(istype(src.loc,/mob))
@@ -1472,6 +1501,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("blood", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1494,6 +1524,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("lube", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1516,6 +1547,7 @@
icon_state = "wheat"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1527,6 +1559,7 @@
potency = 20
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("frostoil", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1544,6 +1577,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("imidazoline", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1556,6 +1590,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("stoxin", 3+round(potency / 3, 1))
reagents.add_reagent("space_drugs", 1+round(potency / 25, 1))
@@ -1575,6 +1610,7 @@
potency = 10
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("amatoxin", 3+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
@@ -1594,6 +1630,7 @@
potency = 35
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("amatoxin", 13+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
@@ -1613,6 +1650,7 @@
potency = 15
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("psilocybin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1629,6 +1667,7 @@
icon_state = "plumphelmet"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 2+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1639,6 +1678,7 @@
icon_state = "walkingmushroom"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 2+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
if(istype(src.loc,/mob))
@@ -1666,6 +1706,7 @@
icon_state = "chanterelle"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment",1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1676,6 +1717,7 @@
icon_state = "glowshroom"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("radium",1+round((potency / 20), 1))
if(istype(src.loc,/mob))
pickup(src.loc)
@@ -1821,6 +1863,7 @@
seed = "/obj/item/seeds/nettleseed"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("sacid", round(potency, 1))
force = round((5+potency/5), 1)
@@ -1843,6 +1886,7 @@
attack_verb = list("stung")
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("pacid", round(potency, 1))
force = round((5+potency/2.5), 1)
@@ -2082,6 +2126,7 @@
origin_tech = "bluespace=3"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("singulo", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)