mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 05:51:56 +01:00
Fixes some issues with new Hydro.
This commit is contained in:
@@ -1212,8 +1212,6 @@ datum/preferences
|
||||
var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in valid_facialhairstyles
|
||||
if(new_f_style)
|
||||
f_style = new_f_style
|
||||
if(organ_data[third_limb] == "amputated")
|
||||
organ_data[third_limb] = null
|
||||
|
||||
if("underwear")
|
||||
var/list/underwear_options
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
"cryoxadone" = list( 3, 0, 0 ),
|
||||
"ammonia" = list( 0.5, 0, 0 ),
|
||||
"diethylamine" = list( 1, 0, 0 ),
|
||||
"nutriment" = list( 0.5, 1, 0 ),
|
||||
"nutriment" = list( 0.5, 0.1, 0 ),
|
||||
"radium" = list( -1.5, 0, 0.2 ),
|
||||
"adminordrazine" = list( 1, 1, 1 ),
|
||||
"robustharvest" = list( 0, 0.2, 0 ),
|
||||
@@ -242,7 +242,7 @@
|
||||
if(seed.exude_gasses && seed.exude_gasses.len)
|
||||
for(var/gas in seed.exude_gasses)
|
||||
environment.adjust_gas(gas, max(1,round((seed.exude_gasses[gas]*seed.potency)/seed.exude_gasses.len)))
|
||||
|
||||
|
||||
// If we're attached to a pipenet, then we should let the pipenet know we might have modified some gasses
|
||||
if (closed_system && connected_port)
|
||||
update_connected_network()
|
||||
@@ -302,7 +302,7 @@
|
||||
lastproduce = age
|
||||
|
||||
if(prob(3)) // On each tick, there's a chance the pest population will increase
|
||||
pestlevel += 1 * HYDRO_SPEED_MULTIPLIER
|
||||
pestlevel += 0.1 * HYDRO_SPEED_MULTIPLIER
|
||||
|
||||
check_level_sanity()
|
||||
update_icon()
|
||||
@@ -326,9 +326,9 @@
|
||||
if(toxic_reagents[R.id])
|
||||
toxins += toxic_reagents[R.id] * reagent_total
|
||||
if(weedkiller_reagents[R.id])
|
||||
weedlevel += weedkiller_reagents[R.id] * reagent_total
|
||||
weedlevel -= weedkiller_reagents[R.id] * reagent_total
|
||||
if(pestkiller_reagents[R.id])
|
||||
pestlevel += pestkiller_reagents[R.id] * reagent_total
|
||||
pestlevel -= pestkiller_reagents[R.id] * reagent_total
|
||||
|
||||
// Beneficial reagents have a few impacts along with health buffs.
|
||||
if(beneficial_reagents[R.id])
|
||||
|
||||
@@ -188,26 +188,35 @@ proc/populate_seed_list()
|
||||
|
||||
if(gene.values.len < 6) return
|
||||
|
||||
yield = round(yield*0.5)
|
||||
endurance = round(endurance*0.5)
|
||||
yield = round(yield*0.8)
|
||||
endurance = round(endurance*0.8)
|
||||
lifespan = round(lifespan*0.8)
|
||||
|
||||
if(!products) products = list()
|
||||
products |= gene.values[1]
|
||||
|
||||
if(!chems) chems = list()
|
||||
for(var/rid in gene.values[2])
|
||||
var/existing_chem
|
||||
for(var/chem in chems)
|
||||
if(rid == chem)
|
||||
existing_chem = 1
|
||||
break
|
||||
|
||||
if(existing_chem)
|
||||
chems[rid][1] = max(1,round((chems[rid][1]+gene.values[2][rid][1])/2))
|
||||
chems[rid][2] = max(1,round((chems[rid][2]+gene.values[2][rid][2])/2))
|
||||
var/list/gene_value = gene.values[2]
|
||||
for(var/rid in gene_value)
|
||||
|
||||
var/list/gene_chem = gene_value[rid]
|
||||
|
||||
if(chems[rid])
|
||||
|
||||
var/list/chem_value = chems[rid]
|
||||
|
||||
chems[rid][1] = max(1,round((gene_chem[1] + chem_value[1])/2))
|
||||
|
||||
if(gene_chem.len > 1)
|
||||
if(chem_value > 1)
|
||||
chems[rid][2] = max(1,round((gene_chem[2] + chem_value[2])/2))
|
||||
else
|
||||
chems[rid][2] = gene_chem[2]
|
||||
|
||||
else
|
||||
chems[rid] = gene.values[2][rid]
|
||||
var/list/new_chem = gene_chem[rid]
|
||||
chems[rid] = new_chem.Copy()
|
||||
|
||||
var/list/new_gasses = gene.values[3]
|
||||
if(istype(new_gasses))
|
||||
@@ -375,7 +384,7 @@ proc/populate_seed_list()
|
||||
yield_mod = 0
|
||||
total_yield = yield
|
||||
else
|
||||
total_yield = max(1,rand(yield_mod,yield_mod+yield))
|
||||
total_yield = yield + rand(yield_mod)
|
||||
|
||||
currently_querying = list()
|
||||
for(var/i = 0;i<total_yield;i++)
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
del src
|
||||
|
||||
/obj/effect/plantsegment/proc/die()
|
||||
if(seed && harvest)
|
||||
if(seed && harvest && rand(5))
|
||||
seed.harvest(src,1)
|
||||
del(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user