Adds burn and tox damage visual indicators (#2476)

vlggms · Oct 13, 2024 · b821ac2 · b821ac2
1 parent 7ca6d97
commit b821ac2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/ModularTegustation/Teguicons/lc13_coloreffect.dmi b/ModularTegustation/Teguicons/lc13_coloreffect.dmi
diff --git a/code/game/objects/effects/temporary_visuals/effect_indicators.dm b/code/game/objects/effects/temporary_visuals/effect_indicators.dm
@@ -40,6 +40,12 @@
 /obj/effect/temp_visual/damage_effect/pale
 	icon_state = "dam_pale"
 
+/obj/effect/temp_visual/damage_effect/burn
+	icon_state = "dam_burn"
+
+/obj/effect/temp_visual/damage_effect/tox
+	icon_state = "dam_tox"
+
 //Stuntime visual for when you're stunned by your weapon, so you know what happened.
 /obj/effect/temp_visual/weapon_stun
 	icon = 'ModularTegustation/Teguicons/lc13_coloreffect.dmi'

diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm
@@ -39,6 +39,18 @@
 		if(. > 0)
 			new /obj/effect/temp_visual/damage_effect/pale(get_turf(src))
 
+/mob/living/carbon/human/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE)
+	. = ..()
+	if(. && !forced)
+		if(. > 0)
+			new /obj/effect/temp_visual/damage_effect/tox(get_turf(src))
+
+/mob/living/carbon/human/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_status)
+	. = ..()
+	if(. && !forced)
+		if(. > 0)
+			new /obj/effect/temp_visual/damage_effect/burn(get_turf(src))
+
 //
 
 /mob/living/carbon/human/proc/adjustSanityLoss(amount, forced = FALSE)

diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -292,6 +292,10 @@
 			return new /obj/effect/temp_visual/damage_effect/black(get_turf(src))
 		if(PALE_DAMAGE)
 			return new /obj/effect/temp_visual/damage_effect/pale(get_turf(src))
+		if(BURN)
+			return new /obj/effect/temp_visual/damage_effect/burn(get_turf(src))
+		if(TOX)
+			return new /obj/effect/temp_visual/damage_effect/tox(get_turf(src))
 
 /*Used in LC13 abnormality calculations.
 	Moved here so we can use it for all hostiles.