Merge remote-tracking branch 'upstream/master' into floorcluwneport

2021-05-31 22:21:34 -04:00
parent e0a1e50927 cb52be5dd9
commit 70926f5daf
68 changed files with 576 additions and 301 deletions
@@ -162,12 +162,19 @@
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'

 /datum/sprite_accessory/ears/human/rabbit
-	name = "Rabbit"
+	name = "Rabbit (Lop-eared)"
 	icon_state = "rabbit"
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'

+/datum/sprite_accessory/ears/human/rabbitalt
+	name = "Rabbit (Straight-eared)"
+	icon_state = "rabbitalt"
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_ALL
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
 /datum/sprite_accessory/ears/human/pede
 	name = "Scolipede"
 	icon_state = "pede"
@@ -296,7 +303,7 @@
 /datum/sprite_accessory/ears/mam_ears/deer
 	name = "Deer"
 	icon_state = "deer"
-	color_src = MUTCOLORS3
+	matrixed_sections = MATRIX_RED_GREEN

 /datum/sprite_accessory/ears/mam_ears/eevee
 	name = "Eevee"
@@ -359,10 +366,15 @@
 	matrixed_sections = MATRIX_RED_GREEN

 /datum/sprite_accessory/ears/mam_ears/rabbit
-	name = "Rabbit"
+	name = "Rabbit (Lop-eared)"
 	icon_state = "rabbit"
 	matrixed_sections = MATRIX_RED_GREEN

+/datum/sprite_accessory/ears/mam_ears/rabbitalt
+	name = "Rabbit (Straight-eared)"
+	icon_state = "rabbitalt"
+	matrixed_sections = MATRIX_ALL
+
 /datum/sprite_accessory/ears/mam_ears/pede
 	name = "Scolipede"
 	icon_state = "pede"
@@ -17,6 +17,10 @@
 	name = "Adhara"
 	icon_state = "hair_adhara"

+/datum/sprite_accessory/hair/africanpigtails
+	name = "African Pig Tails"
+	icon_state = "hair_africanpigtails"
+
 /datum/sprite_accessory/hair/afro
 	name = "Afro"
 	icon_state = "hair_afro"
@@ -25,10 +29,26 @@
 	name = "Afro 2"
 	icon_state = "hair_afro2"

+/datum/sprite_accessory/hair/afro2alt
+	name = "Afro 2 (Alt)"
+	icon_state = "hair_afro2alt"
+
 /datum/sprite_accessory/hair/afro_large
 	name = "Afro (Large)"
 	icon_state = "hair_bigafro"

+/datum/sprite_accessory/hair/afropuffdouble
+	name = "Afropuff (Double)"
+	icon_state = "hair_afropuffdouble"
+
+/datum/sprite_accessory/hair/afropuffleft
+	name = "Afropuff (Left)"
+	icon_state = "hair_afropuffleft"
+
+/datum/sprite_accessory/hair/afropuffright
+	name = "Afropuff (Right)"
+	icon_state = "hair_afropuffright"
+
 /datum/sprite_accessory/hair/antenna
 	name = "Ahoge"
 	icon_state = "hair_antenna"
@@ -41,10 +61,18 @@
 	name = "Anita"
 	icon_state = "hair_anita"

+/datum/sprite_accessory/hair/astolfo
+	name = "Astolfo"
+	icon_state = "hair_astolfo"
+
 /datum/sprite_accessory/hair/balding
 	name = "Balding Hair"
 	icon_state = "hair_e"

+/datum/sprite_accessory/hair/baum
+	name = "Baum"
+	icon_state = "hair_baum"
+
 /datum/sprite_accessory/hair/bedhead
 	name = "Bedhead"
 	icon_state = "hair_bedhead"
@@ -85,6 +113,14 @@
 	name = "Belle"
 	icon_state = "hair_belle"

+/datum/sprite_accessory/hair/bluntbangs
+	name = "Bluntbangs"
+	icon_state = "hair_bluntbangs"
+
+/datum/sprite_accessory/hair/bluntbangsalt
+	name = "Bluntbangs (Alt)"
+	icon_state = "hair_bluntbangsalt"
+
 /datum/sprite_accessory/hair/bob
 	name = "Bob Hair"
 	icon_state = "hair_bob"
@@ -109,6 +145,10 @@
 	name = "Bobcut (Alt)"
 	icon_state = "hair_bobcutalt"

+/datum/sprite_accessory/hair/bobcutalt2
+	name = "Bobcut (Alt) 2"
+	icon_state = "hair_bobcutalt2"
+
 /datum/sprite_accessory/hair/boddicker
 	name = "Boddicker"
 	icon_state = "hair_boddicker"
@@ -205,6 +245,14 @@
 	name = "CIA"
 	icon_state = "hair_cia"

+/datum/sprite_accessory/hair/combedback
+	name = "Combed Back"
+	icon_state = "hair_combedback"
+
+/datum/sprite_accessory/hair/combedbob
+	name = "Combed Bob"
+	icon_state = "hair_combedbob"
+
 /datum/sprite_accessory/hair/combover
 	name = "Combover"
 	icon_state = "hair_combover"
@@ -233,6 +281,14 @@
 	name = "Cornrow Tail"
 	icon_state = "hair_cornrowtail"

+/datum/sprite_accessory/hair/cotton
+	name = "Cotton"
+	icon_state = "hair_cotton"
+
+/datum/sprite_accessory/hair/cottonalt
+	name = "Cotton (Alt)"
+	icon_state = "hair_cottonalt"
+
 /datum/sprite_accessory/hair/country
 	name = "Country"
 	icon_state = "hair_country"
@@ -261,6 +317,10 @@
 	name = "Devil Lock"
 	icon_state = "hair_devillock"

+/datum/sprite_accessory/hair/diagonalbangs
+	name = "Diagonal Bangs"
+	icon_state = "hair_diagonalbangs"
+
 /datum/sprite_accessory/hair/dreadlocks
 	name = "Dreadlocks"
 	icon_state = "hair_dreads"
@@ -337,10 +397,22 @@
 	name = "Fluffy"
 	icon_state = "hair_fluffy"

+/datum/sprite_accessory/hair/fortuneteller
+	name = "Fortune Teller"
+	icon_state = "hair_fortuneteller"
+
 /datum/sprite_accessory/hair/fringetail
 	name = "Fringe Tail"
 	icon_state = "hair_fringetail"

+/datum/sprite_accessory/hair/froofy
+	name = "Froofy"
+	icon_state = "hair_froofy"
+
+/datum/sprite_accessory/hair/geisha
+	name = "Geisha"
+	icon_state = "hair_geisha"
+
 /datum/sprite_accessory/hair/gelled
 	name = "Gelled Back"
 	icon_state = "hair_gelled"
@@ -349,6 +421,26 @@
 	name = "Gentle"
 	icon_state = "hair_gentle"

+/datum/sprite_accessory/hair/glammetal
+	name = "Glam Metal"
+	icon_state = "hair_glammetal"
+
+/datum/sprite_accessory/hair/gloomy
+	name = "Gloomy"
+	icon_state = "hair_gloomy"
+
+/datum/sprite_accessory/hair/gloomylong
+	name = "Gloomy (Long)"
+	icon_state = "hair_gloomylong"
+
+/datum/sprite_accessory/hair/hajime
+	name = "Hajime"
+	icon_state = "hair_hajime"
+
+/datum/sprite_accessory/hair/hajimealt
+	name = "Hajime (Alt)"
+	icon_state = "hair_hajimealt"
+
 /datum/sprite_accessory/hair/halfbang
 	name = "Half-banged Hair"
 	icon_state = "hair_halfbang"
@@ -365,6 +457,10 @@
 	name = "Half-shaved Hair"
 	icon_state = "hair_halfshaved"

+/datum/sprite_accessory/hair/harold
+	name = "Harold"
+	icon_state = "hair_harold"
+
 /datum/sprite_accessory/hair/hedgehog
 	name = "Hedgehog Hair"
 	icon_state = "hair_hedgehog"
@@ -393,6 +489,10 @@
 	name = "Hitop"
 	icon_state = "hair_hitop"

+/datum/sprite_accessory/hair/inari
+	name = "Inari"
+	icon_state = "hair_inari"
+
 /datum/sprite_accessory/hair/inkling
 	name = "Inkling"
 	icon_state = "hair_inkling"
@@ -421,14 +521,18 @@
 	name = "Keanu"
 	icon_state = "hair_keanu"

-/datum/sprite_accessory/hair/kusangi
-	name = "Kusanagi"
-	icon_state = "hair_kusanagi"
+/datum/sprite_accessory/hair/kisaragi
+	name = "Kisaragi"
+	icon_state = "hair_kisaragi"

 /datum/sprite_accessory/hair/kleeia
 	name = "Kleeia"
 	icon_state = "hair_kleeia"

+/datum/sprite_accessory/hair/kusangi
+	name = "Kusanagi"
+	icon_state = "hair_kusanagi"
+
 /datum/sprite_accessory/hair/long
 	name = "Long Hair 1"
 	icon_state = "hair_long"
@@ -449,6 +553,10 @@
 	name = "Long Over Eye"
 	icon_state = "hair_longovereye"

+/datum/sprite_accessory/hair/long_over_eyealt
+	name = "Long Over Eye (Alt)"
+	icon_state = "hair_longovereyealt"
+
 /datum/sprite_accessory/hair/longbangs
 	name = "Long Bangs"
 	icon_state = "hair_lbangs"
@@ -489,10 +597,6 @@
 	name = "Mohawk"
 	icon_state = "hair_d"

-/datum/sprite_accessory/hair/newyou
-	name = "New You"
-	icon_state = "hair_newyou"
-
 /datum/sprite_accessory/hair/reversemohawk
 	name = "Mohawk (Reverse)"
 	icon_state = "hair_reversemohawk"
@@ -509,6 +613,10 @@
 	name = "Mulder"
 	icon_state = "hair_mulder"

+/datum/sprite_accessory/hair/newyou
+	name = "New You"
+	icon_state = "hair_newyou"
+
 /datum/sprite_accessory/hair/nia
 	name = "Nia"
 	icon_state = "hair_nia"
@@ -579,10 +687,18 @@
 	name = "Pompadour (Big)"
 	icon_state = "hair_bigpompadour"

+/datum/sprite_accessory/hair/bigpompadouralt
+	name = "Pompadour (Big) (Alt)"
+	icon_state = "hair_bigpompadouralt"
+
 /datum/sprite_accessory/hair/ponytail1
 	name = "Ponytail"
 	icon_state = "hair_ponytail"

+/datum/sprite_accessory/hair/ponytail1alt
+	name = "Ponytail (Alt)"
+	icon_state = "hair_ponytailalt"
+
 /datum/sprite_accessory/hair/ponytail2
 	name = "Ponytail 2"
 	icon_state = "hair_ponytail2"
@@ -591,14 +707,26 @@
 	name = "Ponytail 3"
 	icon_state = "hair_ponytail3"

+/datum/sprite_accessory/hair/ponytail3alt
+	name = "Ponytail 3 (Alt)"
+	icon_state = "hair_ponytail3alt"
+
 /datum/sprite_accessory/hair/ponytail4
 	name = "Ponytail 4"
 	icon_state = "hair_ponytail4"

+/datum/sprite_accessory/hair/ponytail4alt
+	name = "Ponytail 4 (Alt)"
+	icon_state = "hair_ponytail4alt"
+
 /datum/sprite_accessory/hair/ponytail5
 	name = "Ponytail 5"
 	icon_state = "hair_ponytail5"

+/datum/sprite_accessory/hair/ponytail6
+	name = "Ponytail 6"
+	icon_state = "hair_ponytail6"
+
 /datum/sprite_accessory/hair/highponytail
 	name = "Ponytail (High)"
 	icon_state = "hair_highponytail"
@@ -623,6 +751,10 @@
 	name = "Ponytail (Side) 4"
 	icon_state = "hair_sidetail4"

+/datum/sprite_accessory/hair/sidetail5
+	name = "Ponytail (Side) 5"
+	icon_state = "hair_sidetail5"
+
 /datum/sprite_accessory/hair/sharptail
 	name = "Ponytail (Sharp)"
 	icon_state = "hair_sharptail"
@@ -639,10 +771,18 @@
 	name = "Poofy 2"
 	icon_state = "hair_poofy2"

+/datum/sprite_accessory/hair/quadcurls
+	name = "Quad Curls"
+	icon_state = "hair_quadcurls"
+
 /datum/sprite_accessory/hair/quiff
 	name = "Quiff"
 	icon_state = "hair_quiff"

+/datum/sprite_accessory/hair/rockstar
+	name = "Rockstar"
+	icon_state = "hair_rockstar"
+
 /datum/sprite_accessory/hair/ronin
 	name = "Ronin"
 	icon_state = "hair_ronin"
@@ -759,6 +899,10 @@
 	name = "Slightly Long Hair"
 	icon_state = "hair_protagonist"

+/datum/sprite_accessory/hair/slightlymessy
+	name = "Slightly Messy Hair"
+	icon_state = "hair_slightlymessy"
+
 /datum/sprite_accessory/hair/spiky
 	name = "Spiky"
 	icon_state = "hair_spikey"
@@ -771,6 +915,26 @@
 	name = "Spiky 3"
 	icon_state = "hair_spiky2"

+/datum/sprite_accessory/hair/slimedroplet
+	name = "Slime Droplet"
+	icon_state = "hair_slimedroplet"
+
+/datum/sprite_accessory/hair/slimedropletalt
+	name = "Slime Droplet (Alt)"
+	icon_state = "hair_slimedropletalt"
+
+/datum/sprite_accessory/hair/slimespikes
+	name = "Slime Spikes"
+	icon_state = "hair_slimespikes"
+
+/datum/sprite_accessory/hair/slimetendrils
+	name = "Slime Tendrils"
+	icon_state = "hair_slimetendrils"
+
+/datum/sprite_accessory/hair/slimetendrilsalt
+	name = "Slime Tendrils (Alt)"
+	icon_state = "hair_slimetendrilsalt"
+
 /datum/sprite_accessory/hair/supernova
 	name = "Supernova"
 	icon_state = "hair_supernova"
@@ -851,6 +1015,10 @@
 	name = "Very Long Hair 2"
 	icon_state = "hair_longest"

+/datum/sprite_accessory/hair/longestalt
+	name = "Very Long Hair 2 (Alt)"
+	icon_state = "hair_longestalt"
+
 /datum/sprite_accessory/hair/longest2
 	name = "Very Long Over Eye"
 	icon_state = "hair_longest2"
@@ -886,3 +1054,7 @@
 /datum/sprite_accessory/hair/ziegler
 	name = "Ziegler"
 	icon_state = "hair_ziegler"
+
+/datum/sprite_accessory/hair/zone
+	name = "Zone"
+	icon_state = "hair_zone"
@@ -149,6 +149,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	///
 	var/sound/attack_sound = 'sound/weapons/punch1.ogg'
 	var/sound/miss_sound = 'sound/weapons/punchmiss.ogg'
+	var/attack_sound_override = null

 	var/list/mob/living/ignored_by = list()	// list of mobs that will ignore this species
 	//Breathing!
@@ -569,12 +570,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 /datum/species/proc/remove_blacklisted_quirks(mob/living/carbon/C)
 	var/mob/living/L = C.mind?.current
 	if(istype(L))
-		var/list/my_quirks = L.client?.prefs.all_quirks.Copy()
-		SSquirks.filter_quirks(my_quirks, blacklisted_quirks)
 		for(var/q in L.roundstart_quirks)
 			var/datum/quirk/Q = q
-			if(!(SSquirks.quirk_name_by_path(Q.type) in my_quirks))
-				L.remove_quirk(Q.type)
+			if(Q.type in blacklisted_quirks)
+				qdel(Q)
 				removed_quirks += Q.type

 // restore any quirks that we removed
@@ -1615,7 +1614,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)


 		var/armor_block = target.run_armor_check(affecting, "melee")
-		playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1)
+		playsound(target.loc, user.dna.species.attack_sound_override || attack_sound, 25, 1, -1)
 		target.visible_message("<span class='danger'>[user] [atk_verb]ed [target]!</span>", \
 					"<span class='userdanger'>[user] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE, null, \
 					user, "<span class='danger'>You [atk_verb]ed [target]!</span>")
@@ -542,8 +542,48 @@
 	update_stat()
 	med_hud_set_health()
 	med_hud_set_status()
+	update_health_hud()

-//proc used to ressuscitate a mob
+/mob/living/update_health_hud()
+	var/severity = 0
+	var/healthpercent = (health/maxHealth) * 100
+	if(hud_used?.healthdoll) //to really put you in the boots of a simplemob
+		var/obj/screen/healthdoll/living/livingdoll = hud_used.healthdoll
+		switch(healthpercent)
+			if(100 to INFINITY)
+				livingdoll.icon_state = "living0"
+			if(80 to 100)
+				livingdoll.icon_state = "living1"
+				severity = 1
+			if(60 to 80)
+				livingdoll.icon_state = "living2"
+				severity = 2
+			if(40 to 60)
+				livingdoll.icon_state = "living3"
+				severity = 3
+			if(20 to 40)
+				livingdoll.icon_state = "living4"
+				severity = 4
+			if(1 to 20)
+				livingdoll.icon_state = "living5"
+				severity = 5
+			else
+				livingdoll.icon_state = "living6"
+				severity = 6
+		if(!livingdoll.filtered)
+			livingdoll.filtered = TRUE
+			var/icon/mob_mask = icon(icon, icon_state)
+			if(mob_mask.Height() > world.icon_size || mob_mask.Width() > world.icon_size)
+				var/health_doll_icon_state = health_doll_icon ? health_doll_icon : "megasprite"
+				mob_mask = icon('icons/mob/screen_gen.dmi', health_doll_icon_state) //swap to something generic if they have no special doll
+			UNLINT(livingdoll.filters += filter(type="alpha", icon = mob_mask))
+			livingdoll.filters += filter(type="drop_shadow", size = -1)
+	if(severity > 0)
+		overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+	else
+		clear_fullscreen("brute")
+
+//Proc used to resuscitate a mob, for full_heal see fully_heal()
 /mob/living/proc/revive(full_heal = FALSE, admin_revive = FALSE)
 	SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, full_heal, admin_revive)
 	if(full_heal)
@@ -94,6 +94,7 @@
 	var/smoke_delay = 0 //used to prevent spam with smoke reagent reaction on mob.

 	var/bubble_icon = "default" //what icon the mob uses for speechbubbles
+	var/health_doll_icon //if this exists AND the normal sprite is bigger than 32x32, this is the replacement icon state (because health doll size limitations). the icon will always be screen_gen.dmi

 	var/last_bumped = 0
 	var/unique_name = 0 //if a mob's name should be appended with an id when created e.g. Mob (666)
@@ -149,6 +149,7 @@
 	icon_state = "alienq"
 	icon_living = "alienq"
 	icon_dead = "alienq_dead"
+	health_doll_icon = "alienq"
 	bubble_icon = "alienroyal"
 	move_to_delay = 4
 	maxHealth = 400
@@ -73,6 +73,7 @@
 	icon_living = "megacarp"
 	icon_dead = "megacarp_dead"
 	icon_gib = "megacarp_gib"
+	health_doll_icon = "megacarp"
 	regen_amount = 6

 	maxHealth = 30
@@ -9,6 +9,7 @@
 	icon_state = "crawling"
 	icon_living = "crawling"
 	icon_dead = "dead"
+	health_doll_icon = "crawling"
 	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
 	speak_chance = 80
 	maxHealth = 220
@@ -28,6 +28,7 @@ Difficulty: Medium
 	icon_state = "miner"
 	icon_living = "miner"
 	icon = 'icons/mob/broadMobs.dmi'
+	health_doll_icon = "miner"
 	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
 	light_color = "#E4C7C5"
 	movement_type = GROUND
@@ -33,6 +33,7 @@ Difficulty: Hard
 	icon_state = "bubblegum"
 	icon_living = "bubblegum"
 	icon_dead = ""
+	health_doll_icon = "bubblegum"
 	friendly_verb_continuous = "stares down"
 	friendly_verb_simple = "stare down"
 	icon = 'icons/mob/lavaland/96x96megafauna.dmi'
@@ -32,6 +32,7 @@ Difficulty: Very Hard
 	icon_state = "eva"
 	icon_living = "eva"
 	icon_dead = "dragon_dead"
+	health_doll_icon = "eva"
 	friendly_verb_continuous = "stares down"
 	friendly_verb_simple = "stare down"
 	icon = 'icons/mob/lavaland/96x96megafauna.dmi'
@@ -48,6 +48,7 @@ Difficulty: Medium
 	icon_state = "dragon"
 	icon_living = "dragon"
 	icon_dead = "dragon_dead"
+	health_doll_icon = "dragon"
 	friendly_verb_continuous = "stares down"
 	friendly_verb_simple = "stare down"
 	speak_emote = list("roars")
@@ -44,6 +44,7 @@ Difficulty: Normal
 	attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
 	icon_state = "hierophant"
 	icon_living = "hierophant"
+	health_doll_icon = "hierophant"
 	friendly_verb_continuous = "stares down"
 	friendly_verb_simple = "stare down"
 	icon = 'icons/mob/lavaland/hierophant_new.dmi'
@@ -26,6 +26,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza
 	spacewalk = TRUE
 	icon_state = "mega_legion"
 	icon_living = "mega_legion"
+	health_doll_icon = "mega_legion"
 	desc = "One of many."
 	icon = 'icons/mob/lavaland/96x96megafauna.dmi'
 	attack_verb_continuous = "chomps"
@@ -75,6 +75,7 @@
 	icon_living = "watcher"
 	icon_aggro = "watcher"
 	icon_dead = "watcher_dead"
+	health_doll_icon = "watcher"
 	pixel_x = -10
 	throw_message = "bounces harmlessly off of"
 	melee_damage_lower = 15
@@ -25,6 +25,7 @@
 	icon_aggro = "broodmother"
 	icon_dead = "egg_sac"
 	icon_gib = "syndicate_gib"
+	health_doll_icon = "broodmother"
 	maxHealth = 800
 	health = 800
 	melee_damage_lower = 30
@@ -24,6 +24,7 @@
 	icon_aggro = "herald"
 	icon_dead = "herald_dying"
 	icon_gib = "syndicate_gib"
+	health_doll_icon = "herald"
 	maxHealth = 800
 	health = 800
 	melee_damage_lower = 20
@@ -24,6 +24,7 @@
 	icon_aggro = "legionnaire"
 	icon_dead = "legionnaire_dead"
 	icon_gib = "syndicate_gib"
+	health_doll_icon = "legionnaire"
 	maxHealth = 800
 	health = 800
 	melee_damage_lower = 30
@@ -24,6 +24,7 @@
 	icon_aggro = "pandora"
 	icon_dead = "pandora_dead"
 	icon_gib = "syndicate_gib"
+	health_doll_icon = "pandora"
 	maxHealth = 800
 	health = 800
 	melee_damage_lower = 15
@@ -253,6 +253,7 @@
 	icon_state = "legion"
 	icon_living = "legion"
 	icon_dead = "legion"
+	health_doll_icon = "legion"
 	health = 450
 	maxHealth = 450
 	melee_damage_lower = 20
@@ -6,6 +6,7 @@
 	icon_living = "clown"
 	icon_dead = "clown_dead"
 	icon_gib = "clown_gib"
+	health_doll_icon = "clown" //if >32x32, it will use this generic. for all the huge clown mobs that subtype from this
 	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
 	turns_per_move = 5
 	response_disarm_continuous = "gently pushes aside"
@@ -6,6 +6,7 @@
 	icon_living = "pine_1"
 	icon_dead = "pine_1"
 	icon_gib = "pine_1"
+	health_doll_icon = "pine_1"
 	gender = NEUTER
 	speak_chance = 0
 	turns_per_move = 5
@@ -72,5 +73,6 @@
 	icon_living = "festivus_pole"
 	icon_dead = "festivus_pole"
 	icon_gib = "festivus_pole"
+	health_doll_icon = "festivus_pole"
 	loot = list(/obj/item/stack/rods)
 	speak_emote = list("polls")
@@ -8,6 +8,7 @@
 	icon_aggro = "Fugu0"
 	icon_dead = "Fugu_dead"
 	icon_gib = "syndicate_gib"
+	health_doll_icon = "Fugu0"
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	mouse_opacity = MOUSE_OPACITY_ICON
 	move_to_delay = 5
@@ -7,6 +7,7 @@
 	///How much blud it has for bloodsucking
 	blood_volume = 550
 	rad_flags = RAD_NO_CONTAMINATE
+	hud_type = /datum/hud/living/simple_animal

 	status_flags = CANPUSH