From c5849aaa96656c614eada14e435d32ba4d988207 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 18 Dec 2013 14:03:04 +1030 Subject: [PATCH] Added cortical borers to the various HUDs. --- code/game/mecha/medical/odysseus.dm | 2 ++ code/modules/clothing/glasses/hud.dm | 2 ++ code/modules/mob/dead/observer/observer.dm | 18 ++++++++++-------- code/modules/mob/living/silicon/pai/hud.dm | 2 ++ icons/mob/hud.dmi | Bin 2902 -> 2951 bytes 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 008b5d819ab..a344b6f43e5 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -104,6 +104,8 @@ holder = patient.hud_list[STATUS_HUD] if(patient.stat == 2) holder.icon_state = "huddead" + else if(patient.has_brain_worms()) + holder.icon_state = "hudbrainworm" else if(patient.status_flags & XENO_HOST) holder.icon_state = "hudxeno" else if(foundVirus) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index e3fff70f366..682e815b5f4 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -69,6 +69,8 @@ holder = patient.hud_list[STATUS_HUD] if(patient.stat == 2) holder.icon_state = "huddead" + else if(patient.has_brain_worms()) + holder.icon_state = "hudbrainworm" else if(patient.status_flags & XENO_HOST) holder.icon_state = "hudxeno" else if(foundVirus) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 759ce23fc3a..da39bb6c83b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -26,7 +26,7 @@ see_invisible = SEE_INVISIBLE_OBSERVER see_in_dark = 100 verbs += /mob/dead/observer/proc/dead_tele - + stat = DEAD var/turf/T @@ -93,12 +93,12 @@ Works together with spawning an observer, noted above. /mob/dead/observer/Life() ..() - if(!loc) return + if(!loc) return if(!client) return 0 if(client.images.len) - for(var/image/hud in client.images) + for(var/image/hud in client.images) if(copytext(hud.icon_state,1,4) == "hud") client.images.Remove(hud) if(antagHUD) @@ -145,7 +145,7 @@ Works together with spawning an observer, noted above. var/foundVirus = 0 if(patient.virus2.len) foundVirus = 1 - if(!C) return + if(!C) return holder = patient.hud_list[HEALTH_HUD] if(patient.stat == 2) holder.icon_state = "hudhealth-100" @@ -156,14 +156,16 @@ Works together with spawning an observer, noted above. holder = patient.hud_list[STATUS_HUD] if(patient.stat == 2) holder.icon_state = "huddead" + else if(patient.has_brain_worms()) + holder.icon_state = "hudbrainworm" else if(patient.status_flags & XENO_HOST) holder.icon_state = "hudxeno" else if(foundVirus) holder.icon_state = "hudill" else holder.icon_state = "hudhealthy" - C.images += holder - + C.images += holder + /mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U) var/icon/tempHud = 'icons/mob/hud.dmi' @@ -319,7 +321,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(jobban_isbanned(M, "AntagHUD")) src << "\red You have been banned from using this feature" return - if(config.antag_hud_restricted && !M.has_enabled_antagHUD &&!client.holder) + if(config.antag_hud_restricted && !M.has_enabled_antagHUD &&!client.holder) var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No") if(response == "No") return M.can_reenter_corpse = 0 @@ -455,7 +457,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/response = alert(src, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?","Squeek!","Nope!") if(response != "Squeek!") return //Hit the wrong key...again. - + //find a viable mouse candidate var/mob/living/simple_animal/mouse/host diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm index 74d5ec8f878..ff073dcb3c4 100644 --- a/code/modules/mob/living/silicon/pai/hud.dm +++ b/code/modules/mob/living/silicon/pai/hud.dm @@ -76,6 +76,8 @@ holder = patient.hud_list[STATUS_HUD] if(patient.stat == 2) holder.icon_state = "huddead" + else if(patient.has_brain_worms()) + holder.icon_state = "hudbrainworm" else if(patient.status_flags & XENO_HOST) holder.icon_state = "hudxeno" else if(foundVirus) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 0502c01147dccacc311e72977314974e725be839..006a6c64b13c30782241ad090ec269f0b302d34f 100644 GIT binary patch delta 2721 zcmY+Ec{tPy7sr2NG9zPeG9npLL`*1!FhjDBElot0>|2%*Nq%FymZA|t6S*;=k!+ce zMn#CSU0aejVvMD(b!;>9cAxjT_j&L6=X;*>*XMhl?>WPgDJZg{fs?J(1(Vj+)|8YK z2cnU&u`vd~pfP}BsyN;g;prmiWd`T*xI6%erh15qiY_cH=m9`iFvBbWXlnzqT%=S~ z^yK{&gV?=p1qDD40K^#bCrR{yt2>>$1QD(<$$9f8?`vu`=ybHqc+ z6j|g*?0@R?Mix$qfFbUNr>g0~iys@>8)1^BlR87C(>eqF_s3~Vh8wp4xgBhUrs5qt z>i4$v>df~6E5O8Bql}tKxP_4U82>jg(*cvF5s`z)ZgNLAKhQwUTEaG_lxM5!7syZPI-Gch4!A4I+c|m@(V=@&vEa&gZjVI=*b}9yU9> z)HgvWH6g8AffAE>FD6v7;`d7xNzyhAv)E9BPE5CeatJcYN&cqr5nOA4v3U9Okx*Po zYqrp|Lyu{~=jpT%+jnWFyC=GZn!nxD3JI#x2JiBFWd}kPz>4%4E|NErj3Kb^MwKxH z84!n!r)^1BuI~c?_;d4fxC_w_mnN17`%ICrKPzeV)?PRI2hJaRVQn7hCiS@1){kgx zoDjT+W`z4zUP>(=y3ggw>1xTm&|$SiWy@ponWnF!LpHpNTC^5)n*CH}+U;|+G-`iz zbZ(DHIT@nB!wbTPKRVCn{HW8(WQlFw1NE_&pc zc7SfGQ{t0Iqc2EG|K20{p0}o7n;{@9*n?R~R!u=y!JgYho&Uo1(KOs0A+5Y>!HPx7k_&JFolyH&?8tM~WKy}V zZn^uuDLudP5%lo^FyY4SD!00rD1(2{e`>Qh`MBqk)lGz6iqc@uxNwt!(jU~Nc22}K zg4wzZ0%4(coP3!0>~`-H-(Z7S*T$hSx@u6Njv<@Wvspk|`5;7!YnHzTomvP=8D-jk z+1Qo25?1*2s}9Ylx&rR8@4RHR)^B=zO?E?ZK^$N?mz(^OZDm5{LR zt+lE9JJ~8$+Jb9844H-kUy0va1 z=%cEN{H3F+e{e`47EEUN?)ijFXs9!oC}AZYB79GG^hXhG6@?b*49mJMr2K~89qK+p z-m}BhE9cSsAtvg-xXUQg~AoZ+m;}<6^?r2{39wIi%3L7;?N>6^w?SnWD-vV2VVD&YPH`qUB zXJIWoXFCwAoszla2``97>N|EWJ+41b-< zXXK(pBpFHWebTWkCue4x~X#k4(M7k?Mw zQ!y2g{;~oH>MRNS;6}w z&G>PQ-hXAHsh8dvUJ+2VsolHfp#};B9y(wfNqa># zbbNXx-HqbGcj5J?)DSxz^aP0`RDMyoMP(4z1QJCxWIcbgVLY@|+3}{67Lm8~I${jk zlSBrztl;%CVq{K2H!^U(xM)?s8J1fS6KRRTUhY9=Lp>Lks&M+u6c4fA4(YcB*O@h2 zX|UR9+CM$@nLGPApnUhxz;$!5Q^X>a;_E9Vl$y1vHklRosH0UnjVFA1&$$C>ysTe> zgYON3dk8=F$hv>$62}1X_ijj0V?U}c>*vOdVu$2T5u0wQyr9z=3{2tqyhVe!o}<+} z-_yu_@2sF2Z%vzp&l!noEsvkF=}OuVonKF!j02fAC71CEXg!0Y=*vvLm;l@HvJDXt z(e*Me96U5Jb+&yCu;wWrMGqRL?@e85{e#loG|Tbm;+Ongq~MkI3{ zEb3%!T)9g6j?5~{FZ6K1uIHs-7S;($;Y}^5=kh_=hWI&>W)OVdWbV&gE^AQYdsR(n zr>>30ih2Y4F_*ykxs6~aWloQ?YF0BpuWW1E2;08;Xc%0~x6S-`mo^<;%RWiA1+@SG delta 2707 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 s)SC5a3mihEmQc@>5UJbzTko?IWNTRL{AA#q-QQ