cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7243 from Mechoid/BlobLoop

Browse Source 
Blob Infinite Loop Fix
This commit is contained in:
Atermonera
2020-05-30 21:22:47 -07:00
committed by VirgoBot
parent 30cf26ba8e
commit 9e77aca051
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/blob2/core_chunk.dm
View File

@@ -61,12 +61,13 @@
/obj/item/weapon/blobcore_chunk/proc/get_carrier(var/atom/target) /obj/item/weapon/blobcore_chunk/proc/get_carrier(var/atom/target)
var/atom/A = target ? target.loc : src var/atom/A = target ? target.loc : src
if(!istype(A, /mob/living))
A = get_carrier(A)
if(isturf(A) || isarea(A)) // Something has gone horribly wrong if the second is true. if(isturf(A) || isarea(A)) // Something has gone horribly wrong if the second is true.
return FALSE // No mob is carrying us. return FALSE // No mob is carrying us.
if(!istype(A, /mob/living))
A = get_carrier(A)
return A return A
/obj/item/weapon/blobcore_chunk/blob_act(obj/structure/blob/B) /obj/item/weapon/blobcore_chunk/blob_act(obj/structure/blob/B)