From ea99b708a2c6d8aa80c0988464a5b834301a92ad Mon Sep 17 00:00:00 2001 From: vm-silicons Date: Fri, 19 Dec 2025 22:16:28 -0800 Subject: [PATCH] Fix --- code/__HELPERS/path.dm | 6 +++--- code/datums/action.dm | 4 ++-- code/datums/elements/_element.dm | 2 +- code/datums/holocall.dm | 4 ++-- code/game/gamemodes/objective.dm | 2 +- code/game/machinery/hologram.dm | 2 +- code/game/objects/objs.dm | 2 +- code/game/objects/structures/plasticflaps.dm | 6 +++--- code/game/objects/structures/window.dm | 2 +- code/game/turfs/turf.dm | 4 ++-- code/modules/antagonists/blob/blob/theblob.dm | 6 +++--- .../antagonists/bloodsucker/bloodsucker_powers.dm | 2 +- .../clockcult/clock_items/judicial_visor.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 4 ++-- code/modules/antagonists/cult/cult_comms.dm | 12 ++++++------ .../antagonists/eldritch_cult/eldritch_effects.dm | 6 +++--- .../antagonists/traitor/equipment/Malf_Modules.dm | 4 ++-- code/modules/client/preferences.dm | 2 +- code/modules/holodeck/area_copy.dm | 2 +- code/modules/holodeck/computer.dm | 2 +- .../mob/living/carbon/alien/humanoid/alien_powers.dm | 2 +- code/modules/mob/living/simple_animal/bot/bot.dm | 6 +++--- .../mob/living/simple_animal/hostile/giant_spider.dm | 2 +- .../modular_computers/computers/item/computer.dm | 8 ++++---- .../modular_computers/computers/item/processor.dm | 6 +++--- .../modular_computers/computers/item/tablet.dm | 6 +++--- code/modules/spells/spell.dm | 8 ++++---- code/modules/spells/spell_types/aimed.dm | 2 +- code/modules/spells/spell_types/pointed/pointed.dm | 10 +++++----- 29 files changed, 63 insertions(+), 63 deletions(-) diff --git a/code/__HELPERS/path.dm b/code/__HELPERS/path.dm index 8e6cd2e759..2b5792a73d 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(!caller1 || !get_turf(end)) + if(!caller || !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.caller1 = caller1 + src.caller = caller1 end = get_turf(goal) open = new /datum/heap(/proc/HeapPathWeightCompare) sources = new() @@ -333,7 +333,7 @@ * For seeing if we can actually move between 2 given turfs while accounting for our access and the caller's pass_flags * * Arguments: - * * caller1: The movable, if one exists, being used for mobility checks to see what tiles it can reach + * * caller: The movable, if one exists, being used for mobility checks to see what tiles it can reach * * ID: An ID card that decides if we can gain access to doors that would otherwise block a turf * * simulated_only: Do we only worry about turfs with simulated atmos, most notably things that aren't space? */ diff --git a/code/datums/action.dm b/code/datums/action.dm index 295b6c4461..68df698967 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -895,13 +895,13 @@ return PreActivate(owner) /// Intercepts client owner clicks to activate the ability -/datum/action/cooldown/proc/InterceptClickOn(mob/living/, params, atom/target) +/datum/action/cooldown/proc/InterceptClickOn(mob/living/caller1, params, atom/target) if(!IsAvailable()) return FALSE if(!target) return FALSE PreActivate(target) - .click_intercept = null + caller1.click_intercept = null return TRUE /// For signal calling diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index 62e719c325..a77a519909 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -27,10 +27,10 @@ /// Deactivates the functionality defines by the element on the given datum /datum/element/proc/Detach(datum/source, force) - SHOULD_CALL_PARENT(TRUE) SIGNAL_HANDLER SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src) + SHOULD_CALL_PARENT(TRUE) UnregisterSignal(source, COMSIG_PARENT_QDELETING) /datum/element/Destroy(force) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 24b4535d5d..e4af52cbbf 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -35,9 +35,9 @@ var/head_call = FALSE //calls from a head of staff autoconnect, if the receiving pad is not secure. //creates a holocall made by `caller` from `calling_pad` to `callees` -/datum/holocall/New(mob/living/, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE) +/datum/holocall/New(mob/living/caller1, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE) call_start_time = world.time - user = + user = caller1 calling_pad.outgoing_call = src calling_holopad = calling_pad head_call = elevated_access diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ab087dceb0..43a126fd70 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -87,7 +87,7 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo. /datum/objective/proc/is_unique_objective(possible_target) var/list/datum/mind/owners = get_owners() for(var/datum/mind/M in owners) - for(var/datum/objective/O in M.get_all_objectives()) //This scope is debatable, probably should be passed in by caller. + for(var/datum/objective/O in M.get_all_objectives()) //This scope is debatable, probably should be passed in by caller1. if(istype(O, type) && O.get_target() == possible_target) return FALSE return TRUE diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 95b2293756..73f9089050 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( - = HC.user, + caller = HC.user, connected = HC.connected_holopad == src ? TRUE : FALSE, ref = REF(HC) ) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index ee38e031a3..759c0b5ab0 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -261,7 +261,7 @@ * Arguments: * * ID- An ID card representing what access we have (and thus if we can open things like airlocks or windows to pass through them). The ID card's physical location does not matter, just the reference * * to_dir- What direction we're trying to move in, relevant for things like directional windows that only block movement in certain directions - * * caller1- The movable we're checking pass flags for, if we're making any such checks + * * caller- The movable we're checking pass flags for, if we're making any such checks **/ /obj/proc/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller1) if(ismovable(caller1)) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 5a2a98a99c..211e4605af 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -61,11 +61,11 @@ if(isbot(caller1)) return TRUE - var/mob/living/living_caller1 = caller1 - if(!(SEND_SIGNAL(living_caller1, COMSIG_CHECK_VENTCRAWL)) && living_caller1.mob_size != MOB_SIZE_TINY) + var/mob/living/living_caller = caller1 + if(!(SEND_SIGNAL(living_caller, COMSIG_CHECK_VENTCRAWL)) && living_caller.mob_size != MOB_SIZE_TINY) return FALSE - if(caller1?.pulling) + if(caller?.pulling) return CanAStarPass(ID, to_dir, caller1.pulling) return TRUE //diseases, stings, etc can pass diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e7e666ee29..86989198df 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -570,7 +570,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/structure/window/get_dumping_location(obj/item/storage/source,mob/user) return null -/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/) +/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller1) if(!density) return TRUE if((dir == FULLTILE_WINDOW_DIR) || (dir == to_dir)) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index b9cad9b78c..49ae8ace94 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -634,7 +634,7 @@ GLOBAL_LIST_EMPTY(station_turfs) * * ID: An ID card that decides if we can gain access to doors that would otherwise block a turf * * simulated_only: Do we only worry about turfs with simulated atmos, most notably things that aren't space? */ -/turf/proc/reachableAdjacentTurfs(, ID, simulated_only) +/turf/proc/reachableAdjacentTurfs(caller1, ID, simulated_only) var/static/space_type_cache = typecacheof(/turf/open/space) . = list() @@ -642,6 +642,6 @@ GLOBAL_LIST_EMPTY(station_turfs) var/turf/turf_to_check = get_step(src,iter_dir) if(!turf_to_check || (simulated_only && space_type_cache[turf_to_check.type])) continue - if(turf_to_check.density || LinkBlockedWithAccess(turf_to_check, , ID)) + if(turf_to_check.density || LinkBlockedWithAccess(turf_to_check, caller1, ID)) continue . += turf_to_check diff --git a/code/modules/antagonists/blob/blob/theblob.dm b/code/modules/antagonists/blob/blob/theblob.dm index ab2470a0e9..0d46810ebd 100644 --- a/code/modules/antagonists/blob/blob/theblob.dm +++ b/code/modules/antagonists/blob/blob/theblob.dm @@ -71,10 +71,10 @@ /obj/structure/blob/CanAtmosPass(turf/T) return !atmosblock -/obj/structure/blob/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/) +/obj/structure/blob/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller1) . = FALSE - if(istype()) - . = . || (.pass_flags & PASSBLOB) + if(istype(caller1)) + . = . || (caller1.pass_flags & PASSBLOB) /obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind. . = ..() diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm index 7726ac5184..b21fd97aa6 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm @@ -266,5 +266,5 @@ ..() linked_power.DeactivatePower() -/obj/effect/proc_holder/bloodsucker/InterceptClickOn(mob/living/, params, atom/A) +/obj/effect/proc_holder/bloodsucker/InterceptClickOn(mob/living/caller1, params, atom/A) return linked_power.ClickWithPower(A) diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index edc0e9a10f..8a9b12ff38 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -112,7 +112,7 @@ message = "You harness [visor]'s power. Left-click to place a judicial marker!" add_ranged_ability(user, message) -/obj/effect/proc_holder/judicial_visor/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/judicial_visor/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return if(ranged_ability_user.incapacitated() || !visor || visor != ranged_ability_user.get_item_by_slot(ITEM_SLOT_EYES)) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index b58127e0e2..e1633d83dd 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -252,10 +252,10 @@ else add_ranged_ability(user, "You prepare to horrify a target...") -/obj/effect/proc_holder/horror/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/horror/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return - if(ranged_ability_user.incapacitated() || !iscultist()) + if(ranged_ability_user.incapacitated() || !iscultist(caller1)) remove_ranged_ability() return var/turf/T = get_turf(ranged_ability_user) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index f96d556499..250531210a 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -256,7 +256,7 @@ else add_ranged_ability(user, "You prepare to mark a target for your cult...") -/obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return if(ranged_ability_user.incapacitated()) @@ -266,7 +266,7 @@ if(!isturf(T)) return FALSE - var/datum/antagonist/cult/C = .mind.has_antag_datum(/datum/antagonist/cult,TRUE) + var/datum/antagonist/cult/C = caller1.mind.has_antag_datum(/datum/antagonist/cult,TRUE) if(!C.cult_team) to_chat(ranged_ability_user, "What is the point of marking a target for yourself?") remove_ranged_ability() @@ -437,7 +437,7 @@ else add_ranged_ability(user, "You prepare to tear through the fabric of reality...") -/obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return if(ranged_ability_user.incapacitated()) @@ -447,7 +447,7 @@ if(!isturf(T)) return FALSE if(target in view(7, get_turf(ranged_ability_user))) - if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == ) && !(attached_action.throwing)) + if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == caller1) && !(attached_action.throwing)) return if(!attached_action.throwing) attached_action.throwing = TRUE @@ -467,5 +467,5 @@ attached_action.throwing = FALSE attached_action.cooldown = world.time + attached_action.base_cooldown remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.") - .update_action_buttons_icon() - addtimer(CALLBACK(, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown) + caller1.update_action_buttons_icon() + addtimer(CALLBACK(caller1, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 6f74fe0367..abba11ffba 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -147,9 +147,9 @@ * * Automatically creates more reality smashes */ -/datum/reality_smash_tracker/proc/Generate(mob/) - if(istype()) - targets += +/datum/reality_smash_tracker/proc/Generate(mob/caller1) + if(istype(caller1)) + targets += caller1 var/targ_len = length(targets) var/smash_len = length(smashes) var/number = max(targ_len * (6-(targ_len-1)) - smash_len,1) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 778e3c088a..afec205a0e 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -597,7 +597,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( enable_text = "You tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel." disable_text = "You release your hold on the powernet." -/obj/effect/proc_holder/ranged_ai/overload_machine/InterceptClickOn(mob/living/, params, obj/machinery/target) +/obj/effect/proc_holder/ranged_ai/overload_machine/InterceptClickOn(mob/living/caller1, params, obj/machinery/target) if(..()) return if(ranged_ability_user.incapacitated()) @@ -644,7 +644,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( enable_text = "You tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel." disable_text = "You release your hold on the powernet." -/obj/effect/proc_holder/ranged_ai/override_machine/InterceptClickOn(mob/living/, params, obj/machinery/target) +/obj/effect/proc_holder/ranged_ai/override_machine/InterceptClickOn(mob/living/caller1, params, obj/machinery/target) if(..()) return if(ranged_ability_user.incapacitated()) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 564c85e12b..7e505d2861 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/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index 5af6d0ac37..167974a193 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -1,7 +1,7 @@ //Vars that will not be copied when using /DuplicateObject GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( "tag", "datum_components", "area", "type", "loc", "locs", "vars", "parent", "parent_type", "verbs", "ckey", "key", - "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup", "pixloc" + "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup" )) GLOBAL_LIST_INIT(duplicate_forbidden_vars_by_type, typecacheof_assoc_list(list( diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 6270cd0923..a9717ed0ac 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -180,7 +180,7 @@ var/obj/effect/holodeck_effect/HE = e HE.tick() - active_power_usage = 50 + spawned?.len * 3 + effects?.len * 5 + active_power_usage = 50 + spawned.len * 3 + effects.len * 5 /obj/machinery/computer/holodeck/emag_act(mob/user) . = ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 69fbdce01e..1ecbf47430 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -203,7 +203,7 @@ Doesn't work on other aliens/AI.*/ action.button_icon_state = "alien_neurotoxin_[active]" action.UpdateButtons() -/obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return var/p_cost = 50 diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 71af8c9d42..bd0f1920c4 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -543,7 +543,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(mode != BOT_SUMMON && mode != BOT_RESPONDING) access_card.access = prev_access -/mob/living/simple_animal/bot/proc/call_bot(, turf/waypoint, message=TRUE) +/mob/living/simple_animal/bot/proc/call_bot(caller1, turf/waypoint, message=TRUE) bot_reset() //Reset a bot before setting it to call mode. //For giving the bot temporary all-access. @@ -552,7 +552,7 @@ Pass a positive integer as an argument to override a bot's default speed. all_access.access = All.get_access() set_path(get_path_to(src, waypoint, 200, id=all_access)) - calling_ai = //Link the AI to the bot! + calling_ai = caller1 //Link the AI to the bot! ai_waypoint = waypoint if(path && path.len) //Ensures that a valid path is calculated! @@ -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)] []. 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)] [caller]. 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/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 0168cd2cd0..91cd826f0b 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -421,7 +421,7 @@ add_ranged_ability(user, message, TRUE) return TRUE -/obj/effect/proc_holder/wrap/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/wrap/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return if(ranged_ability_user.incapacitated() || !istype(ranged_ability_user, /mob/living/simple_animal/hostile/poison/giant_spider/nurse)) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 65734ef6bf..2c46891418 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -307,14 +307,14 @@ * The message that the program wishes to display. */ -/obj/item/modular_computer/proc/alert_call(datum/computer_file/program/, alerttext, sound = 'sound/machines/twobeep_high.ogg') - if(! || !.alert_able || .alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. +/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. return playsound(src, sound, 50, TRUE) - visible_message(span_notice("The [src] displays a [.filedesc] notification: [alerttext]")) + visible_message(span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")) var/mob/living/holder = loc if(istype(holder)) - to_chat(holder, "[icon2html(src)] [span_notice("The [src] displays a [.filedesc] notification: [alerttext]")]") + to_chat(holder, "[icon2html(src)] [span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")]") // Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_" /obj/item/modular_computer/proc/get_header_data() diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm index def1b3414c..4a7065aca6 100644 --- a/code/modules/modular_computers/computers/item/processor.dm +++ b/code/modules/modular_computers/computers/item/processor.dm @@ -53,8 +53,8 @@ /obj/item/modular_computer/processor/attack_ghost(mob/user) ui_interact(user) -/obj/item/modular_computer/processor/alert_call(datum/computer_file/program/, alerttext) - if(! || !.alert_able || .alert_silenced || !alerttext) +/obj/item/modular_computer/processor/alert_call(datum/computer_file/program/caller1, alerttext) + if(!caller || !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 [.filedesc] notification: [alerttext]")) + 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 b67f59798c..1d26aac61d 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -225,11 +225,11 @@ borgo.toggle_headlamp(FALSE, TRUE) return TRUE -/obj/item/modular_computer/tablet/integrated/alert_call(datum/computer_file/program/, alerttext, sound = 'sound/machines/twobeep_high.ogg') - if(! || !.alert_able || .alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence. +/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. return borgo.playsound_local(src, sound, 50, TRUE) - to_chat(borgo, span_notice("The [src] displays a [.filedesc] notification: [alerttext]")) + to_chat(borgo, span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")) /obj/item/modular_computer/tablet/integrated/syndicate diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 20ce88dc49..df4db64fba 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -52,10 +52,10 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/proc/Trigger(mob/user) return TRUE -/obj/effect/proc_holder/proc/InterceptClickOn(mob/living/, params, atom/A) - if(.ranged_ability != src || ranged_ability_user != ) //I'm not actually sure how these would trigger, but, uh, safety, I guess? - to_chat(, "[.ranged_ability.name] has been disabled.") - .ranged_ability.remove_ranged_ability() +/obj/effect/proc_holder/proc/InterceptClickOn(mob/living/caller1, params, atom/A) + if(caller1.ranged_ability != src || ranged_ability_user != caller1) //I'm not actually sure how these would trigger, but, uh, safety, I guess? + to_chat(caller1, "[caller1.ranged_ability.name] has been disabled.") + caller1.ranged_ability.remove_ranged_ability() return TRUE //TRUE for failed, FALSE for passed. return FALSE diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index d6f336d563..d671b6eeb5 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -46,7 +46,7 @@ action.button_icon_state = "[base_icon_state][active]" action.UpdateButtons() -/obj/effect/proc_holder/spell/aimed/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/spell/aimed/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return FALSE var/ran_out = (current_amount <= 0) diff --git a/code/modules/spells/spell_types/pointed/pointed.dm b/code/modules/spells/spell_types/pointed/pointed.dm index 7cbfbcff80..53c7d9086b 100644 --- a/code/modules/spells/spell_types/pointed/pointed.dm +++ b/code/modules/spells/spell_types/pointed/pointed.dm @@ -66,21 +66,21 @@ action.button_icon_state = "[action_icon_state]" action.UpdateButtons() -/obj/effect/proc_holder/spell/pointed/InterceptClickOn(mob/living/, params, atom/target) +/obj/effect/proc_holder/spell/pointed/InterceptClickOn(mob/living/caller1, params, atom/target) if(..()) return TRUE if(aim_assist && isturf(target)) var/list/possible_targets = list() for(var/A in target) - if(intercept_check(, A, TRUE)) + if(intercept_check(caller1, A, TRUE)) possible_targets += A if(possible_targets.len == 1) target = possible_targets[1] - if(!intercept_check(, target)) + if(!intercept_check(caller1, target)) return TRUE - if(!cast_check(FALSE, )) + if(!cast_check(FALSE, caller1)) return TRUE - perform(list(target), user = ) + perform(list(target), user = caller1) remove_ranged_ability() return TRUE // Do not do any underlying actions after the spell cast