mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Some hydro bugfixes. You can now extract seeds from nettles.
As they were of different object type, extractor didn't work with them. Also adjusted poison effect a bit. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@78 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -645,7 +645,7 @@
|
|||||||
|
|
||||||
|
|
||||||
C.eye_blurry += poison_temp
|
C.eye_blurry += poison_temp
|
||||||
C.make_dizzy(10*poison_temp)
|
C.make_dizzy(5*poison_temp)
|
||||||
spawn()
|
spawn()
|
||||||
for(poison_temp, poison_temp>0, 1) // Poison does 10 damage per tick
|
for(poison_temp, poison_temp>0, 1) // Poison does 10 damage per tick
|
||||||
sleep(100) // Every 10 seconds
|
sleep(100) // Every 10 seconds
|
||||||
@@ -787,7 +787,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
/// Snacks. END
|
/// FOOD END
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@@ -384,6 +384,7 @@
|
|||||||
var/plant_type = 0
|
var/plant_type = 0
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
|
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
|
||||||
|
seed = "/obj/item/seeds/berryseed"
|
||||||
name = "Berries"
|
name = "Berries"
|
||||||
desc = "Nutritious!"
|
desc = "Nutritious!"
|
||||||
icon_state = "berrypile"
|
icon_state = "berrypile"
|
||||||
@@ -391,6 +392,7 @@
|
|||||||
heal_amt = 3
|
heal_amt = 3
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
|
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
|
||||||
|
seed = "/obj/item/seeds/chiliseed"
|
||||||
name = "Chili"
|
name = "Chili"
|
||||||
desc = "Spicy!"
|
desc = "Spicy!"
|
||||||
icon_state = "chilipepper"
|
icon_state = "chilipepper"
|
||||||
@@ -400,6 +402,7 @@
|
|||||||
potency = 20
|
potency = 20
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
|
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
|
||||||
|
seed = "/obj/item/seeds/eggplantseed"
|
||||||
name = "Eggplant"
|
name = "Eggplant"
|
||||||
desc = "Yum!"
|
desc = "Yum!"
|
||||||
icon_state = "eggplant"
|
icon_state = "eggplant"
|
||||||
@@ -407,6 +410,7 @@
|
|||||||
heal_amt = 5
|
heal_amt = 5
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
|
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
|
||||||
|
seed = "/obj/item/seeds/soyaseed"
|
||||||
name = "Soybeans"
|
name = "Soybeans"
|
||||||
desc = "Pretty bland, but the possibilities..."
|
desc = "Pretty bland, but the possibilities..."
|
||||||
icon_state = "soybeans"
|
icon_state = "soybeans"
|
||||||
@@ -414,6 +418,7 @@
|
|||||||
heal_amt = 2
|
heal_amt = 2
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
|
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
|
||||||
|
seed = "/obj/item/seeds/tomatoseed"
|
||||||
name = "Tomato"
|
name = "Tomato"
|
||||||
desc = "Tom-mae-to or to-mah-to? You decide."
|
desc = "Tom-mae-to or to-mah-to? You decide."
|
||||||
icon_state = "tomato"
|
icon_state = "tomato"
|
||||||
@@ -421,6 +426,7 @@
|
|||||||
heal_amt = 5
|
heal_amt = 5
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
|
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
|
||||||
|
seed = "/obj/item/seeds/wheatseed"
|
||||||
name = "Wheat"
|
name = "Wheat"
|
||||||
desc = "I wouldn't eat this, unless you're one of those health freaks.."
|
desc = "I wouldn't eat this, unless you're one of those health freaks.."
|
||||||
icon_state = "wheat"
|
icon_state = "wheat"
|
||||||
@@ -428,6 +434,7 @@
|
|||||||
heal_amt = 2
|
heal_amt = 2
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
|
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
|
||||||
|
seed = "/obj/item/seeds/icepepperseed"
|
||||||
name = "Icepepper"
|
name = "Icepepper"
|
||||||
desc = "A mutant strain of chile"
|
desc = "A mutant strain of chile"
|
||||||
icon_state = "icepepper"
|
icon_state = "icepepper"
|
||||||
@@ -437,6 +444,7 @@
|
|||||||
potency = 20
|
potency = 20
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
|
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
|
||||||
|
seed = "/obj/item/seeds/carrotseed"
|
||||||
name = "Carrot"
|
name = "Carrot"
|
||||||
desc = "Good for the eyes!"
|
desc = "Good for the eyes!"
|
||||||
icon_state = "carrot"
|
icon_state = "carrot"
|
||||||
@@ -444,6 +452,7 @@
|
|||||||
heal_amt = 1
|
heal_amt = 1
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/amanita
|
/obj/item/weapon/reagent_containers/food/snacks/grown/amanita
|
||||||
|
seed = "/obj/item/seeds/amanitamycelium"
|
||||||
name = "Fly amanita"
|
name = "Fly amanita"
|
||||||
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
|
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
|
||||||
icon_state = "amanita"
|
icon_state = "amanita"
|
||||||
@@ -453,6 +462,7 @@
|
|||||||
potency = 10
|
potency = 10
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/angel
|
/obj/item/weapon/reagent_containers/food/snacks/grown/angel
|
||||||
|
seed = "/obj/item/seeds/angelmycelium"
|
||||||
name = "Destroying angel"
|
name = "Destroying angel"
|
||||||
desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
|
desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
|
||||||
icon_state = "angel"
|
icon_state = "angel"
|
||||||
@@ -462,6 +472,7 @@
|
|||||||
potency = 35
|
potency = 35
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/libertycap
|
/obj/item/weapon/reagent_containers/food/snacks/grown/libertycap
|
||||||
|
seed = "/obj/item/seeds/libertymycelium"
|
||||||
name = "Liberty cap"
|
name = "Liberty cap"
|
||||||
desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
|
desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
|
||||||
icon_state = "libertycap"
|
icon_state = "libertycap"
|
||||||
@@ -471,6 +482,7 @@
|
|||||||
potency = 15
|
potency = 15
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet
|
/obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet
|
||||||
|
seed = "/obj/item/seeds/plumpmycelium"
|
||||||
name = "Plump Helmet"
|
name = "Plump Helmet"
|
||||||
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
|
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
|
||||||
icon_state = "plumphelmet"
|
icon_state = "plumphelmet"
|
||||||
@@ -478,6 +490,7 @@
|
|||||||
heal_amt = 5
|
heal_amt = 5
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle
|
/obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle
|
||||||
|
seed = "/obj/item/seeds/chantermycelium"
|
||||||
name = "Chanterelle"
|
name = "Chanterelle"
|
||||||
desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty! There's a lot!"
|
desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty! There's a lot!"
|
||||||
icon_state = "chanterelle"
|
icon_state = "chanterelle"
|
||||||
|
|||||||
@@ -1410,6 +1410,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
|||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
plant_type = 1
|
plant_type = 1
|
||||||
|
seed = "/obj/item/seeds/nettleseed"
|
||||||
|
|
||||||
/obj/item/weapon/grown/deathnettle // -- Skie
|
/obj/item/weapon/grown/deathnettle // -- Skie
|
||||||
desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
|
desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
|
||||||
@@ -1424,6 +1425,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
|||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
plant_type = 1
|
plant_type = 1
|
||||||
|
seed = "/obj/item/seeds/deathnettleseed"
|
||||||
|
|
||||||
/obj/item/weapon/plantbgone // -- Skie
|
/obj/item/weapon/plantbgone // -- Skie
|
||||||
desc = "Plant-B-Gone! Kill those pesky weeds!"
|
desc = "Plant-B-Gone! Kill those pesky weeds!"
|
||||||
|
|||||||
@@ -95,6 +95,8 @@ obj/machinery/hydroponics/process()
|
|||||||
while(m_count < src.mutmod)
|
while(m_count < src.mutmod)
|
||||||
if(prob(90))
|
if(prob(90))
|
||||||
src.mutate()
|
src.mutate()
|
||||||
|
else if(prob(30))
|
||||||
|
src.hardmutate()
|
||||||
else
|
else
|
||||||
src.mutatespecie() // Just testing this here until mutagens are in place
|
src.mutatespecie() // Just testing this here until mutagens are in place
|
||||||
m_count++;
|
m_count++;
|
||||||
|
|||||||
@@ -26,4 +26,23 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
|
|||||||
t_prod.potency = F.potency
|
t_prod.potency = F.potency
|
||||||
t_amount++
|
t_amount++
|
||||||
del(O)
|
del(O)
|
||||||
|
|
||||||
|
else if (istype(O, /obj/item/weapon/grown/))
|
||||||
|
var/obj/item/weapon/grown/F = O
|
||||||
|
user << "\blue You extract some seeds from the [F.name]"
|
||||||
|
var/seed = text2path(F.seed)
|
||||||
|
var/t_amount = 0
|
||||||
|
var/t_max = rand(1,4)
|
||||||
|
while ( t_amount < t_max)
|
||||||
|
var/obj/item/seeds/t_prod = new seed(src.loc)
|
||||||
|
t_prod.species = F.species
|
||||||
|
t_prod.lifespan = F.lifespan
|
||||||
|
t_prod.endurance = F.endurance
|
||||||
|
t_prod.maturation = F.maturation
|
||||||
|
t_prod.production = F.production
|
||||||
|
t_prod.yield = F.yield
|
||||||
|
t_prod.potency = F.potency
|
||||||
|
t_amount++
|
||||||
|
del(O)
|
||||||
|
|
||||||
return
|
return
|
||||||
Reference in New Issue
Block a user