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

procs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/_machinery.dm
+2 -2
View File
@@ -154,7 +154,7 @@ Class Procs:
START_PROCESSING(SSfastprocess, src)
else
START_PROCESSING(SSmachines, src)
RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change)
RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(power_change))
if (occupant_typecache)
occupant_typecache = typecacheof(occupant_typecache)
@@ -528,7 +528,7 @@ Class Procs:
I.play_tool_sound(src, 50)
var/prev_anchored = anchored
//as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state
if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user)))
if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user)))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>")
setAnchored(!anchored)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
code/game/machinery/ai_slipper.dm
+1 -1
View File
@@ -55,4 +55,4 @@
to_chat(user, "<span class='notice'>You activate [src]. It now has <b>[uses]</b> uses of foam remaining.</span>")
cooldown = world.time + cooldown_time
power_change()
addtimer(CALLBACK(src, .proc/power_change), cooldown_time)
addtimer(CALLBACK(src, PROC_REF(power_change)), cooldown_time)
code/game/machinery/autolathe.dm
+2 -2
View File
@@ -210,7 +210,7 @@
if(materials.materials[i] > 0)
list_to_show += i
used_material = tgui_input_list(usr, "Choose [used_material]", "Custom Material", sortList(list_to_show, /proc/cmp_typepaths_asc))
used_material = tgui_input_list(usr, "Choose [used_material]", "Custom Material", sortList(list_to_show, GLOBAL_PROC_REF(cmp_typepaths_asc)))
if(isnull(used_material))
return //Didn't pick any material, so you can't build shit either.
custom_materials[used_material] += amount_needed
@@ -223,7 +223,7 @@
use_power(power)
icon_state = "autolathe_n"
var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8
addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time)
addtimer(CALLBACK(src, PROC_REF(make_item), power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time)
. = TRUE
else
to_chat(usr, span_alert("Not enough materials for this operation."))
code/game/machinery/buttons.dm
+1 -1
View File
@@ -183,7 +183,7 @@
if(device)
device.pulsed()
addtimer(CALLBACK(src, /atom/.proc/update_icon), 15)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 15)
/obj/machinery/button/power_change()
..()
code/game/machinery/camera/camera.dm
+2 -2
View File
@@ -117,7 +117,7 @@
if(can_use())
GLOB.cameranet.addCamera(src)
emped = 0 //Resets the consecutive EMP count
addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
for(var/i in GLOB.player_list)
var/mob/M = i
if (M.client.eye == src)
@@ -325,7 +325,7 @@
change_msg = "reactivates"
triggerCameraAlarm()
if(!QDELETED(src)) //We'll be doing it anyway in destroy
addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
if(displaymessage)
if(user)
visible_message("<span class='danger'>[user] [change_msg] [src]!</span>")
code/game/machinery/civilian_bountys.dm
+1 -1
View File
@@ -340,7 +340,7 @@
/obj/item/civ_bounty_beacon/attack_self()
loc.visible_message("<span class='warning'>\The [src] begins to beep loudly!</span>")
addtimer(CALLBACK(src, .proc/launch_payload), 4 SECONDS)
addtimer(CALLBACK(src, PROC_REF(launch_payload)), 4 SECONDS)
/obj/item/civ_bounty_beacon/proc/launch_payload()
playsound(src, "sparks", 80, TRUE)
code/game/machinery/computer/apc_control.dm
+1 -1
View File
@@ -112,7 +112,7 @@
log_game("[key_name(operator)] set the logs of [src] in [AREACOORD(src)] [should_log ? "On" : "Off"]")
if("restore-console")
restoring = TRUE
addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9)
addtimer(CALLBACK(src, PROC_REF(restore_comp)), rand(3,5) * 9)
if("access-apc")
var/ref = params["ref"]
playsound(src, "terminal_type", 50, FALSE)
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -277,7 +277,7 @@
/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_CLICK, .proc/BigClick)
RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick))
// Bypass clickchain to allow humans to use the telescreen from a distance
/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
code/game/machinery/computer/cloning.dm
+1 -1
View File
@@ -274,7 +274,7 @@
say("Initiating scan...")
var/prev_locked = scanner.locked
scanner.locked = TRUE
addtimer(CALLBACK(src, .proc/finish_scan, scanner.occupant, prev_locked), 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(finish_scan), scanner.occupant, prev_locked), 2 SECONDS)
. = TRUE
/obj/machinery/computer/cloning/proc/Toggle_autoprocess(mob/user)
code/game/machinery/computer/prisoner/gulag_teleporter.dm
+1 -1
View File
@@ -111,7 +111,7 @@
if("teleport")
if(!teleporter || !beacon)
return
addtimer(CALLBACK(src, .proc/teleport, usr), 5)
addtimer(CALLBACK(src, PROC_REF(teleport), usr), 5)
return TRUE
/obj/machinery/computer/prisoner/gulag_teleporter_computer/proc/scan_machinery()
code/game/machinery/computer/teleporter.dm
+2 -2
View File
@@ -90,7 +90,7 @@
say("Processing hub calibration to target...")
calibrating = TRUE
power_station.update_icon()
addtimer(CALLBACK(src, .proc/finish_calibration), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
addtimer(CALLBACK(src, PROC_REF(finish_calibration)), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
. = TRUE
/obj/machinery/computer/teleporter/proc/finish_calibration()
@@ -150,7 +150,7 @@
var/mob/living/M = target
var/obj/item/implant/tracking/I = locate() in M.implants
if(I)
RegisterSignal(I, COMSIG_IMPLANT_REMOVING, .proc/untarget_implant)
RegisterSignal(I, COMSIG_IMPLANT_REMOVING, PROC_REF(untarget_implant))
imp_t = I
else
target = null
code/game/machinery/constructable_frame.dm
+6 -6
View File
@@ -90,7 +90,7 @@
return
to_chat(user, "<span class='notice'>You start to add cables to the frame...</span>")
if(P.use_tool(src, user, 20, volume=50, amount=5, extra_checks = CALLBACK(src, .proc/check_state, 1)))
if(P.use_tool(src, user, 20, volume=50, amount=5, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
state = 2
icon_state = "box_1"
@@ -99,7 +99,7 @@
if(P.tool_behaviour == TOOL_SCREWDRIVER && !anchored)
user.visible_message("<span class='warning'>[user] disassembles the frame.</span>", \
"<span class='notice'>You start to disassemble the frame...</span>", "<span class='hear'>You hear banging and clanking.</span>")
if(P.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/check_state, 1)))
if(P.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
if(state == 1)
to_chat(user, "<span class='notice'>You disassemble the frame.</span>")
var/obj/item/stack/sheet/metal/M = new (loc, 5)
@@ -108,7 +108,7 @@
return
if(P.tool_behaviour == TOOL_WRENCH)
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [src]...</span>")
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 1)))
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
if(state == 1)
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>")
set_anchored(!anchored)
@@ -117,7 +117,7 @@
if(2)
if(P.tool_behaviour == TOOL_WRENCH)
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [src]...</span>")
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 2)))
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 2)))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>")
set_anchored(!anchored)
return
@@ -175,7 +175,7 @@
if(P.tool_behaviour == TOOL_WRENCH && !circuit.needs_anchored)
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [src]...</span>")
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 3)))
if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 3)))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>")
set_anchored(!anchored)
return
@@ -231,7 +231,7 @@
for(var/obj/item/co in replacer)
part_list += co
//Sort the parts. This ensures that higher tier items are applied first.
part_list = sortTim(part_list, /proc/cmp_rped_sort)
part_list = sortTim(part_list, GLOBAL_PROC_REF(cmp_rped_sort))
for(var/path in req_components)
while(req_components[path] > 0 && (locate(path) in part_list))
code/game/machinery/deployable.dm
+1 -1
View File
@@ -121,7 +121,7 @@
/obj/structure/barricade/security/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/deploy), deploy_time)
addtimer(CALLBACK(src, PROC_REF(deploy)), deploy_time)
/obj/structure/barricade/security/proc/deploy()
icon_state = "barrier1"
code/game/machinery/doors/airlock.dm
+6 -6
View File
@@ -346,7 +346,7 @@
if(cyclelinkedairlock.operating)
cyclelinkedairlock.delayed_close_requested = TRUE
else
addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2)
addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2)
..()
/obj/machinery/door/airlock/proc/isElectrified()
@@ -1042,7 +1042,7 @@
user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \
"<span class='notice'>You begin [welded ? "unwelding":"welding"] the airlock...</span>", \
"<span class='italics'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
welded = !welded
user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \
"<span class='notice'>You [welded ? "weld the airlock shut":"unweld the airlock"].</span>")
@@ -1054,7 +1054,7 @@
user.visible_message("[user] is welding the airlock.", \
"<span class='notice'>You begin repairing the airlock...</span>", \
"<span class='italics'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
obj_integrity = max_integrity
stat &= ~BROKEN
user.visible_message("[user.name] has repaired [src].", \
@@ -1208,7 +1208,7 @@
operating = FALSE
if(delayed_close_requested)
delayed_close_requested = FALSE
addtimer(CALLBACK(src, .proc/close), 1)
addtimer(CALLBACK(src, PROC_REF(close)), 1)
return TRUE
@@ -1305,7 +1305,7 @@
return
operating = TRUE
update_icon(AIRLOCK_EMAG, 1)
addtimer(CALLBACK(src, .proc/open_sesame), 6)
addtimer(CALLBACK(src, PROC_REF(open_sesame)), 6)
return TRUE
/obj/machinery/door/airlock/proc/open_sesame()
@@ -1381,7 +1381,7 @@
deltimer(unelectrify_timerid)
unelectrify_timerid = null
if(secondsElectrified != ELECTRIFIED_PERMANENT)
unelectrify_timerid = addtimer(CALLBACK(src, .proc/remove_electrify), secondsElectrified SECONDS, TIMER_STOPPABLE)
unelectrify_timerid = addtimer(CALLBACK(src, PROC_REF(remove_electrify)), secondsElectrified SECONDS, TIMER_STOPPABLE)
diag_hud_set_electrified()
if(user)
code/game/machinery/doors/door.dm
+1 -1
View File
@@ -377,7 +377,7 @@
close()
/obj/machinery/door/proc/autoclose_in(wait)
addtimer(CALLBACK(src, .proc/autoclose), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(autoclose)), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE)
/obj/machinery/door/proc/requiresID()
return 1
code/game/machinery/doors/windowdoor.dm
+3 -3
View File
@@ -156,7 +156,7 @@
do_animate("opening")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state ="[src.base_state]open"
addtimer(CALLBACK(src, .proc/finish_opening), 10)
addtimer(CALLBACK(src, PROC_REF(finish_opening)), 10)
return TRUE
/obj/machinery/door/window/proc/finish_opening()
@@ -186,7 +186,7 @@
density = TRUE
air_update_turf(1)
update_freelook_sight()
addtimer(CALLBACK(src, .proc/finish_closing), 10)
addtimer(CALLBACK(src, PROC_REF(finish_closing)), 10)
return TRUE
/obj/machinery/door/window/proc/finish_closing()
@@ -231,7 +231,7 @@
operating = TRUE
flick("[src.base_state]spark", src)
playsound(src, "sparks", 75, 1)
addtimer(CALLBACK(src, .proc/open_windows_me), 6)
addtimer(CALLBACK(src, PROC_REF(open_windows_me)), 6)
return TRUE
/obj/machinery/door/window/proc/open_windows_me()
code/game/machinery/embedded_controller/embedded_controller_base.dm
+1 -1
View File
@@ -59,7 +59,7 @@
addtimer(CALLBACK(program, /datum/computer/file/embedded_program.proc/process), 5)
usr.set_machine(src)
addtimer(CALLBACK(src, .proc/updateDialog), 5)
addtimer(CALLBACK(src, PROC_REF(updateDialog)), 5)
/obj/machinery/embedded_controller/process()
if(program)
code/game/machinery/harvester.dm
+2 -2
View File
@@ -97,7 +97,7 @@
visible_message("<span class='notice'>The [name] begins warming up!</span>")
say("Initializing harvest protocol.")
update_icon()
addtimer(CALLBACK(src, .proc/harvest), interval)
addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
/obj/machinery/harvester/proc/harvest()
warming_up = FALSE
@@ -132,7 +132,7 @@
operation_order.Remove(BP)
break
use_power(5000)
addtimer(CALLBACK(src, .proc/harvest), interval)
addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
/obj/machinery/harvester/proc/end_harvesting()
warming_up = FALSE
code/game/machinery/hypnochair.dm
+1 -1
View File
@@ -95,7 +95,7 @@
START_PROCESSING(SSobj, src)
start_time = world.time
update_icon()
timerid = addtimer(CALLBACK(src, .proc/finish_interrogation), 450, TIMER_STOPPABLE)
timerid = addtimer(CALLBACK(src, PROC_REF(finish_interrogation)), 450, TIMER_STOPPABLE)
/obj/machinery/hypnochair/process()
var/mob/living/carbon/C = occupant
code/game/machinery/limbgrower.dm
+1 -1
View File
@@ -210,7 +210,7 @@
flick("limbgrower_fill",src)
icon_state = "limbgrower_idleon"
selected_category = params["active_tab"]
addtimer(CALLBACK(src, .proc/build_item, consumed_reagents_list), production_speed * production_coefficient)
addtimer(CALLBACK(src, PROC_REF(build_item), consumed_reagents_list), production_speed * production_coefficient)
. = TRUE
return
code/game/machinery/mass_driver.dm
+1 -1
View File
@@ -65,4 +65,4 @@
if(isliving(O))
var/mob/living/L = O
to_chat(L, "<span class='warning'>You feel something click beneath you!</span>")
addtimer(CALLBACK(src, .proc/drive), drive_delay)
addtimer(CALLBACK(src, PROC_REF(drive)), drive_delay)
code/game/machinery/porta_turret/portable_turret.dm
+8 -8
View File
@@ -358,7 +358,7 @@ DEFINE_BITFIELD(turret_flags, list(
toggle_on(FALSE) //turns off the turret temporarily
update_icon()
//6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 6 SECONDS)
addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 6 SECONDS)
//turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
/obj/machinery/porta_turret/emp_act(severity)
@@ -378,7 +378,7 @@ DEFINE_BITFIELD(turret_flags, list(
toggle_on(FALSE)
remove_control()
addtimer(CALLBACK(src, .proc/toggle_on, TRUE), rand(60,600))
addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), rand(60,600))
/obj/machinery/porta_turret/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
. = ..()
@@ -387,7 +387,7 @@ DEFINE_BITFIELD(turret_flags, list(
spark_system.start()
if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED))
turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT
addtimer(CALLBACK(src, .proc/reset_attacked), 60)
addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 60)
/obj/machinery/porta_turret/proc/reset_attacked()
turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT
@@ -816,9 +816,9 @@ DEFINE_BITFIELD(turret_flags, list(
if(target)
setDir(get_dir(base, target))//even if you can't shoot, follow the target
shootAt(target)
addtimer(CALLBACK(src, .proc/shootAt, target), 5)
addtimer(CALLBACK(src, .proc/shootAt, target), 10)
addtimer(CALLBACK(src, .proc/shootAt, target), 15)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15)
return TRUE
/obj/machinery/porta_turret/ai
@@ -1194,8 +1194,8 @@ DEFINE_BITFIELD(turret_flags, list(
if(team_color == "blue")
if(istype(P, /obj/item/projectile/beam/lasertag/redtag))
toggle_on(FALSE)
addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS)
addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS)
else if(team_color == "red")
if(istype(P, /obj/item/projectile/beam/lasertag/bluetag))
toggle_on(FALSE)
addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS)
addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS)
code/game/machinery/posi_alert.dm
+1 -1
View File
@@ -49,7 +49,7 @@
visible_message("There are positronic personalities available!")
radio.talk_into(src, "There are positronic personalities available!", science_channel)
playsound(loc, 'sound/machines/ping.ogg', 50)
addtimer(CALLBACK(src, .proc/liftcooldown), 300)
addtimer(CALLBACK(src, PROC_REF(liftcooldown)), 300)
/obj/machinery/posialert/proc/liftcooldown()
inuse = FALSE
code/game/machinery/recycler.dm
+1 -1
View File
@@ -183,7 +183,7 @@
safety_mode = TRUE
update_icon()
L.forceMove(loc)
addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
addtimer(CALLBACK(src, PROC_REF(reboot)), SAFETY_COOLDOWN)
/obj/machinery/recycler/proc/reboot()
playsound(src, 'sound/machines/ping.ogg', 50, 0)
code/game/machinery/requests_console.dm
+1 -1
View File
@@ -338,7 +338,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
Radio.set_frequency(radio_freq)
Radio.talk_into(src, "[emergency] emergency in [department]!!", radio_freq)
update_icon()
addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES)
addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES)
if(href_list["department"] && message)
var/sending = message
code/game/machinery/sheetifier.dm
+2 -2
View File
@@ -13,7 +13,7 @@
/obj/machinery/sheetifier/Initialize(mapload)
. = ..()
AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials))
AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, .proc/AfterInsertMaterials))
/obj/machinery/sheetifier/update_overlays()
. = ..()
@@ -35,7 +35,7 @@
var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing")
processing_overlay.color = last_inserted_material.color
flick_overlay_static(processing_overlay, src, 64)
addtimer(CALLBACK(src, .proc/finish_processing), 64)
addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64)
/obj/machinery/sheetifier/proc/finish_processing()
busy_processing = FALSE
code/game/machinery/slotmachine.dm
+2 -2
View File
@@ -204,9 +204,9 @@
update_icon()
updateDialog()
var/spin_loop = addtimer(CALLBACK(src, .proc/do_spin), 2, TIMER_LOOP|TIMER_STOPPABLE)
var/spin_loop = addtimer(CALLBACK(src, PROC_REF(do_spin)), 2, TIMER_LOOP|TIMER_STOPPABLE)
addtimer(CALLBACK(src, .proc/finish_spinning, spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len))
addtimer(CALLBACK(src, PROC_REF(finish_spinning), spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len))
//WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code.
/obj/machinery/computer/slot_machine/proc/do_spin()
code/game/machinery/suit_storage_unit.dm
+2 -2
View File
@@ -295,7 +295,7 @@
else
mob_occupant.adjustFireLoss(rand(10, 16))
mob_occupant.emote("scream")
addtimer(CALLBACK(src, .proc/cook), 50)
addtimer(CALLBACK(src, PROC_REF(cook)), 50)
else
uv_cycles = initial(uv_cycles)
uv = FALSE
@@ -403,7 +403,7 @@
if(locked)
visible_message("<span class='notice'>You see [user] kicking against the doors of [src]!</span>", \
"<span class='notice'>You start kicking against the doors...</span>")
addtimer(CALLBACK(src, .proc/resist_open, user), 300)
addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300)
else
open_machine()
dump_contents()
code/game/machinery/syndicatebomb.dm
+1 -1
View File
@@ -405,7 +405,7 @@
chem_splash(get_turf(src), spread_range, list(reactants), temp_boost)
// Detonate it again in one second, until it's out of juice.
addtimer(CALLBACK(src, .proc/detonate), 10)
addtimer(CALLBACK(src, PROC_REF(detonate)), 10)
// If it's not a time release bomb, do normal explosion
code/game/machinery/telecomms/computers/message.dm
+2 -2
View File
@@ -216,7 +216,7 @@
if(istype(S) && S.hack_software)
hacking = TRUE
//Time it takes to bruteforce is dependant on the password length.
addtimer(CALLBACK(src, .proc/BruteForce, usr), (10 SECONDS) * length(linkedServer.decryptkey))
addtimer(CALLBACK(src, PROC_REF(BruteForce), usr), (10 SECONDS) * length(linkedServer.decryptkey))
if("del_log")
if(!auth)
@@ -344,7 +344,7 @@
var/obj/item/paper/monitorkey/MK = new(loc, linkedServer)
// Will help make emagging the console not so easy to get away with.
MK.info += "<br><br><font color='red'>�%@%(*$%&(�&?*(%&�/{}</font>"
addtimer(CALLBACK(src, .proc/UnmagConsole), (10 SECONDS) * length(linkedServer.decryptkey))
addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), (10 SECONDS) * length(linkedServer.decryptkey))
//message = rebootmsg
return TRUE
code/game/machinery/transformer.dm
+1 -1
View File
@@ -103,7 +103,7 @@
R.set_connected_ai(masterAI)
R.lawsync()
R.lawupdate = 1
addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50)
addtimer(CALLBACK(src, PROC_REF(unlock_new_robot), R), 50)
/obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R)
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
code/game/machinery/washing_machine.dm
+1 -1
View File
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
busy = TRUE
update_icon()
addtimer(CALLBACK(src, .proc/wash_cycle), 200)
addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 200)
START_PROCESSING(SSfastprocess, src)
return TRUE