From e18aef92e9fba65acffdfd3f1fc0e8048409d1dd Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Fri, 22 Apr 2022 18:41:59 -0400
Subject: [PATCH 1/2] remove workaround chem

---
 code/modules/reagents/reactions/instant/instant_vr.dm | 7 -------
 code/modules/reagents/reagents/medicine_vr.dm         | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 7780e6c59c..4691fd5a4e 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -147,13 +147,6 @@
     inhibitors = list("fluorine" = 0.01)
     result_amount = 1
 
-/decl/chemical_reaction/instant/nutridax
-	name = "Nutridax"
-	id = "nutridax"
-	result = "nutridax"
-	required_reagents = list("oxygen" = 1, "lipozine" = 1, "carbon" = 1)
-	result_amount = 3
-
 ///////////////////////////////////////////////////////////////////////////////////
 /// Vore Drugs
 
diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm
index b62dbc7224..bb345c3f35 100644
--- a/code/modules/reagents/reagents/medicine_vr.dm
+++ b/code/modules/reagents/reagents/medicine_vr.dm
@@ -93,6 +93,7 @@
 /datum/reagent/sleevingcure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.remove_a_modifier_of_type(/datum/modifier/resleeving_sickness)
 	M.remove_a_modifier_of_type(/datum/modifier/faux_resleeving_sickness)
+<<<<<<< HEAD
 */ //CHOMPStation removal end
 
 /datum/reagent/nutridax
@@ -131,3 +132,5 @@
 				R.remove_self(removed * 20)
 			if(istype(R, /datum/reagent/drink))
 				R.remove_self(removed * 30)
+=======
+>>>>>>> 9dbfaba2da... Merge pull request #12812 from KillianKirilenko/kk-rewind

From c4dd51a17bc9dbd5483f5e4b953abc31b4eb0321 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 23 Apr 2022 17:44:38 -0400
Subject: [PATCH 2/2] powder that makes you say yes

---
 code/modules/reagents/reagents/medicine_vr.dm | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm
index bb345c3f35..2d336597fb 100644
--- a/code/modules/reagents/reagents/medicine_vr.dm
+++ b/code/modules/reagents/reagents/medicine_vr.dm
@@ -93,44 +93,4 @@
 /datum/reagent/sleevingcure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.remove_a_modifier_of_type(/datum/modifier/resleeving_sickness)
 	M.remove_a_modifier_of_type(/datum/modifier/faux_resleeving_sickness)
-<<<<<<< HEAD
 */ //CHOMPStation removal end
-
-/datum/reagent/nutridax
-	name = "Nutridax"
-	id = "nutridax"
-	description = "A dieting aid that targets free-floating proteins and sugars."
-	taste_description = "bitterness"
-	reagent_state = SOLID
-	color = "#605048"
-	overdose = REAGENTS_OVERDOSE
-
-/datum/reagent/nutridax/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
-	if(alien == IS_DIONA)
-		return
-	M.dizziness = 0
-	M.drowsyness = 0
-	M.eye_blurry = 0
-	M.SetConfused(0)
-	if(M.ingested)
-		for(var/datum/reagent/R in M.ingested.reagent_list)
-			if(istype(R, /datum/reagent/nutriment))
-				R.remove_self(removed * 30)
-			if(istype(R, /datum/reagent/drink))
-				R.remove_self(removed * 30)
-
-/datum/reagent/nutridax/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	if(alien == IS_DIONA)
-		return
-	M.dizziness = 0
-	M.drowsyness = 0
-	M.eye_blurry = 0
-	M.SetConfused(0)
-	if(M.bloodstr)
-		for(var/datum/reagent/R in M.bloodstr.reagent_list)
-			if(istype(R, /datum/reagent/nutriment))
-				R.remove_self(removed * 20)
-			if(istype(R, /datum/reagent/drink))
-				R.remove_self(removed * 30)
-=======
->>>>>>> 9dbfaba2da... Merge pull request #12812 from KillianKirilenko/kk-rewind