From f0214dd06d019509d15df85de9ec829b78429c60 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:31:13 -0600 Subject: [PATCH] Update overmind.dm --- code/game/gamemodes/blob/overmind.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 9e4b29b5c3..22074392fc 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -53,9 +53,6 @@ GLOBAL_LIST_EMPTY(blob_nodes) SSshuttle.registerHostileEnvironment(src) -<<<<<<< HEAD - .= ..() -======= /mob/camera/blob/proc/validate_location() var/turf/T = get_turf(src) var/area/A = get_area(T) @@ -64,7 +61,6 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!T) CRASH("No blobspawnpoints and blob spawned in nullspace.") forceMove(T) ->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829) /mob/camera/blob/Life() if(!blob_core) @@ -84,12 +80,9 @@ GLOBAL_LIST_EMPTY(blob_nodes) max_blob_points = INFINITY blob_points = INFINITY addtimer(CALLBACK(src, .proc/victory), 450) -<<<<<<< HEAD -======= if(!victory_in_progress && max_count < blobs_legit.len) max_count = blobs_legit.len ->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829) ..()