From 884dee16b227bcd472494ebafc9417518a4d8fa4 Mon Sep 17 00:00:00 2001 From: goliath Date: Wed, 18 Oct 2023 13:58:23 +0300 Subject: [PATCH 1/3] fix(events): null ref to apc when electrical storm ends --- code/datums/events/electrical_storm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/events/electrical_storm.dm b/code/datums/events/electrical_storm.dm index 7c5030907c8..11e4056d230 100644 --- a/code/datums/events/electrical_storm.dm +++ b/code/datums/events/electrical_storm.dm @@ -92,6 +92,7 @@ set_next_think(world.time + 3 SECONDS) /datum/event/electrical_storm/proc/end() + valid_apcs = null SSannounce.play_station_announce(/datum/announce/electrical_storm_clear) SSevents.evars["electrical_storm_running"] = FALSE From 7c7d75533a7ee98cf56ae4dedd4334dce8694133 Mon Sep 17 00:00:00 2001 From: goliath Date: Thu, 26 Oct 2023 11:03:05 +0300 Subject: [PATCH 2/3] Update code/datums/events/electrical_storm.dm Co-authored-by: Tsurupeta <41485301+Tsurupeta@users.noreply.github.com> --- code/datums/events/electrical_storm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/events/electrical_storm.dm b/code/datums/events/electrical_storm.dm index 11e4056d230..88eaec44b15 100644 --- a/code/datums/events/electrical_storm.dm +++ b/code/datums/events/electrical_storm.dm @@ -92,7 +92,7 @@ set_next_think(world.time + 3 SECONDS) /datum/event/electrical_storm/proc/end() - valid_apcs = null + valid_apcs = list() SSannounce.play_station_announce(/datum/announce/electrical_storm_clear) SSevents.evars["electrical_storm_running"] = FALSE From fc82ec10f5101777da00725f9880603cbcb1ac30 Mon Sep 17 00:00:00 2001 From: goliath Date: Mon, 30 Oct 2023 12:08:55 +0300 Subject: [PATCH 3/3] Update code/datums/events/electrical_storm.dm --- code/datums/events/electrical_storm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/events/electrical_storm.dm b/code/datums/events/electrical_storm.dm index 88eaec44b15..436d13d915f 100644 --- a/code/datums/events/electrical_storm.dm +++ b/code/datums/events/electrical_storm.dm @@ -92,7 +92,7 @@ set_next_think(world.time + 3 SECONDS) /datum/event/electrical_storm/proc/end() - valid_apcs = list() + valid_apcs.Cut() SSannounce.play_station_announce(/datum/announce/electrical_storm_clear) SSevents.evars["electrical_storm_running"] = FALSE