into the bin (#24289)

This commit is contained in:
GDN
2024-03-07 05:04:57 -06:00
committed by GitHub
parent aa5d68bf38
commit 19a3f768c8
9 changed files with 16 additions and 31 deletions
-7
View File
@@ -218,13 +218,6 @@
addtimer(CALLBACK(src, PROC_REF(flicker), TRUE), 1)
cut_overlays()
managed_overlays = null
// APC power distruptions have a chance to propogate to other machines on its network
for(var/obj/machinery/M in apc_area)
// Please don't cascade, thanks
if(M == src)
continue
if(prob(10))
M.flicker()
else
flick("apcemag", src) //Second time we cause the APC to update its icon, then add a timer to update icon later
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), TRUE), 10)
+4 -1
View File
@@ -650,7 +650,10 @@
if(current_apc)
RegisterSignal(machine_powernet, COMSIG_POWERNET_POWER_CHANGE, PROC_REF(update), override = TRUE)
/obj/machinery/light/flicker(amount = rand(20, 30))
/obj/machinery/light/get_spooked()
return forced_flicker()
/obj/machinery/light/proc/forced_flicker(amount = rand(20, 30))
if(flickering)
return FALSE
@@ -176,13 +176,3 @@
if(prob(MACHINE_FLICKER_CHANCE))
powernet_apc?.flicker()
// lights don't have their own processing loop, so local powernets will be the father they never had. 3x as likely to cause a light flicker in a particular area, pick a light to flicker at random
if(prob(MACHINE_FLICKER_CHANCE * 3))
var/list/lights = list()
for(var/obj/machinery/light/L in powernet_area)
lights += L
if(length(lights))
var/obj/machinery/light/picked_light = pick(lights)
ASSERT(istype(picked_light))
picked_light.flicker()