From e9b6a16e9d1bc20903ab1f8a58835c3891aba314 Mon Sep 17 00:00:00 2001
From: Alphas00 <154434082+Alphas00@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:30:31 +0200
Subject: [PATCH] Blueberry Pref fix

Fixed issues the Blueberry Inflation preference
---
 .../chemistry/reagents/consumable_reagents.dm | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
index 3d1ce29f..e5fafad3 100644
--- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
@@ -110,21 +110,22 @@
 	value = 10	//it sells. Make that berry factory
 
 /datum/reagent/blueberry_juice/on_mob_life(mob/living/carbon/M)
-	if(M?.client && !(M?.client?.prefs?.blueberry_inflation))
-		M.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume)
-		return
-	if(!no_mob_color)
-		M.add_atom_colour(picked_color, WASHABLE_COLOUR_PRIORITY)
-	M.adjust_fatness(1, FATTENING_TYPE_CHEM)
-	if(prob(2))
-		new /obj/effect/decal/cleanable/juice(M.loc)
-		playsound(M.loc, 'sound/effects/splat.ogg',rand(10,50), 1)
+	if(M?.client)
+		if(!(M?.client?.prefs?.blueberry_inflation))
+			M.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume)
+			return
+		if(!no_mob_color)
+			M.add_atom_colour(picked_color, WASHABLE_COLOUR_PRIORITY)
+		M.adjust_fatness(1, FATTENING_TYPE_CHEM)
+		if(prob(2))
+			new /obj/effect/decal/cleanable/juice(M.loc)
+			playsound(M.loc, 'sound/effects/splat.ogg',rand(10,50), 1)
 	..()
 
 /datum/reagent/blueberry_juice/on_mob_add(mob/living/L, amount)
 	if(iscarbon(L))
 		var/mob/living/carbon/affected_mob = L
-		if(affected_mob?.client && !(affected_mob?.client?.prefs?.blueberry_inflation))
+		if(!affected_mob?.client || !(affected_mob?.client?.prefs?.blueberry_inflation))
 			affected_mob.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume)
 			return
 		picked_color = pick(random_color_list)