[MIRROR] Fixes invincible blobs and blob nodes producing tiles after its death (#5580)

* Fixes invincible blobs and blob nodes producing tiles after its death (#35706)

* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm

* Fixes invincible blobs and blob nodes producing tiles after its death
This commit is contained in:
CitadelStationBot
2018-02-18 19:30:19 -06:00
committed by Poojawa
parent bea3016593
commit 773169564c
2 changed files with 18 additions and 11 deletions
@@ -32,5 +32,5 @@
return ..()
/obj/structure/blob/node/Life()
Pulse_Area(overmind, 10, 3, 2)
if(overmind)
Pulse_Area(overmind, 10, 3, 2)
+16 -9
View File
@@ -21,14 +21,15 @@
var/mob/camera/blob/overmind
/obj/structure/blob/Initialize(mapload, owner_overmind)
overmind = owner_overmind
var/area/Ablob = get_area(loc)
if(Ablob.blob_allowed) //Is this area allowed for winning as blob?
overmind.blobs_legit += src
. = ..()
if(owner_overmind)
overmind = owner_overmind
var/area/Ablob = get_area(src)
if(Ablob.blob_allowed) //Is this area allowed for winning as blob?
overmind.blobs_legit += src
GLOB.blobs += src //Keep track of the blob in the normal list either way
setDir(pick(GLOB.cardinals))
update_icon()
.= ..()
if(atmosblock)
air_update_turf(1)
ConsumeTile()
@@ -230,8 +231,11 @@
user.changeNext_move(CLICK_CD_MELEE)
to_chat(user, "<b>The analyzer beeps once, then reports:</b><br>")
SEND_SOUND(user, sound('sound/machines/ping.ogg'))
to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
chemeffectreport(user)
if(overmind)
to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
chemeffectreport(user)
else
to_chat(user, "<b>Blob core neutralized. Critical mass no longer attainable.</b>")
typereport(user)
else
return ..()
@@ -307,11 +311,14 @@
var/datum/atom_hud/hud_to_check = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
if(user.research_scanner || hud_to_check.hudusers[user])
to_chat(user, "<b>Your HUD displays an extensive report...</b><br>")
to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
if(overmind)
to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
else
to_chat(user, "<b>Core neutralized. Critical mass no longer attainable.</b>")
chemeffectreport(user)
typereport(user)
else
if(isobserver(user))
if(isobserver(user) && overmind)
to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
to_chat(user, "It seems to be made of [get_chem_name()].")