the-strength-of-this-world-fades

code/game/gamemodes/blob/blobs/core.dm

@@ -60,13 +60,13 @@
 	return
 
 /obj/structure/blob/core/update_icon()
-	if(health <= 0)
-		qdel(src)
-		return
-	// update_icon is called when health changes so... call update_health in the overmind
+	cut_overlays()
+	color = null
+	var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob")
 	if(overmind)
-		overmind.update_health_hud()
-	return
+		blob_overlay.color = overmind.blob_reagent_datum.color
+	add_overlay(blob_overlay)
+	add_overlay(mutable_appearance('icons/mob/blob.dmi', "blob_core_overlay"))
 
 /obj/structure/blob/core/RegenHealth()
 	return // Don't regen, we handle it in Life()
@@ -78,7 +78,7 @@
 		if(resource_delay <= world.time)
 			resource_delay = world.time + 10 // 1 second
 			overmind.add_points(point_rate)
-	health = min(initial(health), health + 1)
+	obj_integrity = min(max_integrity, obj_integrity + 1)
 	if(overmind)
 		overmind.update_health_hud()
 	if(overmind)

code/game/gamemodes/blob/blobs/factory.dm

@@ -8,10 +8,6 @@
 	var/max_spores = 3
 	var/spore_delay = 0
 
-/obj/structure/blob/factory/update_icon()
-	if(health <= 0)
-		qdel(src)
-
 /obj/structure/blob/factory/Destroy()
 	for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores)
 		if(spore.factory == src)

code/game/gamemodes/blob/blobs/node.dm

@@ -35,11 +35,14 @@
 	else
 		for(var/i = 1; i < 8; i += i)
 			Pulse(5, i, color)
-	health = min(initial(health), health + 1)
+	obj_integrity = min(max_integrity, obj_integrity + 1)
 	color = null
 
 /obj/structure/blob/node/update_icon()
-	if(health <= 0)
-		qdel(src)
-		return
-	return
+	cut_overlays()
+	color = null
+	var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob")
+	if(overmind)
+		blob_overlay.color = overmind.blob_reagent_datum.color
+	add_overlay(blob_overlay)
+	add_overlay(mutable_appearance('icons/mob/blob.dmi', "blob_node_overlay"))

code/game/gamemodes/blob/blobs/resource.dm

@@ -6,10 +6,6 @@
 	point_return = 12
 	var/resource_delay = 0
 
-/obj/structure/blob/resource/update_icon()
-	if(health <= 0)
-		qdel(src)
-
 /obj/structure/blob/resource/run_action()
 	if(resource_delay > world.time)
 		return

code/game/gamemodes/blob/blobs/storage.dm

@@ -2,14 +2,14 @@
 	name = "storage blob"
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_resource"
-	health = 30
+	max_integrity = 30
 	fire_resist = 2
 	point_return = 12
 
-/obj/structure/blob/storage/update_icon()
-	if(health <= 0 && !QDELETED(src))
+/obj/structure/blob/storage/obj_destruction(damage_flag)
+	if(overmind)
 		overmind.max_blob_points -= 50
-		qdel(src)
+	..()
 
 /obj/structure/blob/storage/proc/update_max_blob_points(var/new_point_increase)
 	if(overmind)