Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit b712546

Browse files
caller
1 parent 3777de4 commit b712546

File tree

44 files changed

+251
-251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+251
-251
lines changed

code/__HELPERS/AStar.dm

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,33 @@ Actual Adjacent procs :
7474
return b.f - a.f
7575

7676
//wrapper that returns an empty list if A* failed to find a path
77-
/proc/get_path_to(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE, get_best_attempt = FALSE)
78-
var/l = SSpathfinder.mobs.getfree(caller)
77+
/proc/get_path_to(caller_but_not_a_byond_built_in_proc, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE, get_best_attempt = FALSE)
78+
var/l = SSpathfinder.mobs.getfree(caller_but_not_a_byond_built_in_proc)
7979
while(!l)
8080
stoplag(3)
81-
l = SSpathfinder.mobs.getfree(caller)
82-
var/list/path = AStar(caller, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent,id, exclude, simulated_only, get_best_attempt)
81+
l = SSpathfinder.mobs.getfree(caller_but_not_a_byond_built_in_proc)
82+
var/list/path = AStar(caller_but_not_a_byond_built_in_proc, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent,id, exclude, simulated_only, get_best_attempt)
8383
SSpathfinder.mobs.found(l)
8484
if(!path)
8585
path = list()
8686
return path
8787

88-
/proc/cir_get_path_to(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE)
89-
var/l = SSpathfinder.circuits.getfree(caller)
88+
/proc/cir_get_path_to(caller_but_not_a_byond_built_in_proc, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE)
89+
var/l = SSpathfinder.circuits.getfree(caller_but_not_a_byond_built_in_proc)
9090
while(!l)
9191
stoplag(3)
92-
l = SSpathfinder.circuits.getfree(caller)
93-
var/list/path = AStar(caller, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent,id, exclude, simulated_only)
92+
l = SSpathfinder.circuits.getfree(caller_but_not_a_byond_built_in_proc)
93+
var/list/path = AStar(caller_but_not_a_byond_built_in_proc, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent,id, exclude, simulated_only)
9494
SSpathfinder.circuits.found(l)
9595
if(!path)
9696
path = list()
9797
return path
9898

9999
/// Pathfinding for bots
100-
/proc/AStar(caller, _end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE, get_best_attempt = FALSE)
100+
/proc/AStar(caller_but_not_a_byond_built_in_proc, _end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableTurftest, id=null, turf/exclude=null, simulated_only = TRUE, get_best_attempt = FALSE)
101101
//sanitation
102102
var/turf/end = get_turf(_end)
103-
var/turf/start = get_turf(caller)
103+
var/turf/start = get_turf(caller_but_not_a_byond_built_in_proc)
104104
if(!start || !end)
105105
stack_trace("Invalid A* start or destination")
106106
return FALSE
@@ -150,12 +150,12 @@ Actual Adjacent procs :
150150
//is already in open list, check if it's a better way from the current turf
151151
CN.bf &= 15^r //we have no closed, so just cut off exceed dir.00001111 ^ reverse_dir.We don't need to expand to checked turf.
152152
if((newg < CN.g) )
153-
if(call(cur.source,adjacent)(caller, T, id, simulated_only))
153+
if(call(cur.source,adjacent)(caller_but_not_a_byond_built_in_proc, T, id, simulated_only))
154154
CN.setp(cur,newg,CN.h,cur.nt+1)
155155
open.ReSort(CN)//reorder the changed element in the list
156156
else
157157
//is not already in open list, so add it
158-
if(call(cur.source,adjacent)(caller, T, id, simulated_only))
158+
if(call(cur.source,adjacent)(caller_but_not_a_byond_built_in_proc, T, id, simulated_only))
159159
CN = new(T,cur,newg,call(T,dist)(end),cur.nt+1,15^r)
160160
open.Insert(CN)
161161
openc[T] = CN
@@ -179,8 +179,8 @@ Actual Adjacent procs :
179179
//Returns adjacent turfs in cardinal directions that are reachable
180180
//simulated_only controls whether only simulated turfs are considered or not
181181

182-
/// Returns a list the src/caller can cross into
183-
/turf/proc/reachableAdjacentTurfs(caller, ID, simulated_only)
182+
/// Returns a list the src/caller_but_not_a_byond_built_in_proc can cross into
183+
/turf/proc/reachableAdjacentTurfs(caller_but_not_a_byond_built_in_proc, ID, simulated_only)
184184
var/list/L = new()
185185
var/turf/T
186186
var/static/space_type_cache = typecacheof(/turf/open/space)
@@ -189,20 +189,20 @@ Actual Adjacent procs :
189189
T = get_step(src,GLOB.cardinals[k])
190190
if(!T || (simulated_only && space_type_cache[T.type]))
191191
continue
192-
if(!T.density && !LinkBlockedWithAccess(T,caller, ID))
192+
if(!T.density && !LinkBlockedWithAccess(T,caller_but_not_a_byond_built_in_proc, ID))
193193
L.Add(T)
194194
return L
195195

196-
/turf/proc/reachableTurftest(caller, turf/T, ID, simulated_only)
197-
if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller, ID))
196+
/turf/proc/reachableTurftest(caller_but_not_a_byond_built_in_proc, turf/T, ID, simulated_only)
197+
if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller_but_not_a_byond_built_in_proc, ID))
198198
return TRUE
199199

200200
/// Returns adjacent turfs in cardinal directions that are reachable via atmos
201201
/turf/proc/reachableAdjacentAtmosTurfs()
202202
return atmos_adjacent_turfs
203203

204204
/// Check if there is a door that needs access in its way
205-
/turf/proc/LinkBlockedWithAccess(turf/T, caller, ID)
205+
/turf/proc/LinkBlockedWithAccess(turf/T, caller_but_not_a_byond_built_in_proc, ID)
206206
var/adir = get_dir(src, T)
207207
var/rdir = ((adir & MASK_ODD)<<1)|((adir & MASK_EVEN)>>1)
208208
for(var/obj/structure/window/W in src)
@@ -212,29 +212,29 @@ Actual Adjacent procs :
212212
if(!W.CanAStarPass(ID, adir))
213213
return TRUE
214214
for(var/obj/machinery/M in src)
215-
if(!M.CanAStarPass(ID, adir, caller))
215+
if(!M.CanAStarPass(ID, adir, caller_but_not_a_byond_built_in_proc))
216216
return TRUE
217217
for(var/obj/machinery/door/firedoor/border_only/W in src)
218-
if(!W.CanAStarPass(ID, adir, caller))
218+
if(!W.CanAStarPass(ID, adir, caller_but_not_a_byond_built_in_proc))
219219
return TRUE
220220
for(var/obj/O in T)
221-
if(!O.CanAStarPass(ID, rdir, caller))
221+
if(!O.CanAStarPass(ID, rdir, caller_but_not_a_byond_built_in_proc))
222222
return TRUE
223223

224224
return FALSE
225225

226226
//yog procs
227-
/turf/proc/reachableTurftestPlayer(caller, turf/T, ID, simulated_only)
228-
if(T && !T.density && !LinkBlockedWithAccess(T, caller, ID) && !(simulated_only && SSpathfinder.space_type_cache[T.type]))
227+
/turf/proc/reachableTurftestPlayer(caller_but_not_a_byond_built_in_proc, turf/T, ID, simulated_only)
228+
if(T && !T.density && !LinkBlockedWithAccess(T, caller_but_not_a_byond_built_in_proc, ID) && !(simulated_only && SSpathfinder.space_type_cache[T.type]))
229229
return TRUE
230230

231-
/turf/proc/reachableTurftestdensity(caller, turf/T, ID, simulated_only) //used for the sake of pathfinding while excluding turfs with dense objects
232-
if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller, ID))
231+
/turf/proc/reachableTurftestdensity(caller_but_not_a_byond_built_in_proc, turf/T, ID, simulated_only) //used for the sake of pathfinding while excluding turfs with dense objects
232+
if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller_but_not_a_byond_built_in_proc, ID))
233233
for(var/obj/D in T)
234234
if(!istype(D, /obj/structure/window) && D.density) //had to do it silly like this so rwindows didn't stop it outright
235235
return FALSE
236236
return TRUE
237237

238-
/turf/proc/wiringTurfTest(caller, turf/T, ID, simulated_only)
238+
/turf/proc/wiringTurfTest(caller_but_not_a_byond_built_in_proc, turf/T, ID, simulated_only)
239239
if(T && !T.density && !istype(T.loc, /area/space))
240240
return TRUE

code/_onclick/hud/parallax.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
create_parallax(screen_mob)
112112
update_parallax(screen_mob)
113113

114-
// This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller can append their animation)
114+
// This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller_but_not_a_byond_built_in_proc can append their animation)
115115
/datum/hud/proc/set_parallax_movedir(new_parallax_movedir = 0, skip_windups, mob/viewmob)
116116
. = FALSE
117117
var/mob/screenmob = viewmob || mymob

code/datums/actions/cooldown_action.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
return PreActivate(user)
225225

226226
/// Intercepts client owner clicks to activate the ability
227-
/datum/action/cooldown/proc/InterceptClickOn(mob/living/caller, params, atom/target)
227+
/datum/action/cooldown/proc/InterceptClickOn(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/target)
228228
if(!IsAvailable(feedback = TRUE))
229229
return FALSE
230230
if(!target)
@@ -235,8 +235,8 @@
235235

236236
// And if we reach here, the action was complete successfully
237237
if(unset_after_click)
238-
unset_click_ability(caller, refund_cooldown = FALSE)
239-
caller.next_click = world.time + click_cd_override
238+
unset_click_ability(caller_but_not_a_byond_built_in_proc, refund_cooldown = FALSE)
239+
caller_but_not_a_byond_built_in_proc.next_click = world.time + click_cd_override
240240

241241
return TRUE
242242

code/datums/actions/innate_action.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676
on_who.click_intercept = null
7777

7878
/// Handles whenever a mob clicks on something
79-
/datum/action/innate/proc/InterceptClickOn(mob/living/caller, params, atom/clicked_on)
79+
/datum/action/innate/proc/InterceptClickOn(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/clicked_on)
8080
if(!IsAvailable(feedback = TRUE))
81-
unset_ranged_ability(caller)
81+
unset_ranged_ability(caller_but_not_a_byond_built_in_proc)
8282
return FALSE
8383
if(!clicked_on)
8484
return FALSE
8585

86-
return do_ability(caller, params, clicked_on)
86+
return do_ability(caller_but_not_a_byond_built_in_proc, params, clicked_on)
8787

8888
/// Actually goes through and does the click ability
89-
/datum/action/innate/proc/do_ability(mob/living/caller, params, atom/clicked_on)
89+
/datum/action/innate/proc/do_ability(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/clicked_on)
9090
return FALSE
9191

9292
/datum/action/innate/Remove(mob/removed_from)

code/datums/holocall.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
var/call_start_time
3838
var/head_call = FALSE //calls from a head of staff autoconnect, if the recieving pad is not secure.
3939

40-
//creates a holocall made by `caller` from `calling_pad` to `callees`
41-
/datum/holocall/New(mob/living/caller, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE)
40+
//creates a holocall made by `caller_but_not_a_byond_built_in_proc` from `calling_pad` to `callees`
41+
/datum/holocall/New(mob/living/caller_but_not_a_byond_built_in_proc, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE)
4242
call_start_time = world.time
43-
user = caller
43+
user = caller_but_not_a_byond_built_in_proc
4444
calling_pad.outgoing_call = src
4545
calling_holopad = calling_pad
4646
head_call = elevated_access
@@ -302,7 +302,7 @@
302302
var/datum/preset_holoimage/H = new preset_image_type
303303
record.caller_image = H.build_image()
304304

305-
//These build caller image from outfit and some additional data, for use by mappers for ruin holorecords
305+
//These build caller_but_not_a_byond_built_in_proc image from outfit and some additional data, for use by mappers for ruin holorecords
306306
/datum/preset_holoimage
307307
var/nonhuman_mobtype //Fill this if you just want something nonhuman
308308
var/outfit_type

code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_generator.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210

211211
//We have to rawdog the Astar pathfinding and skip the wrapper proc because that's made specifically for mobs
212212
var/list/cable_path = AStar(
213-
caller = our_apc,
213+
caller_but_not_a_byond_built_in_proc = our_apc,
214214
_end = closest_apc,
215215
dist = /turf/proc/Distance_cardinal,
216216
maxnodes = 0,

code/game/machinery/hologram.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ obj/machinery/holopad/secure/Initialize(mapload)
262262
for(var/I in holo_calls)
263263
var/datum/holocall/HC = I
264264
var/list/call_data = list(
265-
caller = HC.user,
265+
caller_but_not_a_byond_built_in_proc = HC.user,
266266
connected = HC.connected_holopad == src ? TRUE : FALSE,
267267
ref = REF(HC)
268268
)

code/game/machinery/porta_turret/portable_turret.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,13 +628,13 @@
628628
remote_controller = null
629629
return TRUE
630630

631-
/obj/machinery/porta_turret/proc/InterceptClickOn(mob/living/caller, params, atom/A)
631+
/obj/machinery/porta_turret/proc/InterceptClickOn(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/A)
632632
if(!manual_control)
633633
return FALSE
634-
if(!can_interact(caller))
634+
if(!can_interact(caller_but_not_a_byond_built_in_proc))
635635
remove_control()
636636
return FALSE
637-
log_combat(caller,A,"fired with manual turret control at")
637+
log_combat(caller_but_not_a_byond_built_in_proc,A,"fired with manual turret control at")
638638
target(A)
639639
return TRUE
640640

code/game/machinery/telecomms/machines/message_server.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
pda_msgs += M
138138
signal.logged = TRUE
139139
var/datum/signal/subspace/current = signal
140-
while (current) // Recursively mark logged so we know in the caller proc that it is logged and sent proper
140+
while (current) // Recursively mark logged so we know in the caller_but_not_a_byond_built_in_proc proc that it is logged and sent proper
141141
current.data["logged"] = TRUE
142142
current = current.original
143143
else if(istype(signal, /datum/signal/subspace/messaging/rc))

code/game/objects/items/robot/ai_upgrades.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
if(owner.stat == DEAD)
164164
return FALSE
165165

166-
/datum/action/innate/ai/ranged/cameragun/do_ability(mob/living/caller, params, atom/target)
166+
/datum/action/innate/ai/ranged/cameragun/do_ability(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/target)
167167
var/turf/loc_target = get_turf(target)
168168
var/obj/machinery/camera/chosen_camera
169169
for(var/obj/machinery/camera/cam in GLOB.cameranet.cameras)
@@ -191,7 +191,7 @@
191191
continue
192192
if(!chosen_camera)
193193
Deactivate(FALSE)
194-
to_chat(caller, span_notice("Unable to find nearby available cameras for this target."))
194+
to_chat(caller_but_not_a_byond_built_in_proc, span_notice("Unable to find nearby available cameras for this target."))
195195
return FALSE
196196
if(!burstmode_activated)
197197
toggle_burstmode()
@@ -203,7 +203,7 @@
203203
Deactivate(FALSE)
204204
CRASH("Camera gun's proj_type was not a projectile.")
205205
proj.preparePixelProjectile(target, chosen_camera)
206-
proj.firer = caller
206+
proj.firer = caller_but_not_a_byond_built_in_proc
207207

208208
// Fire the shot.
209209
var/pointblank = get_dist(chosen_camera, target) <= 1 ? TRUE : FALSE // Same tile or right next.
@@ -214,7 +214,7 @@
214214
chosen_camera.visible_message(span_danger("[chosen_camera] fires a laser!"))
215215
proj.fire()
216216
Deactivate(FALSE)
217-
to_chat(caller, span_danger("Camera overcharged."))
217+
to_chat(caller_but_not_a_byond_built_in_proc, span_danger("Camera overcharged."))
218218

219219
/* This EMP prevents burstmode from annihilating a stationary object/person.
220220
If someone gives a camera EMP resistance, then they had it coming. */

0 commit comments

Comments
 (0)