diff --git a/code/__HELPERS/path.dm b/code/__HELPERS/path.dm index 2b5792a73d..0962afdc95 100644 --- a/code/__HELPERS/path.dm +++ b/code/__HELPERS/path.dm @@ -19,7 +19,7 @@ * * skip_first: Whether or not to delete the first item in the path. This would be done because the first item is the starting tile, which can break movement for some creatures. */ /proc/get_path_to(caller1, end, max_distance = 30, mintargetdist, id=null, simulated_only = TRUE, turf/exclude, skip_first=TRUE) - if(!caller || !get_turf(end)) + if(!caller1 || !get_turf(end)) return var/l = SSpathfinder.mobs.getfree(caller1) @@ -122,7 +122,7 @@ var/turf/avoid /datum/pathfind/New(atom/movable/caller1, atom/goal, id, max_distance, mintargetdist, simulated_only, avoid) - src.caller = caller1 + src.caller1 = caller1 end = get_turf(goal) open = new /datum/heap(/proc/HeapPathWeightCompare) sources = new() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 73f9089050..84f82e406a 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -264,7 +264,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I var/list/call_data = list( - caller = HC.user, + caller1 = HC.user, connected = HC.connected_holopad == src ? TRUE : FALSE, ref = REF(HC) ) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 211e4605af..6c66be7643 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -65,7 +65,7 @@ if(!(SEND_SIGNAL(living_caller, COMSIG_CHECK_VENTCRAWL)) && living_caller.mob_size != MOB_SIZE_TINY) return FALSE - if(caller?.pulling) + if(caller1?.pulling) return CanAStarPass(ID, to_dir, caller1.pulling) return TRUE //diseases, stings, etc can pass diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7e505d2861..564c85e12b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -367,7 +367,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(character_settings_tab == LOADOUT_CHAR_TAB) //if loadout //calculate your gear points from the chosen item gear_points = CONFIG_GET(number/initial_gear_points) - var/list/chosen_gear = loadout_data["SAVE_[loadout_slot]"] + var/list/chosen_gear = loadout_data?["SAVE_[loadout_slot]"] if(islist(chosen_gear)) loadout_errors = 0 for(var/loadout_item in chosen_gear) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index bd0f1920c4..4334eed967 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -562,7 +562,7 @@ Pass a positive integer as an argument to override a bot's default speed. access_card = all_access //Give the bot all-access while under the AI's command. if(client) reset_access_timer_id = addtimer(CALLBACK (src, PROC_REF(bot_reset)), 600, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time - to_chat(src, "Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.") + to_chat(src, "Priority waypoint set by [icon2html(calling_ai, src)] [caller1]. Proceed to [end_area].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.") if(message) to_chat(calling_ai, "[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.") pathset = 1 diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 2c46891418..a267aec0e9 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -308,7 +308,7 @@ */ /obj/item/modular_computer/proc/alert_call(datum/computer_file/program/caller1, alerttext, sound = 'sound/machines/twobeep_high.ogg') - if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. + if(!caller1 || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. return playsound(src, sound, 50, TRUE) visible_message(span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")) diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm index 4a7065aca6..d0e608b7a8 100644 --- a/code/modules/modular_computers/computers/item/processor.dm +++ b/code/modules/modular_computers/computers/item/processor.dm @@ -54,7 +54,7 @@ ui_interact(user) /obj/item/modular_computer/processor/alert_call(datum/computer_file/program/caller1, alerttext) - if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext) + if(!caller1 || !caller1.alert_able || caller1.alert_silenced || !alerttext) return playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE) machinery_computer.visible_message(span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")) diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index 1d26aac61d..1ee0f47e70 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -226,7 +226,7 @@ return TRUE /obj/item/modular_computer/tablet/integrated/alert_call(datum/computer_file/program/caller1, alerttext, sound = 'sound/machines/twobeep_high.ogg') - if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. + if(!caller1 || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. return borgo.playsound_local(src, sound, 50, TRUE) to_chat(borgo, span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]"))