Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed

code/modules/hydroponics/plant_genes.dm

@@ -181,10 +181,6 @@
 	examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
 	origin_tech = list("biotech" = 5)
 
-/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
-	G.squash(target)
-
-
 /datum/plant_gene/trait/slip
 	// Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
 	// Applies other trait effects (teleporting, etc) to the target by on_slip.
@@ -321,7 +317,7 @@
 	G.reagents.maximum_volume *= rate
 
 /datum/plant_gene/trait/repeated_harvest
-	name = "perennial growth"
+	name = "Perennial Growth"
 
 /datum/plant_gene/trait/repeated_harvest/can_add(obj/item/seeds/S)
 	if(!..())
@@ -331,7 +327,7 @@
 	return TRUE
 
 /datum/plant_gene/trait/battery
-	name = "capacitive cellular production"
+	name = "Capacitive Cell Production"
 
 /datum/plant_gene/trait/battery/on_attackby(obj/item/weapon/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
 	if(istype(I, /obj/item/stack/cable_coil))
@@ -359,7 +355,7 @@
 
 
 /datum/plant_gene/trait/stinging
-	name = "hypodermic prickles"
+	name = "Hypodermic Prickles"
 
 /datum/plant_gene/trait/stinging/on_throw_impact(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
 	if(isliving(target) && G.reagents && G.reagents.total_volume)
@@ -376,10 +372,10 @@
 	trait_id = "plant_type"
 
 /datum/plant_gene/trait/plant_type/weed_hardy
-	name = "Robust Species"
+	name = "Weed Adaptation"
 
 /datum/plant_gene/trait/plant_type/fungal_metabolism
 	name = "Fungal Vitality"
 
 /datum/plant_gene/trait/plant_type/alien_properties
-	name ="?????"
+	name ="?????"