Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/game/objects/items/robot/robot_upgrades.dm

@@ -1,29 +0,0 @@
-// Citadel's Vtech Controller
-/obj/effect/proc_holder/silicon/cyborg/vtecControl
-	name = "vTec Control"
-	desc = "Allows finer-grained control of the vTec speed boost."
-	action_icon = 'icons/mob/actions.dmi'
-	action_icon_state = "Chevron_State_0"
-
-	var/currentState = 0
-	var/maxReduction = 2
-
-
-/obj/effect/proc_holder/silicon/cyborg/vtecControl/Click(mob/living/silicon/robot/user)
-	var/mob/living/silicon/robot/self = usr
-
-	currentState = (currentState + 1) % 3
-
-	if(usr)
-		switch(currentState)
-			if (0)
-				self.speed = maxReduction
-			if (1)
-				self.speed -= maxReduction*0.5
-			if (2)
-				self.speed -= maxReduction*1.25
-
-	action.button_icon_state = "Chevron_State_[currentState]"
-	action.UpdateButtonIcon()
-
-	return

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -16,7 +16,7 @@
 //When merging two fermichems, see above
 /datum/reagent/fermi/on_merge(data, amount, mob/living/carbon/M, purity)//basically on_mob_add but for merging
 	. = ..()
-	
+
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -331,6 +331,8 @@
 
 //Consumes self on addition and shifts pH
 /datum/reagent/fermi/acidic_buffer/on_new(datapH)
+	if(holder.has_reagent("stabilizing_agent"))
+		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
 		return
@@ -351,6 +353,8 @@
 	can_synth = TRUE
 
 /datum/reagent/fermi/basic_buffer/on_new(datapH)
+	if(holder.has_reagent("stabilizing_agent"))
+		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
 		return