From d1441f9b2370962ef5b4fbd435c0051e28751475 Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Fri, 16 Feb 2018 13:09:01 +0200
Subject: [PATCH 1/2] Merge pull request #35703 from
 DaedalusGame/ok-sure-why-not

Fixes powercell injecting attaching the wrong value to rigged
---
 code/modules/hydroponics/plant_genes.dm | 2 +-
 code/modules/power/cell.dm              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index e5c5f89ab5..563af7866f 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -362,7 +362,7 @@
 			pocell.desc = "A rechargeable plant-based power cell. This one has a rating of [DisplayEnergy(pocell.maxcharge)], and you should not swallow it."
 
 			if(G.reagents.has_reagent("plasma", 2))
-				pocell.rigged = 1
+				pocell.rigged = TRUE
 
 			qdel(G)
 		else
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index da8608ce9f..c6d3e13359 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -15,7 +15,7 @@
 	var/maxcharge = 1000
 	materials = list(MAT_METAL=700, MAT_GLASS=50)
 	grind_results = list("lithium" = 15, "iron" = 5, "silicon" = 5)
-	var/rigged = 0		// true if rigged to explode
+	var/rigged = FALSE	// true if rigged to explode
 	var/chargerate = 100 //how much power is given every tick in a recharger
 	var/self_recharge = 0 //does it self recharge, over time, or not?
 	var/ratingdesc = TRUE
@@ -104,7 +104,7 @@
 	return (FIRELOSS)
 
 /obj/item/stock_parts/cell/on_reagent_change(changetype)
-	rigged = reagents.has_reagent("plasma", 5)
+	rigged = !isnull(reagents.has_reagent("plasma", 5)) //has_reagent returns the reagent datum
 	..()
 
 
@@ -117,7 +117,7 @@
 	var/light_impact_range = round(sqrt(charge)/30)
 	var/flash_range = light_impact_range
 	if (light_impact_range==0)
-		rigged = 0
+		rigged = FALSE
 		corrupt()
 		return
 	//explosion(T, 0, 1, 2, 2)
@@ -128,7 +128,7 @@
 	charge /= 2
 	maxcharge = max(maxcharge/2, chargerate)
 	if (prob(10))
-		rigged = 1 //broken batterys are dangerous
+		rigged = TRUE //broken batterys are dangerous
 
 /obj/item/stock_parts/cell/emp_act(severity)
 	charge -= 1000 / severity