cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

carnivory is visible (#59927)

Browse Source
This commit is contained in:
spessbro
2021-07-04 16:41:52 -07:00
committed by GitHub
parent 31942bda5b
commit 4e891fb72e
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/mushrooms.dm
+3 -3
View File
@@ -205,15 +205,15 @@
endurance = 8
yield = 4
growthstages = 2
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/plant_type/carnivory)
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/carnivory)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
graft_gene = /datum/plant_gene/trait/plant_type/carnivory
graft_gene = /datum/plant_gene/trait/carnivory
/obj/item/seeds/chanter/jupitercup/Initialize(mapload,nogenes)
. = ..()
if(!nogenes)
unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
unset_mutability(/datum/plant_gene/trait/carnivory, PLANT_GENE_REMOVABLE)
/obj/item/food/grown/mushroom/jupitercup
seed = /obj/item/seeds/chanter/jupitercup
code/modules/hydroponics/hydroponics.dm
+3 -3
View File
@@ -208,7 +208,7 @@
//Pests & Weeds//////////////////////////////////////////////////////////
if(pestlevel >= 8)
if(!myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
if(!myseed.get_gene(/datum/plant_gene/trait/carnivory))
if(myseed.potency >=30)
myseed.adjust_potency(-rand(2,6)) //Pests eat leaves and nibble on fruit, lowering potency.
myseed.set_potency(min((myseed.potency), CARNIVORY_POTENCY_MIN, MAX_PLANT_POTENCY))
@@ -217,7 +217,7 @@
adjustPests(-1 / rating)
else if(pestlevel >= 4)
if(!myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
if(!myseed.get_gene(/datum/plant_gene/trait/carnivory))
if(myseed.potency >=30)
myseed.adjust_potency(-rand(1,4))
myseed.set_potency(min((myseed.potency), CARNIVORY_POTENCY_MIN, MAX_PLANT_POTENCY))
@@ -227,7 +227,7 @@
if(prob(50))
adjustPests(-1 / rating)
else if(pestlevel < 4 && myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
else if(pestlevel < 4 && myseed.get_gene(/datum/plant_gene/trait/carnivory))
if(prob(5))
adjustPests(-1 / rating)
code/modules/hydroponics/plant_genes.dm
-3
View File
@@ -939,6 +939,3 @@
/datum/plant_gene/trait/plant_type/alien_properties
name ="?????"
/// Plant doesn't get annoyed by pests in their tray.
/datum/plant_gene/trait/plant_type/carnivory
name = "Obligate Carnivory"
code/modules/hydroponics/unique_plant_genes.dm
+4
View File
@@ -612,3 +612,7 @@
stank.gases[/datum/gas/miasma][MOLES] = (stinky_seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * delta_time // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
stank.temperature = T20C // without this the room would eventually freeze and miasma mining would be easier
tray_turf.assume_air(stank)
/// Plant doesn't get annoyed by pests in their tray.
/datum/plant_gene/trait/carnivory
name = "Obligate Carnivory"