cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 19:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8753 from Sishen1542/siliconmanbad

Browse Source 
[PORT] Non-station AI can no longer interact off their z-level.
This commit is contained in:
deathride58
2019-06-28 00:29:32 -04:00
committed by GitHub
parent 7562abe2d4 65d05f7df0
commit 2ed69c8b46
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_onclick/ai.dm
View File

@@ -23,6 +23,9 @@
return return
next_click = world.time + 1 next_click = world.time + 1
if(!can_interact_with(A))
return
if(multicam_on) if(multicam_on)
var/turf/T = get_turf(A) var/turf/T = get_turf(A)
if(T) if(T)
@@ -60,7 +63,6 @@
controlled_mech.click_action(A, src, params) //Override AI normal click behavior. controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
return return
return
if(modifiers["shift"]) if(modifiers["shift"])
ShiftClickOn(A) ShiftClickOn(A)
return return

9
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -288,8 +288,17 @@
/mob/living/silicon/ai/can_interact_with(atom/A) /mob/living/silicon/ai/can_interact_with(atom/A)
. = ..() . = ..()
var/turf/ai = get_turf(src)
var/turf/target = get_turf(A)
if (.) if (.)
return return
if(!target)
return
if ((ai.z != target.z) && !is_station_level(ai.z))
return FALSE
if (istype(loc, /obj/item/aicard)) if (istype(loc, /obj/item/aicard))
var/turf/T0 = get_turf(src) var/turf/T0 = get_turf(src)
var/turf/T1 = get_turf(A) var/turf/T1 = get_turf(A)