cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update the codebase to 515. (#15553)

Browse Source 
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-01-23 21:21:37 +01:00
committed by GitHub
co-authored by Matt Atlas
parent 1d359b64e3
commit dd482c63af
326 changed files with 672 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/chem/foam.dm
+2 -2
View File
@@ -21,8 +21,8 @@
icon_state = "[ismetal? "m" : ""]foam"
metal = ismetal
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
addtimer(CALLBACK(src, .proc/tick), 3 + metal * 3)
addtimer(CALLBACK(src, .proc/post), solid_time)
addtimer(CALLBACK(src, PROC_REF(tick)), 3 + metal * 3)
addtimer(CALLBACK(src, PROC_REF(post)), solid_time)
/obj/effect/effect/foam/proc/tick()
process()
code/game/objects/effects/decals/contraband.dm
+1 -1
View File
@@ -64,7 +64,7 @@
flick("poster_being_set", P)
playsound(W, 'sound/items/package_wrap.ogg', 100, 1)
addtimer(CALLBACK(src, .proc/place_on_wall, P, user, W), 28, TIMER_CLIENT_TIME)
addtimer(CALLBACK(src, PROC_REF(place_on_wall), P, user, W), 28, TIMER_CLIENT_TIME)
/obj/item/contraband/poster/proc/place_on_wall(obj/structure/sign/poster/P, mob/user, turf/W)
if (QDELETED(P))
code/game/objects/effects/effect_system.dm
+1 -1
View File
@@ -111,7 +111,7 @@ steam.start() -- spawns the effect
..()
if (duration)
time_to_live = duration
addtimer(CALLBACK(src, .proc/kill), time_to_live)
addtimer(CALLBACK(src, PROC_REF(kill)), time_to_live)
/obj/effect/effect/smoke/proc/kill()
animate(src, alpha = 0, time = 2 SECONDS, easing = QUAD_EASING)
code/game/objects/effects/misc.dm
+2 -2
View File
@@ -51,7 +51,7 @@
delay = build_delay // so the variables transfer over between procs.
status = mode
if(status == 3)
addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 11)
delay -= 11
icon_state = "rfd_end_reverse"
else
@@ -73,7 +73,7 @@
end()
else
icon_state = "rfd_end"
addtimer(CALLBACK(src, .proc/end), 15)
addtimer(CALLBACK(src, PROC_REF(end)), 15)
/obj/effect/constructing_effect/proc/end()
qdel(src)
code/game/objects/items.dm
+2 -2
View File
@@ -357,7 +357,7 @@
pixel_x = 0
pixel_y = 0
if(flags & HELDMAPTEXT)
addtimer(CALLBACK(src, .proc/check_maptext), 1) // invoke async does not work here
addtimer(CALLBACK(src, PROC_REF(check_maptext)), 1) // invoke async does not work here
do_pickup_animation(user)
// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
@@ -903,7 +903,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
if(delay)
// Create a callback with checks that would be called every tick by do_after.
var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks)
var/datum/callback/tool_check = CALLBACK(src, PROC_REF(tool_check_callback), user, amount, extra_checks)
if(ismob(target))
if(!do_mob(user, target, delay, extra_checks = tool_check))
code/game/objects/items/airbubble.dm
+3 -3
View File
@@ -268,7 +268,7 @@
var/time = 360 * breakout_time * 2
breakout = TRUE
if (!do_after(escapee, time, act_target = src, extra_checks = CALLBACK(src, .proc/breakout_callback, escapee)))
if (!do_after(escapee, time, act_target = src, extra_checks = CALLBACK(src, PROC_REF(breakout_callback), escapee)))
breakout = FALSE
return
@@ -430,7 +430,7 @@
"<span class='notice'>You begin putting cable restrains on zipper of [src].</span>"
)
playsound(loc, 'sound/weapons/cablecuff.ogg', 50, 1)
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, PROC_REF(is_closed))))
return TRUE
zipped = !zipped
update_icon()
@@ -452,7 +452,7 @@
"<span class='notice'>You begin cutting cable restrains on zipper of [src].</span>"
)
playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, PROC_REF(is_closed))))
return TRUE
zipped = !zipped
update_icon()
code/game/objects/items/blueprints.dm
+3 -3
View File
@@ -176,7 +176,7 @@
sorted_add_area(A)
addtimer(CALLBACK(src, .proc/interact), 5)
addtimer(CALLBACK(src, PROC_REF(interact)), 5)
return
@@ -195,9 +195,9 @@
if(length(str) > 50)
to_chat(usr, "<span class='warning'>Text too long.</span>")
return
INVOKE_ASYNC(src, .proc/set_area_machinery_title, A, str, prevname)
INVOKE_ASYNC(src, PROC_REF(set_area_machinery_title), A, str, prevname)
A.name = str
sortTim(all_areas, /proc/cmp_text_asc)
sortTim(all_areas, GLOBAL_PROC_REF(cmp_text_asc))
to_chat(usr, "<span class='notice'>You set the area '[prevname]' title to '[str]'.</span>")
interact()
return
code/game/objects/items/devices/dociler.dm
+1 -1
View File
@@ -60,7 +60,7 @@
loaded = 0
icon_state = "animal_tagger0"
addtimer(CALLBACK(src, .proc/do_recharge), 5 MINUTES)
addtimer(CALLBACK(src, PROC_REF(do_recharge)), 5 MINUTES)
/obj/item/device/dociler/proc/do_recharge()
code/game/objects/items/devices/drop_targeter/_droptargeter.dm
+1 -1
View File
@@ -80,7 +80,7 @@
has_dropped++
if(does_explosion)
addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, targloc, 1, 2, 4, 6), 100) //YEEHAW
addtimer(CALLBACK(src, .proc/orbital_drop, targloc, user), 105)
addtimer(CALLBACK(src, PROC_REF(orbital_drop), targloc, user), 105)
flick_overlay(I, showto, 20) //2 seconds of the red dot appearing
icon_state = "drillpointer"
code/game/objects/items/devices/memorywiper.dm
+1 -1
View File
@@ -79,7 +79,7 @@
return
var/wipe_time = rand(20 SECONDS, 40 SECONDS)
addtimer(CALLBACK(src, .proc/memorywipe), wipe_time)
addtimer(CALLBACK(src, PROC_REF(memorywipe)), wipe_time)
wipe_bar = new /datum/progressbar/autocomplete(src, wipe_time, attached)
wipe_start_time = world.time
wipe_bar.update(0)
code/game/objects/items/devices/radio/intercom.dm
+2 -2
View File
@@ -169,11 +169,11 @@
if(!ai_can_interact(user))
return
src.add_fingerprint(user)
INVOKE_ASYNC(src, /obj/item/.proc/attack_self, user)
INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item, attack_self), user)
/obj/item/device/radio/intercom/attack_hand(mob/user as mob)
src.add_fingerprint(user)
INVOKE_ASYNC(src, /obj/item/.proc/attack_self, user)
INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item, attack_self), user)
/obj/item/device/radio/intercom/can_receive(input_frequency, list/levels)
if(!listening)
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -452,7 +452,7 @@ var/global/list/default_medbay_channels = list(
return
// Non-subspace radios will check in a couple of seconds, and if the signal was never received, we send a mundane broadcast
addtimer(CALLBACK(src, .proc/backup_transmission, signal), 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(backup_transmission), signal), 2 SECONDS)
/obj/item/device/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal)
var/turf/T = get_turf(src)
code/game/objects/items/devices/slide_projector.dm
+2 -2
View File
@@ -68,7 +68,7 @@
/obj/item/storage/slide_projector/proc/stop_projecting()
if(projection)
QDEL_NULL(projection)
moved_event.unregister(src, src, .proc/check_projections)
moved_event.unregister(src, src, PROC_REF(check_projections))
set_light(0)
update_icon()
@@ -83,7 +83,7 @@
break
projection = new projection_type(target)
projection.set_source(current_slide)
moved_event.register(src, src, .proc/check_projections)
moved_event.register(src, src, PROC_REF(check_projections))
set_light(1.4, 0.1, COLOR_WHITE) //Bit of light
update_icon()
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -232,7 +232,7 @@
P.name = "Transcript"
usr.put_in_hands(P)
can_print = FALSE
addtimer(CALLBACK(src, .proc/set_can_print, 1), 150)
addtimer(CALLBACK(src, PROC_REF(set_can_print), 1), 150)
/obj/item/device/taperecorder/proc/set_can_print(var/set_state = TRUE)
can_print = set_state
code/game/objects/items/eightball.dm
+1 -1
View File
@@ -62,7 +62,7 @@
visible_message("<span class='notice'>\The [src] rattles, \"[answer]\".</span>")
on_cooldown = TRUE
addtimer(CALLBACK(src, .proc/clear_cooldown), cooldown_time)
addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), cooldown_time)
shaking = FALSE
code/game/objects/items/skrell.dm
+2 -2
View File
@@ -32,7 +32,7 @@
if(projection_ready)
new/obj/effect/temp_visual/constellation (get_turf(user))
projection_ready = FALSE
addtimer(CALLBACK(src, .proc/rearm), 30 SECONDS)
addtimer(CALLBACK(src, PROC_REF(rearm)), 30 SECONDS)
/obj/item/stellascope/proc/rearm()
@@ -250,7 +250,7 @@
canremove = FALSE
icon_state = "[initial(icon_state)]_active"
to_chat(wearer, SPAN_WARNING("\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal..."))
addtimer(CALLBACK(src, .proc/do_loyalty, wearer), 15)
addtimer(CALLBACK(src, PROC_REF(do_loyalty), wearer), 15)
/obj/item/nralakktag/proc/unclamp()
if(fried)
code/game/objects/items/weapons/cards_ids_syndicate.dm
+1 -1
View File
@@ -270,7 +270,7 @@
CS.item_state = initial(ID.item_state)
CS.name = initial(ID.name) + " - " + initial(ID.icon_state)
id_card_states += CS
sortTim(id_card_states, /proc/cmp_cardstate, FALSE)
sortTim(id_card_states, GLOBAL_PROC_REF(cmp_cardstate), FALSE)
return id_card_states
code/game/objects/items/weapons/chewables.dm
+1 -1
View File
@@ -62,7 +62,7 @@ obj/item/clothing/mask/chewable/Destroy()
if (src == C.wear_mask && C.check_has_mouth())
reagents.trans_to_mob(C, REM, CHEM_INGEST, 0.2)
if(isnum(damage_per_crunch && !crunching))
addtimer(CALLBACK(src, .proc/damagecrunch, C), 50, TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(damagecrunch), C), 50, TIMER_UNIQUE)
crunching = TRUE
else
STOP_PROCESSING(SSprocessing, src)
code/game/objects/items/weapons/explosives.dm
+3 -3
View File
@@ -68,7 +68,7 @@
to_chat(user, "Bomb has been planted. Timer counting down from [timer].")
detonate_time = world.time + (timer * 10)
addtimer(CALLBACK(src, .proc/explode, get_turf(target)), timer * 10)
addtimer(CALLBACK(src, PROC_REF(explode), get_turf(target)), timer * 10)
/obj/item/plastique/proc/explode(turf/location)
if(!target)
@@ -126,8 +126,8 @@
to_chat(user, SPAN_NOTICE("Bomb has been planted. Timer counting down from [C4.timer]."))
C4.detonate_time = world.time + (timer * 10)
addtimer(CALLBACK(C4, .proc/explode, get_turf(target)), timer * 10)
addtimer(CALLBACK(src, .proc/recharge), recharge_time)
addtimer(CALLBACK(C4, PROC_REF(explode), get_turf(target)), timer * 10)
addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time)
can_deploy = FALSE
maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 6px;\">Charge</span>"
code/game/objects/items/weapons/grenades/flashbang.dm
+2 -2
View File
@@ -74,7 +74,7 @@
var/temploc = src.loc//Saves the current location to know where to step away from
walk_away(src,temploc,stepdist)//I must go, my people need me
var/dettime = rand(15,60)
addtimer(CALLBACK(src, .proc/prime), dettime)
addtimer(CALLBACK(src, PROC_REF(prime)), dettime)
..()
/obj/item/grenade/flashbang/clusterbang/segment/prime()
@@ -98,5 +98,5 @@
var/temploc = src.loc
walk_away(src,temploc,stepdist)
var/dettime = rand(15,60)
addtimer(CALLBACK(src, .proc/prime), dettime)
addtimer(CALLBACK(src, PROC_REF(prime)), dettime)
..()
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -74,7 +74,7 @@
active = TRUE
playsound(loc, activation_sound, 75, 1, -3)
addtimer(CALLBACK(src, .proc/prime), det_time)
addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
/obj/item/grenade/proc/prime()
var/turf/T = get_turf(src)
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -61,7 +61,7 @@
SB.det_time = 1
SB.prime()
addtimer(CALLBACK(src, .proc/recharge), recharge_time)
addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time)
can_deploy = FALSE
maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 6px;\">Charge</span>"
code/game/objects/items/weapons/implants/implant.dm
+2 -2
View File
@@ -217,7 +217,7 @@ Implant Specifics:<BR>"}
else if(ismob(imp_in))
imp_in.visible_message(SPAN_WARNING("Something beeps inside of [imp_in]..."))
playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
addtimer(CALLBACK(src, .proc/small_boom), 25)
addtimer(CALLBACK(src, PROC_REF(small_boom)), 25)
/obj/item/implant/explosive/proc/small_boom()
if(!imp_in)
@@ -279,7 +279,7 @@ Implant Specifics:<BR>"}
activate() //50% chance of bye bye
else
meltdown() //50% chance of implant disarming
addtimer(CALLBACK(src, .proc/self_correct), 20)
addtimer(CALLBACK(src, PROC_REF(self_correct)), 20)
/obj/item/implant/explosive/proc/self_correct()
malfunction--
code/game/objects/items/weapons/material/misc.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/material/harpoon/explosive/prime()
playsound(get_turf(src), 'sound/items/countdown.ogg', 125, 1)
addtimer(CALLBACK(src, .proc/detonate), 3 SECONDS)
addtimer(CALLBACK(src, PROC_REF(detonate)), 3 SECONDS)
return
/obj/item/material/harpoon/explosive/proc/detonate()
code/game/objects/items/weapons/melee/misc.dm
+1 -1
View File
@@ -131,7 +131,7 @@
H.apply_effect(2, WEAKEN)
on = FALSE
update_icon()
addtimer(CALLBACK(src, .proc/rearm), reset_time SECONDS)
addtimer(CALLBACK(src, PROC_REF(rearm)), reset_time SECONDS)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(R.cell)
code/game/objects/items/weapons/storage/storage.dm
+1 -1
View File
@@ -683,7 +683,7 @@
orient2hud(null, mapload)
if (defer_shrinkwrap) // Caller wants to defer shrinkwrapping until after the current callstack; probably putting something in.
INVOKE_ASYNC(src, .proc/shrinkwrap)
INVOKE_ASYNC(src, PROC_REF(shrinkwrap))
else
shrinkwrap()
code/game/objects/items/weapons/syndie.dm
+1 -1
View File
@@ -139,7 +139,7 @@
use()
/obj/item/syndie/teleporter/use()
addtimer(CALLBACK(src, .proc/recharge), recharge_time)
addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time)
ready_to_use = FALSE
check_maptext(SMALL_FONTS(6, "Charge"))
when_recharge = world.time + recharge_time
code/game/objects/items/weapons/tanks/jetpack.dm
+1 -1
View File
@@ -97,7 +97,7 @@
warned = TRUE
playsound(user, 'sound/effects/alert.ogg', 50, 1)
to_chat(user, "<span class='danger'>The meter on \the [src] indicates you are almost out of gas and beeps loudly!</span>")
addtimer(CALLBACK(src, .proc/reset_warning), 600)
addtimer(CALLBACK(src, PROC_REF(reset_warning)), 600)
var/datum/gas_mixture/G = src.air_contents.remove(num)
code/game/objects/items/weapons/tools.dm
+2 -2
View File
@@ -495,7 +495,7 @@
if(!welding)
return 0
else if(welding > 0 && colourChange)
addtimer(CALLBACK(src, /atom/proc/update_icon), 5)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), 5))
if(get_fuel() >= amount)
reagents.remove_reagent(/singleton/reagent/fuel, amount)
if(M && produces_flash)
@@ -937,7 +937,7 @@
desc += " Watch your hands!"
icon_state = "burning_wool"
set_light(2, 2, LIGHT_COLOR_LAVA)
addtimer(CALLBACK(src, .proc/endburn), 120 SECONDS, TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(endburn)), 120 SECONDS, TIMER_UNIQUE)
/obj/item/steelwool/proc/endburn()
visible_message(SPAN_NOTICE("The steel wool burns out."))
code/game/objects/items/weapons/traps.dm
+1 -1
View File
@@ -249,7 +249,7 @@
var/time = 360 * time_to_escape * 2
breakout = TRUE
if (!do_after(escapee, time, act_target = src, extra_checks = CALLBACK(src, .proc/breakout_callback, escapee)))
if (!do_after(escapee, time, act_target = src, extra_checks = CALLBACK(src, PROC_REF(breakout_callback), escapee)))
breakout = FALSE
return
code/game/objects/objs.dm
+1 -1
View File
@@ -176,7 +176,7 @@
being_shocked = 1
var/power_bounced = power / 2
tesla_zap(src, 3, power_bounced)
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
/obj/proc/reset_shocked()
being_shocked = 0
code/game/objects/structures/barricades/_barricade.dm
+1 -1
View File
@@ -212,7 +212,7 @@
/obj/structure/barricade/ex_act(severity, direction, cause_data)
for(var/obj/structure/barricade/B in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade
if(B.dir == reverse_direction(dir))
INVOKE_ASYNC(B, /atom/.proc/ex_act, severity, direction)
INVOKE_ASYNC(B, TYPE_PROC_REF(/atom, ex_act), severity, direction)
update_health(round(severity))
// This proc is called whenever the cade is moved, so I thought it was appropriate,
code/game/objects/structures/barricades/plasteel.dm
+2 -2
View File
@@ -176,7 +176,7 @@
SPAN_NOTICE("You flip [src] open."))
open(src)
recentlyflipped = TRUE
addtimer(CALLBACK(src, .proc/remove_cooldown), 1 SECOND)
addtimer(CALLBACK(src, PROC_REF(remove_cooldown)), 1 SECOND)
else
if(recentlyflipped)
@@ -186,7 +186,7 @@
SPAN_NOTICE("You flip [src] closed."))
close(src)
recentlyflipped = TRUE
addtimer(CALLBACK(src, .proc/remove_cooldown), 1 SECOND)
addtimer(CALLBACK(src, PROC_REF(remove_cooldown)), 1 SECOND)
/obj/structure/barricade/plasteel/proc/remove_cooldown()
recentlyflipped = !recentlyflipped
code/game/objects/structures/crates_lockers/closets.dm
+5 -5
View File
@@ -337,7 +337,7 @@
"You hear a welding torch on metal."
)
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, PROC_REF(is_open))))
return
if(!WT.use(0,user))
to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
@@ -391,7 +391,7 @@
"You hear a welding torch on metal."
)
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
if(!W.use_tool(src, user, 20, volume = 50, extra_checks = CALLBACK(src, .proc/is_closed)))
if(!W.use_tool(src, user, 20, volume = 50, extra_checks = CALLBACK(src, PROC_REF(is_closed))))
return
if(!WT.use(0,user))
to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
@@ -455,7 +455,7 @@
SPAN_WARNING("You start cutting the [src]..."),\
SPAN_NOTICE("You hear a loud buzzing sound and metal grinding on metal...")\
)
if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, .proc/CanChainsaw, W)))
if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, PROC_REF(CanChainsaw), W)))
user.visible_message(\
SPAN_WARNING("[user.name] finishes cutting open \the [src] with the [W]."),\
SPAN_WARNING("You finish cutting open the [src]."),\
@@ -600,7 +600,7 @@
animate(door_obj, transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW)
else
animate(transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag)
addtimer(CALLBACK(src,.proc/end_door_animation),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(end_door_animation)),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/structure/closet/proc/end_door_animation()
is_animating_door = FALSE // comment this out and the line below to manually tweak the animation end state by fiddling with the door_anim vars to match the open door icon
@@ -631,7 +631,7 @@
animate(door_obj_alt, transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW)
else
animate(transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag)
addtimer(CALLBACK(src,.proc/end_door_animation_alt),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(end_door_animation_alt)),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/structure/closet/proc/end_door_animation_alt()
is_animating_door = FALSE // comment this out and the line below to manually tweak the animation end state by fiddling with the door_anim vars to match the open door icon
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -60,7 +60,7 @@
animate(door_obj, transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW)
else
animate(transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag)
addtimer(CALLBACK(src,.proc/end_door_animation),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(end_door_animation)),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/structure/closet/crate/get_door_transform(crateanim_1, crateanim_2)
var/matrix/M = matrix()
code/game/objects/structures/door_assembly.dm
+1 -1
View File
@@ -378,7 +378,7 @@
SPAN_NOTICE("You start cutting \the [src] apart..."), \
SPAN_WARNING("You hear a loud buzzing sound and metal grinding on metal...") \
)
if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, .proc/CanChainsaw, W)))
if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, PROC_REF(CanChainsaw), W)))
user.visible_message(\
SPAN_DANGER("[user] finishes cutting \the [src] apart with the [W]."), \
SPAN_NOTICE("You finish cutting \the [src] apart."), \
code/game/objects/structures/inflatable.dm
+5 -5
View File
@@ -133,7 +133,7 @@
M.Scale(0.6)
M.Turn(pick(-40, 40))
animate(src, 0.2 SECONDS, transform = M)
addtimer(CALLBACK(src, .proc/post_tear), 0.2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(post_tear)), 0.2 SECONDS)
else
if(!undeploy_path)
return
@@ -143,7 +143,7 @@
var/matrix/M = new
M.Scale(0.6)
animate(src, 2.6 SECONDS, transform = M)
addtimer(CALLBACK(src, .proc/post_deflate), 2.6 SECONDS)
addtimer(CALLBACK(src, PROC_REF(post_deflate)), 2.6 SECONDS)
/obj/structure/inflatable/proc/post_deflate()
var/obj/item/inflatable/R = new undeploy_path(loc)
@@ -171,7 +171,7 @@
user.do_attack_animation(src)
if(health <= 0)
user.visible_message(SPAN_DANGER("[user] [attack_verb] open the [src]!"))
INVOKE_ASYNC(src, .proc/deflate, TRUE)
INVOKE_ASYNC(src, PROC_REF(deflate), TRUE)
else
user.visible_message(SPAN_DANGER("[user] [attack_verb] at [src]!"))
return TRUE
@@ -234,7 +234,7 @@
density = FALSE
state = STATE_OPEN
flick("door_opening",src)
addtimer(CALLBACK(src, .proc/ResetOpen), 1 SECOND)
addtimer(CALLBACK(src, PROC_REF(ResetOpen)), 1 SECOND)
/obj/structure/inflatable/door/proc/ResetOpen()
update_icon()
@@ -247,7 +247,7 @@
return
isSwitchingStates = TRUE
flick("door_closing", src)
addtimer(CALLBACK(src, .proc/ResetClose), 1 SECOND)
addtimer(CALLBACK(src, PROC_REF(ResetClose)), 1 SECOND)
/obj/structure/inflatable/door/proc/ResetClose()
density = TRUE
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -207,7 +207,7 @@
if(ismist)
ismist = 1
mymist = new /obj/effect/mist(loc)
addtimer(CALLBACK(src, .proc/clear_mist), 250, TIMER_OVERRIDE|TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(clear_mist)), 250, TIMER_OVERRIDE|TIMER_UNIQUE)
/obj/machinery/shower/proc/clear_mist()
if (!on)