From 36893d3188ef10d720bbbd138c8e2332ba0b808f Mon Sep 17 00:00:00 2001
From: PKPenguin321 <pkpenguin321.git@gmail.com>
Date: Sun, 29 Oct 2017 15:15:09 -0700
Subject: [PATCH 1/2] welder refuelling hotfix

---
 code/game/objects/items/tools.dm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm
index d18799c681..cddef01d64 100644
--- a/code/game/objects/items/tools.dm
+++ b/code/game/objects/items/tools.dm
@@ -457,6 +457,18 @@
 		flamethrower_screwdriver(I, user)
 	else if(istype(I, /obj/item/stack/rods))
 		flamethrower_rods(I, user)
+<<<<<<< HEAD
+=======
+	else if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
+		var/amountNeeded = max_fuel - get_fuel()
+		var/obj/item/reagent_containers/container = I
+		if(length(container.reagents.reagent_list) > 1)
+			to_chat(user, "<span class='warning'>[container] has too many chemicals mixed into it. You wouldn't want to put the wrong chemicals into [src].</span>")
+			return ..()
+		if(amountNeeded > 0 && container.reagents.has_reagent("welding_fuel"))
+			container.reagents.trans_id_to(src, "welding_fuel", amountNeeded)
+			to_chat(user, "<span class='notice'>You transfer some fuel from [container] to [src].</span>")
+>>>>>>> dda2e62... welder refuelling hotfix
 	else
 		return ..()
 

From 0256d9af4ab24f76757f7c7ce5d65b6a47e7bd02 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 29 Oct 2017 22:41:56 -0500
Subject: [PATCH 2/2] Update tools.dm

---
 code/game/objects/items/tools.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm
index cddef01d64..bd618f217e 100644
--- a/code/game/objects/items/tools.dm
+++ b/code/game/objects/items/tools.dm
@@ -457,8 +457,6 @@
 		flamethrower_screwdriver(I, user)
 	else if(istype(I, /obj/item/stack/rods))
 		flamethrower_rods(I, user)
-<<<<<<< HEAD
-=======
 	else if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
 		var/amountNeeded = max_fuel - get_fuel()
 		var/obj/item/reagent_containers/container = I
@@ -468,7 +466,6 @@
 		if(amountNeeded > 0 && container.reagents.has_reagent("welding_fuel"))
 			container.reagents.trans_id_to(src, "welding_fuel", amountNeeded)
 			to_chat(user, "<span class='notice'>You transfer some fuel from [container] to [src].</span>")
->>>>>>> dda2e62... welder refuelling hotfix
 	else
 		return ..()