Skip to content

Commit

Permalink
more 515 porting (vlggms#1948)
Browse files Browse the repository at this point in the history
  • Loading branch information
Halonexus authored Feb 9, 2024
1 parent c0e805e commit b16cccc
Show file tree
Hide file tree
Showing 128 changed files with 201 additions and 201 deletions.
4 changes: 2 additions & 2 deletions ModularTegustation/tegu_drinks/twistedtea.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
W.reagents.add_reagent(chem, 1)

//Make em move dat ass, hun
addtimer(CALLBACK(src, /obj/item/melee/twistedtea/proc/move_particles, reagent_particles), 2)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/melee/twistedtea, move_particles), reagent_particles), 2)

if(!unlimiteduse)
broken = TRUE
Expand Down Expand Up @@ -143,7 +143,7 @@
particles -= W
if(repetition < power)
repetition++
addtimer(CALLBACK(src, /obj/item/melee/twistedtea/proc/move_particles, particles, repetition), 2)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/melee/twistedtea, move_particles), particles, repetition), 2)



Expand Down
4 changes: 2 additions & 2 deletions ModularTegustation/tegu_mobs/apocalypse_bird.dm
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
P.xo = PT.x - T.x
P.original = PT
P.preparePixelProjectile(PT, T)
addtimer(CALLBACK (P, .obj/projectile/proc/fire), 6.5 SECONDS)
addtimer(CALLBACK (P, TYPE_PROC_REF(/obj/projectile, fire)), 6.5 SECONDS)

SLEEP_CHECK_DEATH(6.5 SECONDS)
playsound(src, 'sound/abnormalities/apocalypse/fire.ogg', 75, FALSE, 12)
Expand Down Expand Up @@ -690,7 +690,7 @@
return

if(!LAZYLEN(controller.current_path))
controller.current_path = get_path_to(living_pawn, target, /turf/proc/Distance_cardinal, 0, 80)
controller.current_path = get_path_to(living_pawn, target, TYPE_PROC_REF(/turf, Distance_cardinal), 0, 80)
if(!controller.current_path.len) // Returned FALSE or null.
finish_action(controller, FALSE)
return
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/blackmarket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ SUBSYSTEM_DEF(blackmarket)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), span_notice("[purchase.uplink] flashes a message noting that the order is being teleported to [get_area(targetturf)] in 60 seconds."))

// do_teleport does not want to teleport items from nullspace, so it just forceMoves and does sparks.
addtimer(CALLBACK(src, /datum/controller/subsystem/blackmarket/proc/fake_teleport, purchase.entry.spawn_item(), targetturf), 60 SECONDS)
addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/controller/subsystem/blackmarket, fake_teleport), purchase.entry.spawn_item(), targetturf), 60 SECONDS)
queued_purchases -= purchase
qdel(purchase)
// Get the current location of the uplink if it exists, then throws the item from space at the station from a random direction.
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/explosions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ SUBSYSTEM_DEF(explosions)
M.playsound_local(epicenter, null, echo_volume, 1, frequency, S = explosion_echo_sound, distance_multiplier = 0)

if(creaking_explosion) // 5 seconds after the bang, the station begins to creak
addtimer(CALLBACK(M, /mob/proc/playsound_local, epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), 1, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY)
addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, playsound_local), epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), 1, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY)

if(heavy_impact_range > 1)
var/datum/effect_system/explosion/E
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/lobotomy_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ SUBSYSTEM_DEF(lobotomy_events)
continue
if(!A.IsContained())
continue
INVOKE_ASYNC(A.datum_reference, /datum/abnormality/proc/qliphoth_change, -999)
INVOKE_ASYNC(A.datum_reference, TYPE_PROC_REF(/datum/abnormality, qliphoth_change), -999)
break
return
//Further checks for event abnos can go here.
Expand Down Expand Up @@ -140,7 +140,7 @@ SUBSYSTEM_DEF(lobotomy_events)
if(YINYANG)
if(YY_breached.len < 2)
return FALSE
var/list/meet_path = get_path_to(YY_breached[1], YY_breached[2], /turf/proc/Distance, 0, 200)
var/list/meet_path = get_path_to(YY_breached[1], YY_breached[2], TYPE_PROC_REF(/turf, Distance), 0, 200)
YY_middle = meet_path[round(meet_path.len/2)]
for(var/mob/living/simple_animal/hostile/abnormality/A in YY_breached)
A.patrol_to(YY_middle)
Expand Down
8 changes: 4 additions & 4 deletions code/datums/ai/sanity/sanityloss_behaviors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
return

// If we can't move towards the item
if(!get_path_to(living_pawn, get_turf(target), /turf/proc/Distance_cardinal, 0, 10))
if(!get_path_to(living_pawn, get_turf(target), TYPE_PROC_REF(/turf, Distance_cardinal), 0, 10))
finish_action(controller, FALSE)
return

Expand Down Expand Up @@ -260,7 +260,7 @@

var/turf/target = controller.blackboard[BB_INSANE_CURRENT_ATTACK_TARGET]
if(!LAZYLEN(controller.current_path) && !living_pawn.Adjacent(target))
controller.current_path = get_path_to(living_pawn, target, /turf/proc/Distance_cardinal, 0, 120)
controller.current_path = get_path_to(living_pawn, target, TYPE_PROC_REF(/turf, Distance_cardinal), 0, 120)
if(!LAZYLEN(controller.current_path)) // Returned FALSE or null.
finish_action(controller, FALSE)
return
Expand Down Expand Up @@ -370,7 +370,7 @@

var/obj/machinery/computer/abnormality/target = controller.blackboard[BB_INSANE_CURRENT_ATTACK_TARGET]
if(!LAZYLEN(controller.current_path) && !living_pawn.Adjacent(target))
controller.current_path = get_path_to(living_pawn, get_step(target, SOUTH), /turf/proc/Distance_cardinal, 0, 50)
controller.current_path = get_path_to(living_pawn, get_step(target, SOUTH), TYPE_PROC_REF(/turf, Distance_cardinal), 0, 50)
if(!LAZYLEN(controller.current_path)) // Returned FALSE or null.
finish_action(controller, FALSE)
return
Expand Down Expand Up @@ -401,7 +401,7 @@
if(succeeded)
var/turf/T = get_closest_atom(/turf/open, GLOB.xeno_spawn, controller.pawn)
if(T)
controller.current_path = get_path_to(controller.pawn, T, /turf/proc/Distance_cardinal, 0, 50)
controller.current_path = get_path_to(controller.pawn, T, TYPE_PROC_REF(/turf, Distance_cardinal), 0, 50)
if(!LAZYLEN(controller.current_path))
finish_action(controller, FALSE)
return
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/tackle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
user.Knockdown(30)
if(ishuman(target) && !T.has_movespeed_modifier(/datum/movespeed_modifier/shove))
T.add_movespeed_modifier(/datum/movespeed_modifier/shove) // maybe define a slightly more severe/longer slowdown for this
addtimer(CALLBACK(T, /mob/living/carbon/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH * 2)
addtimer(CALLBACK(T, TYPE_PROC_REF(/mob/living/carbon, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH * 2)

if(-1 to 0) // decent hit, both parties are about equally inconvenienced
user.visible_message("<span class='warning'>[user] lands a passable [tackle_word] on [target], sending them both tumbling!</span>", "<span class='userdanger'>You land a passable [tackle_word] on [target], sending you both tumbling!</span>", ignored_mobs = target)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/ductnet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
/datum/ductnet/proc/remove_duct(obj/machinery/duct/ducting)
destroy_network(FALSE)
for(var/obj/machinery/duct/D in ducting.neighbours)
addtimer(CALLBACK(D, /obj/machinery/duct/proc/reconnect), 0) //all needs to happen after the original duct that was destroyed finishes destroying itself
addtimer(CALLBACK(D, /obj/machinery/duct/proc/generate_connects), 0)
addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, reconnect)), 0) //all needs to happen after the original duct that was destroyed finishes destroying itself
addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, generate_connects)), 0)
qdel(src)
///add a plumbing object to either demanders or suppliers
/datum/ductnet/proc/add_plumber(datum/component/plumbing/P, dir)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/elements/atmos_sensitive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
return ELEMENT_INCOMPATIBLE
var/atom/to_track = target
if(isopenturf(to_track.loc))
to_track.RegisterSignal(to_track.loc, COMSIG_TURF_EXPOSE, /atom/proc/check_atmos_process)
to_track.RegisterSignal(to_track.loc, COMSIG_TURF_EXPOSE, TYPE_PROC_REF(/atom, check_atmos_process))
RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move))
return ..()

Expand All @@ -28,7 +28,7 @@
microchipped_lad.UnregisterSignal(oldloc, COMSIG_TURF_EXPOSE)
if(isopenturf(microchipped_lad.loc))
var/turf/open/new_spot = microchipped_lad.loc
microchipped_lad.RegisterSignal(new_spot, COMSIG_TURF_EXPOSE, /atom/proc/check_atmos_process)
microchipped_lad.RegisterSignal(new_spot, COMSIG_TURF_EXPOSE, TYPE_PROC_REF(/atom, check_atmos_process))
microchipped_lad.check_atmos_process(null, new_spot.air, new_spot.temperature) //Make sure you're properly registered

/atom/proc/check_atmos_process(datum/source, datum/gas_mixture/air, exposed_temperature)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/status_effects/buffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
owner.add_stun_absorption("bloody bastard sword", duration, 2, "doesn't even flinch as the sword's power courses through them!", "You shrug off the stun!", " glowing with a blazing red aura!")
owner.spin(duration,1)
animate(owner, color = oldcolor, time = duration, easing = EASE_IN)
addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, update_atom_colour)), duration)
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(!L.client.played)
SEND_SOUND(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE))
L.client.played = TRUE
addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600)
addtimer(CALLBACK(L.client, TYPE_PROC_REF(/client, ResetAmbiencePlayed)), 600)

///Divides total beauty in the room by roomsize to allow us to get an average beauty per tile.
/area/proc/update_beauty()
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/game_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
addtimer(CALLBACK(src, PROC_REF(send_intercept), 0), rand(waittime_l, waittime_h))
generate_station_goals()

addtimer(CALLBACK(SSabnormality_queue, /datum/controller/subsystem/abnormality_queue/proc/HandleStartingAbnormalities), ABNORMALITY_DELAY)
addtimer(CALLBACK(SSabnormality_queue, TYPE_PROC_REF(/datum/controller/subsystem/abnormality_queue, HandleStartingAbnormalities)), ABNORMALITY_DELAY)

gamemode_ready = TRUE
return TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/abnormality_auxiliary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
to_chat(usr, span_userdanger("Good luck, Manager."))
playsound(get_turf(src), 'sound/machines/terminal_prompt_confirm.ogg', 50, TRUE)
updateUsrDialog()
addtimer(CALLBACK(SSlobotomy_corp.core_suppression, /datum/suppression/proc/Run), 2 SECONDS)
addtimer(CALLBACK(SSlobotomy_corp.core_suppression, TYPE_PROC_REF(/datum/suppression, Run)), 2 SECONDS)
return TRUE

// Facility upgrade topics
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/arcade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
var/mob/living/L = usr
L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
var/S = new /obj/singularity/academy(usr.loc)
addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, say), "[S] winks out, just as suddenly as it appeared."), 50)
QDEL_IN(S, 50)
else
event = null
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@
if(!machine_stat)
update_icon(AIRLOCK_DENY)
playsound(src,doorDeni,50,FALSE,3)
addtimer(CALLBACK(src, /atom/proc/update_icon, AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME)

/obj/machinery/door/airlock/examine(mob/user)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ GENE SCANNER
else
to_chat(user, "<span class='warning'>[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].</span>")
cooldown = TRUE
addtimer(CALLBACK(src,/obj/item/analyzer/proc/ping), cooldown_time)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/analyzer, ping)), cooldown_time)

/obj/item/analyzer/proc/ping()
if(isliving(loc))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/ego_weapons/aleph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@
break
for(var/obj/machinery/door/D in T.contents)
if(D.density)
addtimer(CALLBACK (D, .obj/machinery/door/proc/open))
addtimer(CALLBACK (D, TYPE_PROC_REF(/obj/machinery/door, open)))
target_turf = T
line_turfs += T
user.dir = get_dir(user, A)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/ego_weapons/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@
return
if(!activated)
return
if(!LAZYLEN(get_path_to(src,target, /turf/proc/Distance, 0, 20)))
if(!LAZYLEN(get_path_to(src,target, TYPE_PROC_REF(/turf, Distance), 0, 20)))
to_chat(user, span_notice("Invalid target."))
activated = FALSE
return
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/ego_weapons/ordeal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
playsound(user, 'ModularTegustation/Tegusounds/claw/move.ogg', 50, 1)
for(var/obj/machinery/door/MD in T.contents) // Hiding behind a door mortal?
if(MD.density)
addtimer(CALLBACK (MD, .obj/machinery/door/proc/open))
addtimer(CALLBACK (MD, TYPE_PROC_REF(/obj/machinery/door, open)))
// Damage
for(var/mob/living/L in mobs_to_hit)
if(user.faction_check_mob(L))
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/extinguisher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
if(user.buckled && isobj(user.buckled) && !user.buckled.anchored)
var/obj/B = user.buckled
var/movementdirection = turn(direction,180)
addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection), 1)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_chair), B, movementdirection), 1)

else user.newtonian_move(turn(direction, 180))

Expand Down Expand Up @@ -188,7 +188,7 @@
reagents.trans_to(W,1, transfered_by = user)

//Make em move dat ass, hun
addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, water_particles), 2)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_particles), water_particles), 2)

//Particle movement loop
/obj/item/extinguisher/proc/move_particles(list/particles, repetition=0)
Expand All @@ -210,7 +210,7 @@
particles -= W
if(repetition < power)
repetition++
addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, particles, repetition), 2)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_particles), particles, repetition), 2)

//Chair movement loop
/obj/item/extinguisher/proc/move_chair(obj/B, movementdirection, repetition=0)
Expand All @@ -228,7 +228,7 @@
return

repetition++
addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_chair), B, movementdirection, repetition), timer_seconds)

/obj/item/extinguisher/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/fixerskills/level1/defensive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
if (ishuman(owner))
var/mob/living/carbon/human/human = owner
human.add_movespeed_modifier(/datum/movespeed_modifier/hunkerdown)
addtimer(CALLBACK(human, .mob/proc/remove_movespeed_modifier, /datum/movespeed_modifier/hunkerdown), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(human, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/hunkerdown), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
human.physiology.red_mod *= 0.6
human.physiology.white_mod *= 0.6
human.physiology.black_mod *= 0.6
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/fixerskills/level1/movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
if (ishuman(owner))
var/mob/living/carbon/human/human = owner
human.add_movespeed_modifier(/datum/movespeed_modifier/assault)
addtimer(CALLBACK(human, .mob/proc/remove_movespeed_modifier, /datum/movespeed_modifier/assault), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(human, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/assault), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
StartCooldown()

/datum/movespeed_modifier/assault
Expand Down Expand Up @@ -99,7 +99,7 @@
if (ishuman(owner))
var/mob/living/carbon/human/human = owner
human.add_movespeed_modifier(/datum/movespeed_modifier/retreat)
addtimer(CALLBACK(human, .mob/proc/remove_movespeed_modifier, /datum/movespeed_modifier/retreat), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(human, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/retreat), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
human.physiology.red_mod *= 1.3
human.physiology.white_mod *= 1.3
human.physiology.black_mod *= 1.3
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/grenades/clusterbuster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
var/obj/item/grenade/P = new type(loc)
if(istype(P))
P.active = TRUE
addtimer(CALLBACK(P, /obj/item/grenade/proc/detonate), rand(15,60))
addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
Expand Down Expand Up @@ -107,7 +107,7 @@
var/chosen = pick(subtypesof(/obj/item/slime_extract))
var/obj/item/slime_extract/P = new chosen(loc)
if(volatile)
addtimer(CALLBACK(P, /obj/item/slime_extract/proc/activate_slime), rand(15,60))
addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/slime_extract, activate_slime)), rand(15,60))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
user.visible_message("<span class='suicide'>[user] starts saying their Hail Mary's at a terrifying pace! It looks like [user.p_theyre()] trying to enter the afterlife!</span>")
user.say("Hail Mary, full of grace, the Lord is with thee. Blessed are thou amongst women, and blessed is the fruit of thy womb, Jesus. Holy Mary, mother of God, pray for us sinners, now and at the hour of our death. Amen. ", forced = /obj/item/virgin_mary)
addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 75)
addtimer(CALLBACK(user, /atom/movable/proc/say, "O my Mother, preserve me this day from mortal sin..."), 50)
addtimer(CALLBACK(user, TYPE_PROC_REF(/atom/movable, say), "O my Mother, preserve me this day from mortal sin..."), 50)
return MANUAL_SUICIDE

/obj/item/virgin_mary/proc/manual_suicide(mob/living/user)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
if(patient == user)
if(!silent)
user.visible_message("<span class='notice'>[user] starts to apply [src] on [user.p_them()]self...</span>", "<span class='notice'>You begin applying [src] on yourself...</span>")
if(!do_mob(user, patient, self_delay, extra_checks=CALLBACK(patient, /mob/living/proc/can_inject, user, TRUE)))
if(!do_mob(user, patient, self_delay, extra_checks=CALLBACK(patient, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE)))
return
else if(other_delay)
if(!silent)
user.visible_message("<span class='notice'>[user] starts to apply [src] on [patient].</span>", "<span class='notice'>You begin applying [src] on [patient]...</span>")
if(!do_mob(user, patient, other_delay, extra_checks=CALLBACK(patient, /mob/living/proc/can_inject, user, TRUE)))
if(!do_mob(user, patient, other_delay, extra_checks=CALLBACK(patient, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE)))
return

if(heal(patient, user))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/false_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield
opening = FALSE
return
addtimer(CALLBACK(src, /obj/structure/falsewall/proc/toggle_open), 5)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/falsewall, toggle_open)), 5)

/obj/structure/falsewall/proc/toggle_open()
if(!QDELETED(src))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/tutorial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
var/turf/shove_turf = get_step(loc, shove_dir)
if(Move(shove_turf, shove_dir))
to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
addtimer(CALLBACK(src, /atom/movable/proc/forceMove, oldturf), 20 SECONDS)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), oldturf), 20 SECONDS)

/obj/machinery/power/emitter/energycannon/tutorialemitter

Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/adminhelp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//Removes the ahelp verb and returns it after 2 minutes
/datum/admin_help/proc/TimeoutVerb()
remove_verb(initiator, /client/verb/adminhelp)
initiator.adminhelptimerid = addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 1200, TIMER_STOPPABLE) //2 minute cooldown of admin helps
initiator.adminhelptimerid = addtimer(CALLBACK(initiator, TYPE_PROC_REF(/client, giveadminhelpverb)), 1200, TIMER_STOPPABLE) //2 minute cooldown of admin helps

//private
/datum/admin_help/proc/FullMonty(ref_src)
Expand Down Expand Up @@ -354,7 +354,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
state = AHELP_RESOLVED
GLOB.ahelp_tickets.ListInsert(src)

addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)
addtimer(CALLBACK(initiator, TYPE_PROC_REF(/client, giveadminhelpverb)), 50)

AddInteraction("<font color='green'>Resolved by [key_name].</font>")
to_chat(initiator, "<span class='adminhelp'>Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.</span>", confidential = TRUE)
Expand Down
Loading

0 comments on commit b16cccc

Please sign in to comment.