Merge pull request #160 from honkpocket/various-fixes-again

Various fixes again
DopplerShift13 · Oct 14, 2024 · 9b5cb15 · 9b5cb15
2 parents 58eb76a + e3ece8c
commit 9b5cb15
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -178,7 +178,7 @@
 			hud_list[hud] = list()
 
 		else
-			var/image/I = image('icons/mob/huds/hud.dmi', src, "")
+			var/image/I = image('modular_doppler/overwrites/huds/hud.dmi', src, "") // DOPPLER EDIT, old code: var/image/I = image('icons/mob/huds/hud.dmi', src, "")
 			I.appearance_flags = RESET_COLOR|RESET_TRANSFORM
 			hud_list[hud] = I
 		set_hud_image_active(hud, update_huds = FALSE) //by default everything is active. but dont add it to huds to keep control.

diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm
@@ -30,6 +30,7 @@
 		TRAIT_RESISTHEAT,
 		TRAIT_RESISTCOLD,
 		TRAIT_RESISTHIGHPRESSURE,*/
+		TRAIT_UNHUSKABLE,
 		TRAIT_STABLEHEART,
 		TRAIT_STABLELIVER,
 	)
@@ -84,6 +85,8 @@
 			to_chat(target, span_warning("Alert: Critical damage taken! Cooling systems failing!"))
 			do_sparks(3, FALSE, target)
 
+	if(target.stat == DEAD)
+		return
 	if(HAS_TRAIT(target, TRAIT_CHARGING))
 		return
 	if(core_energy > 0)

diff --git a/modular_doppler/overwrites/huds/hud.dmi b/modular_doppler/overwrites/huds/hud.dmi
diff --git a/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx b/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
@@ -13,7 +13,7 @@ type IconSettings = {
 };
 
 const normalIcon: IconSettings = {
-  dmi: 'modular_doppler/overwrites/huds/hud.dmi' /* Doppler station edit, old code: dmi: 'icons/mob/huds/hud.dmi', */,
+  dmi: 'icons/mob/huds/hud.dmi',
   transform: 'scale(2.3) translateX(9px) translateY(1px)',
 };