yea

shiptest-ss13 · Jun 3, 2024 · 030c155 · 030c155
1 parent 595b01b
commit 030c155
Show file tree

Hide file tree

Showing 3 changed files with 282 additions and 88 deletions.
diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm
@@ -128,9 +128,11 @@
 #define PLANT_GENE_REMOVABLE (1<<0)
 /// Plant genes that can be mutated randomly in strange seeds / due to high instability.
 #define PLANT_GENE_MUTATABLE (1<<1)
-/// Plant genes that can be graftable. Used in formatting text, as they need to be set to be graftable anyways.
-#define PLANT_GENE_GRAFTABLE (1<<2)
-#define PLANT_GENE_EXTRACTABLE (1<<3)
+#define PLANT_GENE_EXTRACTABLE (1<<2)
+
+/// -- Flags for traits. --
+/// Caps the plant's yield at 5 instead of 10.
+#define TRAIT_HALVES_YIELD (1<<0)
 
 //used to determine what rotation mode the ore redemption machine is in
 #define ORM_BOTH 0

diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
@@ -199,7 +199,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))
 					adjustHealth(-1 / rating)
 
 				else