datums

code/datums/wires/_wires.dm

@@ -257,8 +257,8 @@
 		if("cut")
 			I = L.is_holding_tool_quality(TOOL_WIRECUTTER)
 			if(I || IsAdminGhost(usr))
-				if(I)
-					I.play_tool_sound(src, 20)
+				if(I && holder)
+					I.play_tool_sound(holder, 20)
 				cut_color(target_wire)
 				. = TRUE
 			else
@@ -266,8 +266,8 @@
 		if("pulse")
 			I = L.is_holding_tool_quality(TOOL_MULTITOOL)
 			if(I || IsAdminGhost(usr))
-				if(I)
-					I.play_tool_sound(src, 20)
+				if(I && holder)
+					I.play_tool_sound(holder, 20)
 				pulse_color(target_wire, L)
 				. = TRUE
 			else

code/datums/wires/airlock.dm

@@ -80,7 +80,7 @@
 				A.set_electrified(30)
 				if(usr)
 					LAZYADD(A.shockedby, text("\[[time_stamp()]\] [key_name(usr)]"))
-				add_logs(usr, A, "electrified")
+					log_combat(usr, A, "electrified")
 		if(WIRE_SAFETY)
 			A.safe = !A.safe
 			if(!A.density)
@@ -135,7 +135,7 @@
 					A.set_electrified(-1)
 					if(usr)
 						LAZYADD(A.shockedby, text("\[[time_stamp()]\] [key_name(usr)]"))
-					add_logs(usr, A, "electrified")
+						log_combat(usr, A, "electrified")
 		if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
 			A.safe = mend
 		if(WIRE_TIMING) // Cut to disable auto-close, mend to re-enable.

code/datums/wires/emitter.dm

@@ -1,13 +1,17 @@
 
 /datum/wires/emitter
-	randomize = 1	//Only one wire don't need blueprints
 	holder_type = /obj/machinery/power/emitter
 
 /datum/wires/emitter/New(atom/holder)
-	wires = list(WIRE_ZAP)
+	wires = list(WIRE_ZAP,WIRE_HACK)
 	..()
 
 /datum/wires/emitter/on_pulse(wire)
 	var/obj/machinery/power/emitter/E = holder
-	E.fire_beam_pulse()
+	switch(wire)
+		if(WIRE_ZAP)
+			E.fire_beam_pulse()
+		if(WIRE_HACK)
+			E.mode = !E.mode
+			E.set_projectile()
 	..()

code/datums/wires/explosive.dm

@@ -23,7 +23,7 @@
 
 /datum/wires/explosive/c4/explode()
 	var/obj/item/grenade/plastic/c4/P = holder
-	P.explode()
+	P.prime()
 
 
 /datum/wires/explosive/pizza