shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Removes a couple thousand empty lists
This commit is contained in:
LetterJay
2018-05-25 02:37:18 -05:00
committed by GitHub
parent 567118067f 1e7e682d0b
commit 273e2aa13d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+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)
code/game/machinery/doors/door.dm
+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)
..()