mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13.git
synced 2026-08-26 09:36:50 +01:00
Fix
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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, "<span class='notice'><span class='big'>Priority waypoint set by [icon2html(calling_ai, src)] <b>[caller]</b>. Proceed to <b>[end_area]</b>.</span><br>[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.</span>")
|
||||
to_chat(src, "<span class='notice'><span class='big'>Priority waypoint set by [icon2html(calling_ai, src)] <b>[caller1]</b>. Proceed to <b>[end_area]</b>.</span><br>[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.</span>")
|
||||
if(message)
|
||||
to_chat(calling_ai, "<span class='notice'>[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.</span>")
|
||||
pathset = 1
|
||||
|
||||
@@ -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]"))
|
||||
|
||||
@@ -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]"))
|
||||
|
||||
@@ -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]"))
|
||||
|
||||
Reference in New Issue
Block a user