upload files

2021-02-18 14:47:10 -03:00
parent 4e18044450
commit cf2e70671a
182 changed files with 552 additions and 528 deletions
@@ -25,7 +25,7 @@
 	switch(stat)
 		if(1)
 			// Stat 1
-			if(istype(W, /obj/item/weldingtool))
+			if(W.tool_behaviour == TOOL_WELDER)
 				if(weld(W, user))
 					to_chat(user, "<span class='notice'>You weld the fan assembly securely into place.</span>")
 					setAnchored(TRUE)
@@ -46,7 +46,7 @@
 					forceMove(F)
 					F.setDir(src.dir)
 					return
-			else if(istype(W, /obj/item/weldingtool))
+			else if(W.tool_behaviour == TOOL_WELDER)
 				if(weld(W, user))
 					to_chat(user, "<span class='notice'>You unweld the fan assembly from its place.</span>")
 					stat = 1
@@ -64,7 +64,9 @@
 		deconstruct()
 	return TRUE

-/obj/machinery/fan_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user)
+/obj/machinery/fan_assembly/proc/weld(obj/item/W, mob/living/user)
+	if(!W.tool_behaviour == TOOL_WELDER)
+		return
 	if(!W.tool_start_check(user, amount=0))
 		return FALSE
 	switch(stat)