Merge pull request #11406 from Arkatos1/blobanimate

Blob cleanup update
This commit is contained in:
variableundefined
2019-04-30 13:07:29 +08:00
committed by GitHub
4 changed files with 11 additions and 19 deletions
+3 -4
View File
@@ -23,13 +23,12 @@
/obj/structure/blob/factory/run_action()
if(spores.len >= max_spores)
return 0
return
if(spore_delay > world.time)
return 0
return
flick("blob_factory_glow", src)
spore_delay = world.time + 100 // 10 seconds
var/mob/living/simple_animal/hostile/blob/blobspore/BS = new/mob/living/simple_animal/hostile/blob/blobspore(src.loc, src)
BS.color = overmind.blob_reagent_datum.complementary_color
BS.overmind = overmind
overmind.blob_mobs.Add(BS)
return 0
+2 -6
View File
@@ -13,13 +13,9 @@
qdel(src)
/obj/structure/blob/resource/run_action()
if(resource_delay > world.time)
return 0
return
flick("blob_resource_glow", src)
resource_delay = world.time + 40 // 4 seconds
if(overmind)
overmind.add_points(1)
return 0
+6 -9
View File
@@ -331,17 +331,13 @@
/mob/camera/blob/verb/rally_spores_power()
set category = "Blob"
set name = "Rally Spores (5)"
set name = "Rally Spores"
set desc = "Rally the spores to move to your location."
var/turf/T = get_turf(src)
rally_spores(T)
/mob/camera/blob/proc/rally_spores(var/turf/T)
if(!can_buy(5))
return
to_chat(src, "You rally your spores.")
var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z))
@@ -373,12 +369,12 @@
if(!N)
to_chat(src, "<span class='warning'>A node is required to birth your offspring...</span>")
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)
@@ -399,7 +395,8 @@
else
to_chat(usr, "You broadcast with your minions, <B>[speak_text]</B>")
for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs)
blob_minion.say(speak_text)
if(blob_minion.stat == CONSCIOUS)
blob_minion.say(speak_text)
return
/mob/camera/blob/verb/create_storage()
@@ -478,4 +475,4 @@
to_chat(src, "<i>Node Blobs</i> are blobs which grow, like the core. Like the core it can activate resource and factory blobs.")
to_chat(src, "<b>In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.</b>")
to_chat(src, "<b>Shortcuts:</b> Click = Expand Blob <b>|</b> CTRL Click = Create Shield Blob <b>|</b> Middle Mouse Click = Rally Spores <b>|</b> Alt Click = Remove Blob")
to_chat(src, "Attempting to talk will send a message to all other <b>overminds</b>, allowing you to coordinate with them.")
to_chat(src, "Attempting to talk will send a message to all other <b>overminds</b>, allowing you to coordinate with them.")
Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 KiB

After

Width:  |  Height:  |  Size: 836 KiB