From 2d8fee9bd05b1ca2b5ff0abfd543387e779b26f7 Mon Sep 17 00:00:00 2001
From: ArcaneMusic <hero12290@aol.com>
Date: Mon, 7 Sep 2020 16:58:21 -0400
Subject: [PATCH] Updates conflicts.

---
 .../chemistry/reagents/other_reagents.dm      | 39 -------------------
 .../chemistry/reagents/toxin_reagents.dm      | 11 ------
 2 files changed, 50 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 05b353e3027..f344a91f929 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -723,15 +723,6 @@
 	color = "#808080" // rgb: 128, 128, 128
 	taste_mult = 0 // oderless and tasteless
 
-<<<<<<< HEAD
-=======
-/datum/reagent/oxygen/expose_obj(obj/exposed_obj, reac_volume)
-	. = ..()
-	if((!exposed_obj) || (!reac_volume))
-		return
-	var/temp = holder ? holder.chem_temp : T20C
-	exposed_obj.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]")
->>>>>>> upstream/master
 
 /datum/reagent/oxygen/expose_turf(turf/open/exposed_turf, reac_volume)
 	. = ..()
@@ -764,16 +755,6 @@
 	color = "#808080" // rgb: 128, 128, 128
 	taste_mult = 0
 
-<<<<<<< HEAD
-=======
-/datum/reagent/nitrogen/expose_obj(obj/exposed_obj, reac_volume)
-	. = ..()
-	if((!exposed_obj) || (!reac_volume))
-		return
-	var/temp = holder ? holder.chem_temp : T20C
-	exposed_obj.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]")
-
->>>>>>> upstream/master
 /datum/reagent/nitrogen/expose_turf(turf/open/exposed_turf, reac_volume)
 	if(istype(exposed_turf))
 		var/temp = holder ? holder.chem_temp : T20C
@@ -1274,16 +1255,6 @@
 	color = "#B0B0B0" // rgb : 192, 192, 192
 	taste_description = "something unknowable"
 
-<<<<<<< HEAD
-=======
-/datum/reagent/carbondioxide/expose_obj(obj/exposed_obj, reac_volume)
-	. = ..()
-	if((!exposed_obj) || (!reac_volume))
-		return
-	var/temp = holder ? holder.chem_temp : T20C
-	exposed_obj.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]")
-
->>>>>>> upstream/master
 /datum/reagent/carbondioxide/expose_turf(turf/open/exposed_turf, reac_volume)
 	if(istype(exposed_turf))
 		var/temp = holder ? holder.chem_temp : T20C
@@ -1298,16 +1269,6 @@
 	color = "#808080"
 	taste_description = "sweetness"
 
-<<<<<<< HEAD
-=======
-/datum/reagent/nitrous_oxide/expose_obj(obj/exposed_obj, reac_volume)
-	. = ..()
-	if((!exposed_obj) || (!reac_volume))
-		return
-	var/temp = holder ? holder.chem_temp : T20C
-	exposed_obj.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
->>>>>>> upstream/master
-
 /datum/reagent/nitrous_oxide/expose_turf(turf/open/exposed_turf, reac_volume)
 	. = ..()
 	if(istype(exposed_turf))
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 03116997e43..34aae23aa07 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -87,17 +87,6 @@
 		A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]")
 		holder.del_reagent(type)
 
-<<<<<<< HEAD
-=======
-/datum/reagent/toxin/plasma/expose_obj(obj/exposed_obj, reac_volume)
-	. = ..()
-	if((!exposed_obj) || (!reac_volume))
-		return
-	var/temp = holder ? holder.chem_temp : T20C
-	if(temp >= LIQUID_PLASMA_BP)
-		exposed_obj.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]")
-
->>>>>>> upstream/master
 /datum/reagent/toxin/plasma/expose_turf(turf/open/exposed_turf, reac_volume)
 	if(!istype(exposed_turf))
 		return