Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000

[MIRROR] Removes a couple thousand empty lists
This commit is contained in:
LetterJay
2018-05-25 02:37:18 -05:00
committed by GitHub
4 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -79,7 +79,7 @@
if(!A.secondsElectrified)
A.set_electrified(30)
if(usr)
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
LAZYADD(A.shockedby, text("\[[time_stamp()]\][usr](ckey:[usr.ckey])"))
add_logs(usr, A, "electrified")
if(WIRE_SAFETY)
A.safe = !A.safe
@@ -134,7 +134,7 @@
if(A.secondsElectrified != -1)
A.set_electrified(-1)
if(usr)
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
LAZYADD(A.shockedby, text("\[[time_stamp()]\][usr](ckey:[usr.ckey])"))
add_logs(usr, A, "electrified")
if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
A.safe = mend
+3 -3
View File
@@ -1280,7 +1280,7 @@
bolt() //Bolt it!
set_electrified(ELECTRIFIED_PERMANENT) //Shock it!
if(origin)
shockedby += "\[[time_stamp()]\][origin](ckey:[origin.ckey])"
LAZYADD(shockedby, "\[[time_stamp()]\][origin](ckey:[origin.ckey])")
/obj/machinery/door/airlock/disable_lockdown()
@@ -1549,7 +1549,7 @@
if(wires.is_cut(WIRE_SHOCK))
to_chat(user, "The electrification wire has been cut")
else
shockedby += "\[[time_stamp()]\][user](ckey:[user.ckey])"
LAZYADD(shockedby, "\[[time_stamp()]\][user](ckey:[user.ckey])")
add_logs(user, src, "electrified")
set_electrified(AI_ELECTRIFY_DOOR_TIME)
@@ -1559,7 +1559,7 @@
if(wires.is_cut(WIRE_SHOCK))
to_chat(user, "The electrification wire has been cut")
else
shockedby += text("\[[time_stamp()]\][user](ckey:[user.ckey])")
LAZYADD(shockedby, text("\[[time_stamp()]\][user](ckey:[user.ckey])"))
add_logs(user, src, "electrified")
set_electrified(ELECTRIFIED_PERMANENT)
+2 -2
View File
@@ -16,7 +16,7 @@
interaction_flags_atom = INTERACT_ATOM_UI_INTERACT
var/secondsElectrified = 0
var/shockedby = list()
var/shockedby
var/visible = TRUE
var/operating = FALSE
var/glass = FALSE
@@ -213,7 +213,7 @@
if(prob(severity*10 - 20))
if(secondsElectrified == 0)
secondsElectrified = -1
shockedby += "\[[time_stamp()]\]EM Pulse"
LAZYADD(shockedby, "\[[time_stamp()]\]EM Pulse")
addtimer(CALLBACK(src, .proc/unelectrify), 300)
..()
+1 -1
View File
@@ -55,7 +55,7 @@
if(specialfunctions & SHOCK)
if(D.secondsElectrified)
D.secondsElectrified = -1
D.shockedby += "\[[time_stamp()]\][usr](ckey:[usr.ckey])"
LAZYADD(D.shockedby, "\[[time_stamp()]\][usr](ckey:[usr.ckey])")
add_logs(usr, D, "electrified")
else
D.secondsElectrified = 0