diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 8c4dd2731dfd..9ac9f04a69f1 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -125,6 +125,9 @@ //slimes #define ui_slime_health "EAST,CENTER:15" //same as humans and constructs +//Blobbernauts +#define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19" + // AI #define ui_ai_core "CENTER-6:-32,SOUTH:6" diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm index 17d3b11a7287..1df7bf87d340 100644 --- a/code/_onclick/hud/blobbernauthud.dm +++ b/code/_onclick/hud/blobbernauthud.dm @@ -1,9 +1,6 @@ +/datum/hud/living/blobbernaut/New(mob/living/owner) + . = ..() -/datum/hud/blobbernaut/New(mob/owner) - ..() - - blobpwrdisplay = new /obj/screen/healths/blob/naut/core() - infodisplay += blobpwrdisplay - - healths = new /obj/screen/healths/blob/naut() - infodisplay += healths + blobpwrdisplay = new /obj/screen/healths/blob/overmind() + blobpwrdisplay.hud = src + infodisplay += blobpwrdisplay \ No newline at end of file diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 26af2be2459c..0c1db1bd3dcc 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -607,14 +607,10 @@ screen_loc = ui_internal mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/screen/healths/blob/naut - name = "health" - icon = 'icons/mob/blob.dmi' - icon_state = "nauthealth" - -/obj/screen/healths/blob/naut/core +/obj/screen/healths/blob/overmind name = "overmind health" - screen_loc = ui_health + icon = 'icons/mob/blob.dmi' + screen_loc = ui_blobbernaut_overmind_health icon_state = "corehealth" /obj/screen/healths/guardian diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index fd46dd784e39..0f1f4e0bc40b 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -249,7 +249,7 @@ force_threshold = 10 pressure_resistance = 50 mob_size = MOB_SIZE_LARGE - hud_type = /datum/hud/blobbernaut + hud_type = /datum/hud/living/blobbernaut /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) @@ -285,15 +285,6 @@ I.color = overmind.blobstrain.complementary_color flick_overlay_view(I, src, 8) -/mob/living/simple_animal/hostile/blob/blobbernaut/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(updating_health) - update_health_hud() - -/mob/living/simple_animal/hostile/blob/blobbernaut/update_health_hud() - if(hud_used) - hud_used.healths.maptext = "