From e8d09d796a67d9b59a4c5d99bf17cdc98172f212 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 9 Oct 2017 21:27:36 -0500 Subject: [PATCH] Update data_huds.dm --- code/game/data_huds.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 1744c36865..5e21527112 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -169,15 +169,6 @@ holder.icon_state = "hudxeno" else if(stat == DEAD || (status_flags & FAKEDEATH)) holder.icon_state = "huddead" -<<<<<<< HEAD - else if(has_brain_worms() && B != null && B.controlling) - holder.icon_state = "hudbrainworm" - else if(virus_state == 2) - holder.icon_state = "hudill" - else if(virus_state == 1) - holder.icon_state = "hudbuff" -======= ->>>>>>> db0c10e... Refactors virus spreading (#31066) else switch(virus_threat) if(VIRUS_SEVERITY_BIOHAZARD)