shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100

Browse Source 
[MIRROR] Adds spaceturf check to blob overmind spawning
This commit is contained in:
deathride58
2018-01-08 06:17:23 +00:00
committed by GitHub
parent ec59412bca 9decb2e2b2
commit 39614f685e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/overmind.dm
+13 -4
View File
@@ -58,12 +58,21 @@ GLOBAL_LIST_EMPTY(blob_nodes)
/mob/camera/blob/proc/validate_location()
var/turf/T = get_turf(src)
var/area/A = get_area(T)
if(((A && !A.blob_allowed) || !T || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart))
T = get_turf(pick(GLOB.blobstart))
if(!is_valid_turf(T) && LAZYLEN(GLOB.blobstart))
var/list/blobstarts = shuffle(GLOB.blobstart)
for(var/_T in blobstarts)
if(is_valid_turf(_T))
T = _T
break
if(!T)
CRASH("No blobspawnpoints and blob spawned in nullspace.")
forceMove(T)
/mob/camera/blob/proc/is_valid_turf(turf/T)
var/area/A = get_area(T)
if((A && !A.blob_allowed) || !T || !is_station_level(T.z) || isspaceturf(T))
return FALSE
return TRUE
/mob/camera/blob/Life()
if(!blob_core)
@@ -246,4 +255,4 @@ GLOBAL_LIST_EMPTY(blob_nodes)
. = ..()
var/datum/antagonist/blob/B = mind.has_antag_datum(/datum/antagonist/blob)
if(!B)
mind.add_antag_datum(/datum/antagonist/blob)
mind.add_antag_datum(/datum/antagonist/blob)