From fe70cf243a95bb8f3b83eb4b9eb967bb4e49192c Mon Sep 17 00:00:00 2001
From: Fikou <23585223+Fikou@users.noreply.github.com>
Date: Wed, 20 Oct 2021 17:24:25 +0200
Subject: [PATCH] adds no float trait to megafauna that dont float (#62174)

adds no float animation trait to bubblegum, blood drunk miner, demonic frost miner, wendigo as they dont float
adds no float animation trait to clockwork defender as he has his own animation so it looks weird when thats combined with the animation from the floating
---
 .../simple_animal/hostile/megafauna/blood_drunk_miner.dm      | 1 +
 .../mob/living/simple_animal/hostile/megafauna/bubblegum.dm   | 4 ++++
 .../simple_animal/hostile/megafauna/clockwork_knight.dm       | 4 ++++
 .../mob/living/simple_animal/hostile/megafauna/colossus.dm    | 2 +-
 .../simple_animal/hostile/megafauna/demonic_frost_miner.dm    | 1 +
 .../mob/living/simple_animal/hostile/megafauna/wendigo.dm     | 4 ++++
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 5d7db2d53db..b3dc904d35a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -68,6 +68,7 @@ Difficulty: Medium
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize(mapload)
 	. = ..()
 	miner_saw = new(src)
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
 
 /datum/action/innate/megafauna_attack/dash
 	name = "Dash To Target"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 54693c4e708..13366eb88b7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -77,6 +77,10 @@ Difficulty: Hard
 	small_sprite_type = /datum/action/small_sprite/megafauna/bubblegum
 	faction = list("mining", "boss", "hell")
 
+/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
+
 /datum/action/innate/megafauna_attack/triple_charge
 	name = "Triple Charge"
 	icon_icon = 'icons/mob/actions/actions_items.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm
index daefcdfe338..14d3df22c9e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm
@@ -40,6 +40,10 @@ I'd rather there be something than the clockwork ruin be entirely empty though s
 	footstep_type = FOOTSTEP_MOB_HEAVY
 	attack_action_types = list()
 
+/mob/living/simple_animal/hostile/megafauna/clockwork_defender/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
+
 /mob/living/simple_animal/hostile/megafauna/clockwork_defender/OpenFire()
 	return
 
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 09d4fc0472c..6a3da2611f4 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -59,7 +59,7 @@
 
 /mob/living/simple_animal/hostile/megafauna/colossus/Initialize(mapload)
 	. = ..()
-	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) //we don't want this guy to float, messes up his animations.
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) //we don't want this guy to float, messes up his animations.
 
 /datum/action/innate/megafauna_attack/spiral_attack
 	name = "Spiral Shots"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 2d38e3e6e1e..b52406b1294 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -58,6 +58,7 @@ Difficulty: Extremely Hard
 		prism_to_set.set_prism_light(LIGHT_COLOR_BLUE, 5)
 	AddElement(/datum/element/knockback, 7, FALSE, TRUE)
 	AddElement(/datum/element/lifesteal, 50)
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
 
 /datum/action/innate/megafauna_attack/frost_orbs
 	name = "Fire Frost Orbs"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index d927d69c66f..29848183f61 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -69,6 +69,10 @@ Difficulty: Hard
 	/// Stores the last scream time so it doesn't spam it
 	COOLDOWN_DECLARE(scream_cooldown)
 
+/mob/living/simple_animal/hostile/megafauna/wendigo/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
+
 /datum/action/innate/megafauna_attack/heavy_stomp
 	name = "Heavy Stomp"
 	icon_icon = 'icons/mob/actions/actions_items.dmi'