it compiles, that's better than it not compiling, right?

This commit is contained in:
Pinta
2024-03-24 06:36:59 -04:00
parent d46cf2d981
commit 63009681fa
452 changed files with 1046 additions and 987 deletions
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/machinery/am_shielding/Initialize()
. = ..()
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()
+1 -1
View File
@@ -452,7 +452,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()
. = ..()
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
@@ -98,7 +98,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_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)
..()
@@ -132,4 +132,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
@@ -90,7 +90,7 @@
/obj/machinery/power/emitter/ComponentInitialize()
. = ..()
AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src,PROC_REF(can_be_rotated)))
/obj/machinery/power/emitter/proc/can_be_rotated(mob/user,rotation_type)
if (anchored)
+3 -3
View File
@@ -36,7 +36,7 @@
if(A)
var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie")
notify_ghosts("Nar'Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
INVOKE_ASYNC(src,PROC_REF(narsie_spawn_animation))
/obj/singularity/narsie/large/cult // For the new cult ending, guaranteed to end the round within 3 minutes
var/list/souls_needed = list()
@@ -67,7 +67,7 @@
if(player.stat != DEAD && player.loc && is_station_level(player.loc.z) && !iscultist(player) && !isanimal(player))
souls_needed[player] = TRUE
soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
INVOKE_ASYNC(src, .proc/begin_the_end)
INVOKE_ASYNC(src,PROC_REF(begin_the_end))
/obj/singularity/narsie/large/cult/proc/begin_the_end()
sleep(50)
@@ -82,7 +82,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_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
@@ -80,7 +80,7 @@
tesla_zap(src, 5, power_produced, tesla_flags, shocked_targets)
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)
tesla_buckle_check(power)
else
..()
@@ -115,7 +115,7 @@
tesla_zap(src, 5, power_produced, tesla_flags, shocked_things)
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)
tesla_buckle_check(power)
else
..()
+1 -1
View File
@@ -78,7 +78,7 @@
energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, 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