shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update data_huds.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-09 21:27:36 -05:00
committed by GitHub
parent 8596fa93e4
commit e8d09d796a
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/data_huds.dm
View File

@@ -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)