diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 440967945ab..97d61898b37 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -26,7 +26,7 @@ /mob/living/simple_animal/hostile/blob/blobspore name = "blob" - desc = "Some blob thing." + desc = "A floating, fragile spore." icon_state = "blobpod" icon_living = "blobpod" health = 40 @@ -145,7 +145,7 @@ /mob/living/simple_animal/hostile/blob/blobbernaut name = "blobbernaut" - desc = "Some HUGE blob thing." + desc = "A hulking, mobile chunk of blobmass." icon_state = "blobbernaut" icon_living = "blobbernaut" icon_dead = "blobbernaut_dead" diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b19965f3d3e..ec7ed02ece8 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -2,8 +2,10 @@ name = "blob core" icon = 'icons/mob/blob.dmi' icon_state = "blank_blob" + desc = "A huge, pulsating yellow mass." health = 200 fire_resist = 2 + explosion_block = 6 var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 30 seconds var/resource_delay = 0 var/point_rate = 2 @@ -44,6 +46,9 @@ /obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return +/obj/effect/blob/core/ex_act(severity, target) + return + /obj/effect/blob/core/update_icon() if(health <= 0) qdel(src) diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 90dab3c0fe2..e89afd34300 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -2,6 +2,7 @@ name = "factory blob" icon = 'icons/mob/blob.dmi' icon_state = "blob_factory" + desc = "A thick spire of tendrils." health = 100 fire_resist = 2 var/list/spores = list() diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 423272ed8b6..5da503da5df 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -2,6 +2,7 @@ name = "blob node" icon = 'icons/mob/blob.dmi' icon_state = "blank_blob" + desc = "A large, pulsating yellow mass." health = 100 fire_resist = 2 diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm index 78527b7cde0..2996265ee2c 100644 --- a/code/game/gamemodes/blob/blobs/resource.dm +++ b/code/game/gamemodes/blob/blobs/resource.dm @@ -2,6 +2,7 @@ name = "resource blob" icon = 'icons/mob/blob.dmi' icon_state = "blob_resource" + desc = "A thin spire of slightly swaying tendrils." health = 30 fire_resist = 2 var/resource_delay = 0 diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm index 1c145f4404f..387dda96048 100644 --- a/code/game/gamemodes/blob/blobs/shield.dm +++ b/code/game/gamemodes/blob/blobs/shield.dm @@ -2,8 +2,9 @@ name = "strong blob" icon = 'icons/mob/blob.dmi' icon_state = "blob_idle" - desc = "Some blob creature thingy" + desc = "A solid wall of slightly twitching tendrils." health = 75 + explosion_block = 4 fire_resist = 2 diff --git a/code/game/gamemodes/blob/blobs/storage.dm b/code/game/gamemodes/blob/blobs/storage.dm index 4b5089b10cc..a09e58915f3 100644 --- a/code/game/gamemodes/blob/blobs/storage.dm +++ b/code/game/gamemodes/blob/blobs/storage.dm @@ -2,6 +2,7 @@ name = "storage blob" icon = 'icons/mob/blob.dmi' icon_state = "blob_resource" + desc = "A huge, smooth mass supported by tendrils." health = 30 fire_resist = 2 diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 907bf7e2c68..ce99589ffad 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -3,10 +3,11 @@ name = "blob" icon = 'icons/mob/blob.dmi' luminosity = 3 - desc = "Some blob creature thingy" + desc = "A thick wall of writhing tendrils." density = 0 opacity = 0 anchored = 1 + explosion_block = 2 var/health = 30 var/health_timestamp = 0 var/brute_resist = 4 diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 682fc5293fe..6d3c4e6dce0 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -98,6 +98,9 @@ if(W.reinf && W.fulltile) cached_exp_block[T] += W.explosion_block + for(var/obj/effect/blob/B in T) + cached_exp_block[T] += B.explosion_block + for(var/turf/T in affected_turfs) var/dist = cheap_hypotenuse(T.x, T.y, x0, y0) @@ -215,6 +218,9 @@ if(W.explosion_block && W.fulltile) dist += W.explosion_block + for(var/obj/effect/blob/B in T) + dist += B.explosion_block + if(dist < dev) T.color = "red" T.maptext = "Dev"