Merge pull request #5375 from Kilmented/master

disables (wild) "medicinal" plants

code/modules/fallout/turf/ground.dm

@@ -93,8 +93,24 @@ GLOBAL_LIST_INIT(medicinal_plant_list, list(
 	/obj/structure/flora/wasteplant/wild_fungus = 2,
 	/obj/structure/flora/wasteplant/wild_agave = 5,
 	/obj/structure/flora/wasteplant/fever_blossom = 8,
+	/obj/structure/flora/wasteplant/tomato = 2,
+	/obj/structure/flora/wasteplant/watermelon =2,
+	/obj/structure/flora/wasteplant/grape = 2,
+	/obj/structure/flora/wasteplant/pumpkin = 2,
+	/obj/structure/flora/wasteplant/corn = 2,
+	/obj/structure/flora/wasteplant/carrot = 2,
+	/obj/structure/flora/wasteplant/berrybush/tinto = 2,
+	/obj/structure/flora/wasteplant/berrybush/amar = 2,
+	/obj/structure/flora/wasteplant/berrybush/azul = 2,
+	/obj/structure/flora/wasteplant/berrybush/majo = 2,
+	/obj/structure/flora/wasteplant/berrybush/narco = 2,
+	/obj/structure/flora/wasteplant/berrybush/zelenyy = 2,
+	/obj/structure/flora/wasteplant/berrybush/marron = 2,
+	/obj/structure/flora/wasteplant/berrybush/corcairghorm = 2,
 	))
 
+// tomatoes and below were added retroactively and were actually in the grass list so their weights are off
+
 GLOBAL_LIST_INIT(grass_plant_list, list(
 	/obj/structure/flora/grass/wasteland = 1400,
 	/obj/structure/flora/branch = 1,
@@ -149,26 +165,11 @@ GLOBAL_LIST_INIT(grass_plant_list, list(
 	/obj/structure/flora/burnedtree1 = 2,
 	/obj/structure/flora/burnedtree2 = 2,
 	/obj/structure/flora/burnedtree5 = 2,
-	/obj/structure/flora/wasteplant/berrybush/tinto = 2,
-	/obj/structure/flora/wasteplant/berrybush/amar = 2,
-	/obj/structure/flora/wasteplant/berrybush/azul = 2,
-	/obj/structure/flora/wasteplant/berrybush/majo = 2,
-	/obj/structure/flora/wasteplant/berrybush/narco = 2,
-	/obj/structure/flora/wasteplant/berrybush/zelenyy = 2,
-	/obj/structure/flora/wasteplant/berrybush/marron = 2,
-	/obj/structure/flora/wasteplant/berrybush/corcairghorm = 2,
 	/obj/structure/flora/wasteplant/sunflower = 2,
 	/obj/structure/flora/wasteplant/rose = 2,
 	/obj/structure/flora/wasteplant/lily = 2,
 	/obj/structure/flora/wasteplant/forgetmenot = 2,
 	/obj/structure/flora/wasteplant/geranium =2,
-	/obj/structure/flora/wasteplant/tomato = 2,
-	/obj/structure/flora/wasteplant/watermelon =2,
-	/obj/structure/flora/wasteplant/grape = 2,
-	/obj/structure/flora/wasteplant/pumpkin = 2,
-	/obj/structure/flora/wasteplant/corn = 2,
-	/obj/structure/flora/wasteplant/carrot = 2
-
 	))
 
 GLOBAL_LIST_INIT(tree_plant_list, list(

modular_coyote/code/modules/turf_changes/PlantGrass.dm

@@ -32,8 +32,8 @@
 		if("plant")
 			thingtype = pickweight(GLOB.plant_type_weighted)
 			switch(thingtype)
-				if("medicinal")
-					randThing = pickweight(GLOB.medicinal_plant_list)
+//				if("medicinal")
+//					randThing = pickweight(GLOB.medicinal_plant_list)
 				if("tree")
 					randThing = pickweight(GLOB.tree_plant_list)
 				if("grass")