cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-07-15 12:27:54 +02:00
parent 0c6a0bddab 4c340c5dac
commit 0f05106e95
37 changed files with 432 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/ai.dm
View File

@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(ai)
while(currentrun.len)
var/datum/ai_holder/A = currentrun[currentrun.len]
--currentrun.len
if(!A || QDELETED(A) || A.busy) // Doesn't exist or won't exist soon or not doing it this tick
if(!A || QDELETED(A) || !A.holder?.loc || A.busy) // Doesn't exist or won't exist soon or not doing it this tick
continue
if(process_z[get_z(A.holder)])

2
code/controllers/subsystems/mobs.dm
View File

@@ -43,7 +43,7 @@ SUBSYSTEM_DEF(mobs)
if(!M || QDELETED(M))
mob_list -= M
continue
else if(M.low_priority && !(process_z[get_z(M)]))
else if(M.low_priority && !(M.loc && process_z[get_z(M)]))
slept_mobs++
continue