mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
This commit is contained in:
@@ -64,11 +64,11 @@ GLOBAL_LIST_EMPTY(all_blobs)
|
||||
return FALSE
|
||||
|
||||
/obj/structure/blob/examine(mob/user)
|
||||
..()
|
||||
. = ..()
|
||||
if(!overmind)
|
||||
to_chat(user, "It seems inert.") // Dead blob.
|
||||
. += "It seems inert." // Dead blob.
|
||||
else
|
||||
to_chat(user, overmind.blob_type.desc)
|
||||
. += overmind.blob_type.desc
|
||||
|
||||
/obj/structure/blob/get_description_info()
|
||||
if(overmind)
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
attack_message_synth = ", and your shell buckles"
|
||||
attack_verb = "lashes"
|
||||
spore_projectile = /obj/item/projectile/arc/spore
|
||||
factory_type = /obj/structure/blob/factory/turret
|
||||
|
||||
/datum/blob_type/roiling_mold/proc/find_target(var/obj/structure/blob/B, var/tries = 0, var/list/previous_targets = null)
|
||||
if(tries > 3)
|
||||
@@ -33,7 +34,7 @@
|
||||
|
||||
previous_targets |= L
|
||||
|
||||
L = find_target(B, tries + 1, previous_targets)
|
||||
return find_target(B, tries + 1, previous_targets)
|
||||
|
||||
return L
|
||||
|
||||
|
||||
Reference in New Issue
Block a user