Skip to content

Commit

Permalink
Merge pull request #6470 from Kyep/move_blob_start
Browse files Browse the repository at this point in the history
Makes blobs less cheesable
  • Loading branch information
Fox-McCloud committed Feb 21, 2017
2 parents dc590ac + 1b26bff commit dc44a34
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions code/modules/events/blob.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/event/blob
announceWhen = 12
announceWhen = 60
endWhen = 120
var/obj/effect/blob/core/Blob

Expand All @@ -10,9 +10,17 @@
var/turf/T = pick(blobstart)
if(!T)
return kill()
Blob = new /obj/effect/blob/core(T, 200)
for(var/i = 1; i < rand(3, 6), i++)
Blob.process()
var/list/candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1)
var/mob/C
if(candidates.len)
C = pick(candidates)
Blob = new /obj/effect/blob/core(T, 200)
Blob.create_overmind(C.client, 1)
spawn(30)
for(var/i = 1; i < rand(3, 6), i++)
Blob.process()
else
return kill()

/datum/event/blob/tick()
if(!Blob)
Expand Down

0 comments on commit dc44a34

Please sign in to comment.