diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index ba6879c23e6..8ad8401ea45 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -172,5 +172,8 @@ #define ui_ghost_mafia "SOUTH: 6, CENTER+2:24" #define ui_ghost_language_menu "SOUTH: 22, CENTER+3:8" +//Blobbernauts +#define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19" + //Families #define ui_wanted_lvl "NORTH,11" diff --git a/code/_onclick/hud/blobbernaut.dm b/code/_onclick/hud/blobbernaut.dm new file mode 100644 index 00000000000..d8531516d41 --- /dev/null +++ b/code/_onclick/hud/blobbernaut.dm @@ -0,0 +1,6 @@ +/datum/hud/living/blobbernaut/New(mob/living/owner) + . = ..() + + blobpwrdisplay = new /atom/movable/screen/healths/blob/overmind() + blobpwrdisplay.hud = src + infodisplay += blobpwrdisplay diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm deleted file mode 100644 index 430e8e81e7f..00000000000 --- a/code/_onclick/hud/blobbernauthud.dm +++ /dev/null @@ -1,11 +0,0 @@ - -/datum/hud/blobbernaut/New(mob/owner) - ..() - - blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core() - blobpwrdisplay.hud = src - infodisplay += blobpwrdisplay - - healths = new /atom/movable/screen/healths/blob/naut() - healths.hud = src - infodisplay += healths diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 4ab57048f84..259075915e5 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -633,15 +633,11 @@ screen_loc = ui_internal mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/atom/movable/screen/healths/blob/naut - name = "health" - icon = 'icons/hud/blob.dmi' - icon_state = "nauthealth" - -/atom/movable/screen/healths/blob/naut/core +/atom/movable/screen/healths/blob/overmind name = "overmind health" + icon = 'icons/hud/blob.dmi' icon_state = "corehealth" - screen_loc = ui_health + screen_loc = ui_blobbernaut_overmind_health /atom/movable/screen/healths/guardian name = "summoner health" diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index bf1b3d08ec9..e6b46f58209 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -269,7 +269,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/Initialize() . = ..() @@ -314,15 +314,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 = MAPTEXT("
[round((health / maxHealth) * 100, 0.5)]%
") - /mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget() . = ..() if(. && isliving(target) && overmind) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 6d1b5d7488e..94dd6114e04 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -219,14 +219,15 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/update_health_hud() if(blob_core) - hud_used.healths.maptext = MAPTEXT("
[round(blob_core.obj_integrity)]
") + var/current_health = round((blob_core.obj_integrity / blob_core.max_integrity) * 100) + hud_used.healths.maptext = MAPTEXT("
[current_health]%
") for(var/mob/living/simple_animal/hostile/blob/blobbernaut/B in blob_mobs) if(B.hud_used && B.hud_used.blobpwrdisplay) - B.hud_used.blobpwrdisplay.maptext = MAPTEXT("
[round(blob_core.obj_integrity)]
") + B.hud_used.blobpwrdisplay.maptext = MAPTEXT("
[current_health]%
") /mob/camera/blob/proc/add_points(points) blob_points = clamp(blob_points + points, 0, max_blob_points) - hud_used.blobpwrdisplay.maptext = MAPTEXT("
[round(blob_points)]
") + hud_used.blobpwrdisplay.maptext = MAPTEXT("
[round(blob_points)]
") /mob/camera/blob/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if (!message) diff --git a/icons/hud/blob.dmi b/icons/hud/blob.dmi index 0fc70bff0dd..d7a1f496d6c 100644 Binary files a/icons/hud/blob.dmi and b/icons/hud/blob.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 04b37adec29..e8acfde811b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -243,7 +243,7 @@ #include "code\_onclick\hud\alien.dm" #include "code\_onclick\hud\alien_larva.dm" #include "code\_onclick\hud\blob_overmind.dm" -#include "code\_onclick\hud\blobbernauthud.dm" +#include "code\_onclick\hud\blobbernaut.dm" #include "code\_onclick\hud\credits.dm" #include "code\_onclick\hud\drones.dm" #include "code\_onclick\hud\families.dm"