This commit is contained in:
SandPoot
2023-11-29 22:40:13 -03:00
parent c9b0dedf77
commit 40f1d7401d
704 changed files with 1766 additions and 1743 deletions
+2 -2
View File
@@ -245,7 +245,7 @@
else
for(var/obj/machinery/am_shielding/AMS in linked_shielding)
AMS.update_icon()
addtimer(CALLBACK(src, .proc/reset_shield_icon_delay), 20)
addtimer(CALLBACK(src, PROC_REF(reset_shield_icon_delay)), 20)
/obj/machinery/power/am_control_unit/proc/reset_shield_icon_delay()
shield_icon_delay = 0
@@ -258,7 +258,7 @@
for(var/obj/machinery/am_shielding/AMS in linked_cores)
stored_core_stability += AMS.stability
stored_core_stability/=linked_cores.len
addtimer(CALLBACK(src, .proc/reset_stored_core_stability_delay), 40)
addtimer(CALLBACK(src, PROC_REF(reset_stored_core_stability_delay)), 40)
/obj/machinery/power/am_control_unit/proc/reset_stored_core_stability_delay()
stored_core_stability_delay = 0
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/machinery/am_shielding/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/controllerscan), 10)
addtimer(CALLBACK(src, PROC_REF(controllerscan)), 10)
/obj/machinery/am_shielding/proc/overheat()
visible_message("<span class='danger'>[src] melts!</span>")
@@ -65,7 +65,7 @@
if(!control_unit)
if(!priorscan)
addtimer(CALLBACK(src, .proc/controllerscan, 1), 20)
addtimer(CALLBACK(src, PROC_REF(controllerscan), 1), 20)
return
collapse()
+4 -4
View File
@@ -253,7 +253,7 @@
set_machine_stat(stat | MAINT)
update_appearance()
addtimer(CALLBACK(src, .proc/update), 5)
addtimer(CALLBACK(src, PROC_REF(update)), 5)
GLOB.apcs_list += src
@@ -289,7 +289,7 @@
name = "\improper [get_area_name(area, TRUE)] APC"
set_machine_stat(stat | MAINT)
update_appearance()
addtimer(CALLBACK(src, .proc/update), 5)
addtimer(CALLBACK(src, PROC_REF(update)), 5)
register_context()
/obj/machinery/power/apc/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
@@ -1232,7 +1232,7 @@
return
to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
malf.malfhack = src
malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE)
malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai, malfhacked), src), 600, TIMER_STOPPABLE)
var/atom/movable/screen/alert/hackingapc/A
A = malf.throw_alert("hackingapc", /atom/movable/screen/alert/hackingapc)
@@ -1582,7 +1582,7 @@
environ = APC_CHANNEL_OFF
update_appearance()
update()
addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), 600)
addtimer(CALLBACK(src, PROC_REF(reset), APC_RESET_EMP), 600)
/obj/machinery/power/apc/blob_act(obj/structure/blob/B)
set_broken()
+1 -1
View File
@@ -468,7 +468,7 @@ By design, d1 is the smallest direction and d2 is the highest
moveToNullspace()
powernet.remove_cable(src) //remove the cut cable from its powernet
addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
addtimer(CALLBACK(O, PROC_REF(auto_propogate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
// Disconnect machines connected to nodes
if(d1 == 0) // if we cut a node (O-X) cable
+3 -3
View File
@@ -38,13 +38,13 @@
icon_state = "cablerelay-off"
to_chat(user, "<span class='danger'>Powernet connection lost. Attempting to re-establish. Ensure the relays below this one are connected too.</span>")
find_relays()
addtimer(CALLBACK(src, .proc/refresh), 20) //Wait a bit so we can find the one below, then get powering
addtimer(CALLBACK(src, PROC_REF(refresh)), 20) //Wait a bit so we can find the one below, then get powering
return TRUE
/obj/machinery/power/deck_relay/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/find_relays), 30)
addtimer(CALLBACK(src, .proc/refresh), 50) //Wait a bit so we can find the one below, then get powering
addtimer(CALLBACK(src, PROC_REF(find_relays)), 30)
addtimer(CALLBACK(src, PROC_REF(refresh)), 50) //Wait a bit so we can find the one below, then get powering
///Handles re-acquiring + merging powernets found by find_relays()
/obj/machinery/power/deck_relay/proc/refresh()
+1 -1
View File
@@ -550,7 +550,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
/obj/machinery/computer/reactor/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
addtimer(CALLBACK(src, .proc/link_to_reactor), 10 SECONDS)
addtimer(CALLBACK(src, PROC_REF(link_to_reactor)), 10 SECONDS)
/obj/machinery/computer/reactor/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
+1 -1
View File
@@ -103,7 +103,7 @@
"<span class='italics'>You hear a loud electrical crack!</span>")
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 0.05)
addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
/obj/machinery/power/rtg/abductor/bullet_act(obj/item/projectile/Proj)
. = ..()
@@ -133,4 +133,4 @@
do_sparks(5, TRUE, AM.loc)
var/atom/target = get_edge_target_turf(AM, get_dir(src, get_step_away(AM, src)))
AM.throw_at(target, 200, 4)
addtimer(CALLBACK(src, .proc/clear_shock), 5)
addtimer(CALLBACK(src, PROC_REF(clear_shock)), 5)
+1 -1
View File
@@ -86,7 +86,7 @@
if(resolved == FALSE)
resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 120)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 120)
/obj/singularity/narsie/large/cult/Destroy()
GLOB.cult_narsie = null
@@ -25,7 +25,7 @@
/obj/effect/accelerated_particle/New(loc)
..()
addtimer(CALLBACK(src, .proc/move), 1)
addtimer(CALLBACK(src, PROC_REF(move)), 1)
/obj/effect/accelerated_particle/Bump(atom/A)
+2 -2
View File
@@ -35,7 +35,7 @@
panel.layer = FLY_LAYER
Make(S)
connect_to_network()
RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/queue_update_solar_exposure)
RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(queue_update_solar_exposure))
/obj/machinery/power/solar/Destroy()
unset_control() //remove from control computer
@@ -303,7 +303,7 @@
/obj/machinery/power/solar_control/Initialize(mapload)
. = ..()
azimuth_rate = SSsun.base_rotation
RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/timed_track)
RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(timed_track))
connect_to_network()
if(powernet)
set_panels(azimuth_target)
@@ -208,7 +208,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GLOB.main_supermatter_engine = src
AddElement(/datum/element/bsa_blocker)
RegisterSignal(src, COMSIG_ATOM_BSA_BEAM, .proc/call_explode)
RegisterSignal(src, COMSIG_ATOM_BSA_BEAM, PROC_REF(call_explode))
soundloop = new(src, TRUE)
+2 -2
View File
@@ -86,7 +86,7 @@
D.adjust_money(min(power_produced, 1))
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 1)) // x4 coils = ~240/m point bonus for R&D
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
zap_buckle_check(power)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
return power_produced
@@ -124,7 +124,7 @@
D.adjust_money(min(power_produced, 3))
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils with a pulse per second or so = ~720/m point bonus for R&D
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
zap_buckle_check(power)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
return power_produced
+1 -1
View File
@@ -132,7 +132,7 @@
energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30)
addtimer(CALLBACK(src, .proc/new_mini_ball), 100)
addtimer(CALLBACK(src, PROC_REF(new_mini_ball)), 100)
else if(energy < energy_to_lower && orbiting_balls.len)
energy_to_raise = energy_to_raise / 1.25
+1 -1
View File
@@ -21,7 +21,7 @@
. = ..()
Make(S)
connect_to_network()
RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/sun_update)
RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(sun_update))
/obj/machinery/power/tracker/Destroy()
unset_control() //remove from control computer