diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index 72e3cfd73b..be50a7f1de 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -4,7 +4,7 @@
 obj/machinery/door/airlock
 	var/id_tag
 	var/frequency
-	var/shockedby
+	var/shockedby = list()
 	var/datum/radio_frequency/radio_connection
 
 	receive_signal(datum/signal/signal)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 232ad2d52d..2cf9c04052 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -387,9 +387,9 @@ About the new airlock wires panel:
 				src.updateDialog()
 		if(AIRLOCK_WIRE_ELECTRIFY)
 			//one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds.
-			shockedby = "[usr](ckey:[usr.ckey])"
 			if(src.secondsElectrified==0)
-
+				shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
+				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
 				src.secondsElectrified = 30
 				spawn(10)
 					//TODO: Move this into process() and make pulsing reset secondsElectrified to 30
@@ -450,7 +450,8 @@ About the new airlock wires panel:
 		if(AIRLOCK_WIRE_ELECTRIFY)
 			//Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted.
 			if(src.secondsElectrified != -1)
-				shockedby = "[usr](ckey: [usr.ckey])"
+				shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
+				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
 				src.secondsElectrified = -1
 		if (AIRLOCK_WIRE_SAFETY)
 			safe = 0
@@ -1014,7 +1015,8 @@ About the new airlock wires panel:
 					else if(src.secondsElectrified!=0)
 						usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n")
 					else
-						shockedby = "[usr](ckey:[usr.ckey])"
+						shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
+						usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
 						src.secondsElectrified = 30
 						spawn(10)
 							while (src.secondsElectrified>0)
@@ -1032,7 +1034,8 @@ About the new airlock wires panel:
 					else if(src.secondsElectrified!=0)
 						usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n")
 					else
-						shockedby = "[usr](ckey:[usr.ckey])"
+						shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
+						usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
 						src.secondsElectrified = -1
 
 				if (8) // Not in order >.>