diff --git a/code/WorkInProgress/recycling/disposal-construction.dm b/code/WorkInProgress/recycling/disposal-construction.dm
index 297638af0ea..255bcfcb98e 100644
--- a/code/WorkInProgress/recycling/disposal-construction.dm
+++ b/code/WorkInProgress/recycling/disposal-construction.dm
@@ -132,7 +132,7 @@
 
 		else if(istype(I, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/W = I
-			if(W.remove_fuel(2))
+			if(W.remove_fuel(2,user))
 				playsound(src.loc, 'Welder2.ogg', 100, 1)
 				user << "Welding the pipe in place."
 				if(do_after(user, 20))
diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm
index bf20cb222c9..bca434a81a1 100644
--- a/code/WorkInProgress/recycling/disposal.dm
+++ b/code/WorkInProgress/recycling/disposal.dm
@@ -685,7 +685,7 @@
 			var/obj/item/weapon/weldingtool/W = I
 
 			if(W.welding)
-				if(W.remove_fuel(3))
+				if(W.remove_fuel(3,user))
 					playsound(src.loc, 'Welder2.ogg', 100, 1)
 					// check if anything changed over 2 seconds
 					var/turf/uloc = user.loc
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 669073e5147..a002d5153d0 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -211,7 +211,7 @@ WELDINGTOOOL
 				reagents.remove_reagent("fuel", amount)
 				check_status()
 				if(M)
-					eyecheck()//TODO:eyecheck should really be in mob not here
+					eyecheck(M)//TODO:eyecheck should really be in mob not here
 				return 1
 			else
 				if(M)
@@ -256,7 +256,7 @@ WELDINGTOOOL
 
 		eyecheck(mob/user as mob)//TODO:Move this over to /mob/ where it should be
 			//check eye protection
-			if(!ishuman() && !ismonkey())
+			if(!ishuman(user) && !ismonkey(user))
 				return 1
 			var/safety = 0
 			if (istype(user, /mob/living/carbon/human))
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index e5f83a4d04e..23885ce0d7c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -366,7 +366,7 @@
 			user << "\blue You need more welding fuel to complete this task."
 			return
 		user << "You start welding APC frame..."
-		if(W:remove_fuel(2))
+		if(W:remove_fuel(2,user))
 			playsound(src.loc, 'Welder.ogg', 50, 1)
 			if(do_after(user, 50))
 				if (emagged || malfhack || (stat & BROKEN) || opened==2)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 1ace7d7b496..39cb512f9e6 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -143,7 +143,7 @@
 				user << "\red The [src.name] needs to be wrenched to the floor."
 				return
 			if(1)
-				if (W:remove_fuel(2))
+				if (W:remove_fuel(2,user))
 					playsound(src.loc, 'Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
 						"You start to weld the [src] to the floor.", \
@@ -155,7 +155,7 @@
 					user << "\blue You need more welding fuel to complete this task."
 					return
 			if(2)
-				if (W:remove_fuel(2))
+				if (W:remove_fuel(2,user))
 					playsound(src.loc, 'Welder2.ogg', 50, 1)
 					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
 						"You start to cut the [src] free from the floor.", \