Skip to content

Commit

Permalink
Removal of slime and elite huds (tgstation#50096)
Browse files Browse the repository at this point in the history
  • Loading branch information
Arkatos1 authored Mar 21, 2020
1 parent eae3f78 commit 8538bc3
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 106 deletions.
16 changes: 0 additions & 16 deletions code/_onclick/hud/lavaland_elite.dm

This file was deleted.

10 changes: 0 additions & 10 deletions code/_onclick/hud/screen_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 0 additions & 16 deletions code/_onclick/hud/slime.dm

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
30 changes: 0 additions & 30 deletions code/modules/mob/living/simple_animal/slime/slime.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
. = ..()
Expand Down
Binary file removed icons/mob/screen_elite.dmi
Binary file not shown.
Binary file modified icons/mob/screen_gen.dmi
Binary file not shown.
Binary file removed icons/mob/screen_slime.dmi
Binary file not shown.
2 changes: 0 additions & 2 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 8538bc3

Please sign in to comment.