From 2cc0e8ee6c2c6d523211ef47541ce76af8e4e733 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 16 Jan 2020 21:17:43 -0700
Subject: [PATCH] k

---
 code/modules/reagents/chemistry/reagents/other_reagents.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 994b3f0a97..f81b31af72 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -459,17 +459,10 @@
 		M.AdjustKnockdown(10, FALSE)
 		M.adjustStaminaLoss(15, FALSE)
 	else
-<<<<<<< HEAD
 		M.adjustToxLoss(3, FALSE)
 		M.adjustOxyLoss(2, FALSE)
 		M.adjustStaminaLoss(10, FALSE)
-		holder.remove_reagent(id, 1)
-=======
-		M.adjustToxLoss(3, 0)
-		M.adjustOxyLoss(2, 0)
-		M.adjustStaminaLoss(10, 0)
 		holder.remove_reagent(type, 1)
->>>>>>> citadel/master
 	return TRUE
 
 //We only get 30u to start with...