From 115f1910845814c3bd569e9b57453f07a850d33b Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 12 May 2019 13:19:52 +0200 Subject: [PATCH 1/3] blob split fix --- code/_onclick/hud/blob_overmind.dm | 2 +- code/game/gamemodes/blob/blobs/core.dm | 2 +- code/game/gamemodes/blob/powers.dm | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index 6fe3a781642..802e698f069 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -126,7 +126,7 @@ /obj/screen/blob/Split icon_state = "ui_split" name = "Split consciousness (100)" - desc = "Creates another Blob Overmind at the nearest node. One use only.
Offsprings are be unable to use this ability." + desc = "Creates another Blob Overmind at the targetted node. One use only.
Offsprings are unable to use this ability." /obj/screen/blob/Split/Click() if(isovermind(usr)) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index 0482a8e19ae..fe59298cb3e 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -105,7 +105,7 @@ spawn() if(!new_overmind) - candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1) + candidates = pollCandidates("Do you want to play as a blob offspring?", ROLE_BLOB, 1) if(candidates.len) C = pick(candidates) else diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 61196c9862f..d71bb3a0102 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -350,31 +350,32 @@ BS.Goto(pick(surrounding_turfs), BS.move_to_delay) return - /mob/camera/blob/verb/split_consciousness() set category = "Blob" set name = "Split consciousness (100) (One use)" set desc = "Expend resources to attempt to produce another sentient overmind." + var/turf/T = get_turf(src) + if(!T) + return if(split_used) to_chat(src, "You have already produced an offspring.") return if(is_offspring) to_chat(src, "You cannot split as an offspring of another Blob.") return - if(!blob_nodes || !blob_nodes.len) - to_chat(src, "A node is required to birth your offspring...") - return - var/obj/structure/blob/node/N = locate(/obj/structure/blob) in blob_nodes - if(!N) - to_chat(src, "A node is required to birth your offspring...") - return + var/obj/structure/blob/N = (locate(/obj/structure/blob) in T) + if(!N) + to_chat(src, "A node is required to birth your offspring..") + return + if(!istype(N, /obj/structure/blob/node)) + to_chat(src, "A node is required to birth your offspring..") + return if(!can_buy(100)) return split_used = TRUE - new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, "offspring") qdel(N) @@ -382,7 +383,6 @@ var/datum/game_mode/blob/BL = ticker.mode BL.blobwincount += initial(BL.blobwincount) - /mob/camera/blob/verb/blob_broadcast() set category = "Blob" set name = "Blob Broadcast" From 8a1f3ced793867198f3f664549ca06be3ec980c2 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 12 May 2019 13:55:16 +0200 Subject: [PATCH 2/3] Fix for admin spawned blob cores --- code/game/gamemodes/blob/blobs/core.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index fe59298cb3e..91c6df639e5 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -105,7 +105,11 @@ spawn() if(!new_overmind) - candidates = pollCandidates("Do you want to play as a blob offspring?", ROLE_BLOB, 1) + if(is_offspring) + candidates = pollCandidates("Do you want to play as a blob offspring?", ROLE_BLOB, 1) + else + candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1) + if(candidates.len) C = pick(candidates) else @@ -123,7 +127,6 @@ if(is_offspring) B.is_offspring = TRUE - /obj/structure/blob/core/proc/lateblobtimer() addtimer(CALLBACK(src, .proc/lateblobcheck), 50) From a78cf680de5ea8bd2c8ebf36ed401b7338d88c0c Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 17 May 2019 14:02:38 +0200 Subject: [PATCH 3/3] grammar fixes --- code/_onclick/hud/blob_overmind.dm | 2 +- code/game/gamemodes/blob/powers.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index 802e698f069..1e8f99814df 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -126,7 +126,7 @@ /obj/screen/blob/Split icon_state = "ui_split" name = "Split consciousness (100)" - desc = "Creates another Blob Overmind at the targetted node. One use only.
Offsprings are unable to use this ability." + desc = "Creates another Blob Overmind at the targeted node. One use only.
Offspring are unable to use this ability." /obj/screen/blob/Split/Click() if(isovermind(usr)) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index d71bb3a0102..e06a8c800b4 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -367,10 +367,10 @@ var/obj/structure/blob/N = (locate(/obj/structure/blob) in T) if(!N) - to_chat(src, "A node is required to birth your offspring..") + to_chat(src, "A node is required to birth your offspring.") return if(!istype(N, /obj/structure/blob/node)) - to_chat(src, "A node is required to birth your offspring..") + to_chat(src, "A node is required to birth your offspring.") return if(!can_buy(100)) return