diff --git a/code/_onclick/hud/lavaland_elite.dm b/code/_onclick/hud/lavaland_elite.dm deleted file mode 100644 index 9389d25f427..00000000000 --- a/code/_onclick/hud/lavaland_elite.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/hud/lavaland_elite - ui_style = 'icons/mob/screen_elite.dmi' - -/datum/hud/lavaland_elite/New(mob/living/simple_animal/hostile/asteroid/elite/owner) - ..() - - pull_icon = new /obj/screen/pull() - pull_icon.icon = ui_style - pull_icon.update_icon() - pull_icon.screen_loc = ui_living_pull - pull_icon.hud = src - static_inventory += pull_icon - - healthdoll = new /obj/screen/healthdoll/lavaland_elite() - healthdoll.hud = src - infodisplay += healthdoll diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 84b91263dec..be33e46d327 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -648,16 +648,6 @@ screen_loc = ui_living_healthdoll var/filtered = FALSE //so we don't repeatedly create the mask of the mob every update -/obj/screen/healthdoll/slime - icon = 'icons/mob/screen_slime.dmi' - icon_state = "slime_health0" - screen_loc = ui_living_healthdoll - -/obj/screen/healthdoll/lavaland_elite - icon = 'icons/mob/screen_elite.dmi' - icon_state = "elite_health0" - screen_loc = ui_living_healthdoll - /obj/screen/mood name = "mood" icon_state = "mood5" diff --git a/code/_onclick/hud/slime.dm b/code/_onclick/hud/slime.dm deleted file mode 100644 index a70f2d32ef5..00000000000 --- a/code/_onclick/hud/slime.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/hud/slime - ui_style = 'icons/mob/screen_slime.dmi' - -/datum/hud/slime/New(mob/living/simple_animal/slime/owner) - ..() - - pull_icon = new /obj/screen/pull() - pull_icon.icon = ui_style - pull_icon.update_icon() - pull_icon.screen_loc = ui_living_pull - pull_icon.hud = src - static_inventory += pull_icon - - healthdoll = new /obj/screen/healthdoll/slime() - healthdoll.hud = src - infodisplay += healthdoll diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 6bcb7ae83c0..005437aae30 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -19,7 +19,6 @@ stat_attack = UNCONSCIOUS layer = LARGE_MOB_LAYER sentience_type = SENTIENCE_BOSS - hud_type = /datum/hud/lavaland_elite var/chosen_attack = 1 var/list/attack_action_types = list() var/can_talk = FALSE @@ -83,37 +82,6 @@ While using this makes the system rely on OnFire, it still gives options for tim M.chosen_attack = chosen_attack_num to_chat(M, chosen_message) -/mob/living/simple_animal/hostile/asteroid/elite/updatehealth() - . = ..() - update_health_hud() - -/mob/living/simple_animal/hostile/asteroid/elite/update_health_hud() - var/severity = 0 - var/healthpercent = (health/maxHealth) * 100 - if(hud_used?.healthdoll) - switch(healthpercent) - if(100 to INFINITY) - severity = 0 - if(80 to 100) - severity = 1 - if(60 to 80) - severity = 2 - if(40 to 60) - severity = 3 - if(20 to 40) - severity = 4 - if(10 to 20) - severity = 5 - if(1 to 20) - severity = 6 - else - severity = 7 - hud_used.healthdoll.icon_state = "elite_health[severity]" - if(severity > 0) - overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity) - else - clear_fullscreen("brute") - //The Pulsing Tumor, the actual "spawn-point" of elites, handles the spawning, arena, and procs for dealing with basic scenarios. /obj/structure/elite_tumor diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 996b82f6000..3e18960a75f 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -40,8 +40,6 @@ // for the sake of cleanliness, though, here they are. status_flags = CANUNCONSCIOUS|CANPUSH - hud_type = /datum/hud/slime - var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35 @@ -164,34 +162,6 @@ if(health <= 0) mod += 2 add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/slime_healthmod, multiplicative_slowdown = mod) - update_health_hud() - -/mob/living/simple_animal/slime/update_health_hud() - var/severity = 0 - var/healthpercent = (health/maxHealth) * 100 - if(hud_used?.healthdoll) - switch(healthpercent) - if(100 to INFINITY) - severity = 0 - if(80 to 100) - severity = 1 - if(60 to 80) - severity = 2 - if(40 to 60) - severity = 3 - if(20 to 40) - severity = 4 - if(10 to 20) - severity = 5 - if(1 to 20) - severity = 6 - else - severity = 7 - hud_used.healthdoll.icon_state = "slime_health[severity]" - if(severity > 0) - overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity) - else - clear_fullscreen("brute") /mob/living/simple_animal/slime/adjust_bodytemperature() . = ..() diff --git a/icons/mob/screen_elite.dmi b/icons/mob/screen_elite.dmi deleted file mode 100644 index 115b1b0c0cb..00000000000 Binary files a/icons/mob/screen_elite.dmi and /dev/null differ diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index b5dcaa3007b..d0abe42459e 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/icons/mob/screen_slime.dmi b/icons/mob/screen_slime.dmi deleted file mode 100644 index 19bc7e1f737..00000000000 Binary files a/icons/mob/screen_slime.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index cde1ef416fb..543074f3a32 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -210,7 +210,6 @@ #include "code\_onclick\hud\guardian.dm" #include "code\_onclick\hud\hud.dm" #include "code\_onclick\hud\human.dm" -#include "code\_onclick\hud\lavaland_elite.dm" #include "code\_onclick\hud\living.dm" #include "code\_onclick\hud\map_popups.dm" #include "code\_onclick\hud\monkey.dm" @@ -224,7 +223,6 @@ #include "code\_onclick\hud\revenanthud.dm" #include "code\_onclick\hud\robot.dm" #include "code\_onclick\hud\screen_objects.dm" -#include "code\_onclick\hud\slime.dm" #include "code\_onclick\hud\swarmer.dm" #include "code\controllers\admin.dm" #include "code\controllers\controller.dm"