Merge branch 'master' into upstream-merge-32188

code/modules/hydroponics/beekeeping/honeycomb.dm

@@ -5,7 +5,7 @@
 	icon = 'icons/obj/hydroponics/harvest.dmi'
 	icon_state = "honeycomb"
 	possible_transfer_amounts = list()
-	spillable = 0
+	spillable = FALSE
 	disease_amount = 0
 	volume = 10
 	amount_per_transfer_from_this = 0

code/modules/hydroponics/plant_genes.dm

@@ -375,7 +375,7 @@
 				pocell.maxcharge *= CG.rate*1000
 			pocell.charge = pocell.maxcharge
 			pocell.name = "[G.name] battery"
-			pocell.desc = "A rechargeable plant based power cell. This one has a power rating of [pocell.maxcharge], and you should not swallow it."
+			pocell.desc = "A rechargeable plant based power cell. This one has a power rating of [DisplayPower(pocell.maxcharge)], and you should not swallow it."
 
 			if(G.reagents.has_reagent("plasma", 2))
 				pocell.rigged = 1