From b222f15d52345efd188bb467a73e2e314f43d822 Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Sat, 26 Mar 2016 00:13:02 -0400 Subject: [PATCH] Adds alien tooltip style Ghost revival/body alerts now use the ghost's hud style. --- code/_onclick/hud/alert.dm | 7 +++++-- code/modules/mob/dead/observer/observer.dm | 2 ++ code/modules/mob/mob_helpers.dm | 2 ++ code/modules/tooltip/tooltip.html | 3 +++ icons/mob/screen_alert.dmi | Bin 31763 -> 31758 bytes 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index f6e74ef2aad..5e6424f6dd6 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -217,17 +217,20 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." name = "Plasma" desc = "There's flammable plasma in the air. If it lights up, you'll be toast." icon_state = "alien_tox" + alerttooltipstyle = "alien" /obj/screen/alert/alien_fire // This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire name = "Too Hot" desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you." icon_state = "alien_fire" + alerttooltipstyle = "alien" /obj/screen/alert/alien_vulnerable name = "Severed Matriarchy" desc = "Your queen has been killed, you will suffer movement penalties and loss of hivemind. A new queen cannot be made until you recover." icon_state = "alien_noqueen" + alerttooltipstyle = "alien" //GUARDIANS @@ -299,7 +302,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/notify_cloning name = "Revival" desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!" - icon_state = "ghost_frame" + icon_state = "template" timeout = 300 /obj/screen/alert/notify_cloning/Click() @@ -310,7 +313,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/notify_jump name = "Body created" desc = "A body was created. You can enter it." - icon_state = "ghost_frame" + icon_state = "template" timeout = 300 var/atom/jump_target = null var/attack_not_jump = null diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index c55fc9840a2..41b665e8703 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -168,6 +168,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(source) var/obj/screen/alert/A = throw_alert("\ref[source]_notify_cloning", /obj/screen/alert/notify_cloning) if(A) + if(client && client.prefs && client.prefs.UI_style) + A.icon = ui_style2icon(client.prefs.UI_style) A.desc = message var/old_layer = source.layer source.layer = FLOAT_LAYER diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 94941d5b6f8..66abe8e96ef 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -400,6 +400,8 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(source) var/obj/screen/alert/notify_jump/A = O.throw_alert("\ref[source]_notify_jump", /obj/screen/alert/notify_jump) if(A) + if(O.client.prefs && O.client.prefs.UI_style) + A.icon = ui_style2icon(O.client.prefs.UI_style) A.desc = message A.attack_not_jump = attack_not_jump A.jump_target = source diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html index 3f0e5784922..0617d2b5403 100644 --- a/code/modules/tooltip/tooltip.html +++ b/code/modules/tooltip/tooltip.html @@ -45,6 +45,9 @@ .parasite .wrap {border-color: #88868D;} .parasite .content {color: #EFEEEF; border-color: #35333A; background-color: #636169;} + .alien .wrap {border-color: #33165B;} + .alien .content {color: #25004A; border-color: #5A3076; background-color: #6D3A8E;} + .wraith .wrap {border-color: #492136;} .wraith .content {border-color: #331726; background-color: #471962;} diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi index a2fbd692c5388e73749d7a2c1c996a196119c7cd..83270efc56f416093139f68d65dbd95a5739eaf6 100644 GIT binary patch delta 447 zcmV;w0YLtf_yLai0gxmC(UB!Ee;7%PEP4`ECvU$)i^d5iP~Oc3zMuRlQnVk%ujk+U zSFwB9x9<>>!yr2G?6YK5j=W3=@==Hy4f9tl<;N?Yh zV!PU26;;+P(o+qzu7NhJ!Od!OTN0mKq1SwNg0%r3cCTH5>>Mm&y z-UYrxI%Z=kI;mq0r#gxsS{M$XHE2A%fvUK?&R7>L6CGWumh_#bYH{3Y3M*=UPnZ2|1pJesETUwSWz* zR99V;J$yXh<9I0~I~PlX;$>n<4V}!Mmbl6yr2$DaV!Pk`+{}~;z5cgse_K}?yqrWM z_M81xQDogBJ(WP)5@^R7+--KZCGp7>dd+87==I9<9>*a8oa&fM%;d3yNAJarKzPn&p5c+{81>Tn&paSpt9^KURsp9+p3GxRVu*j~J>I@4P z?j~&!7GU&pWHCZ)`>gEpe=1ozr!S?#l~Y4_X6ncv=%kK0oXaSFXrVuW)}Zn92CCrlI%8RA1ZOOHNQwV!B@ZyL*dU|yQ*wO3 zL^%`~lxN^Ek7L_|vaJgQCOVpmmh_#bXmQ+W7FN_uV=N|WyD0n8F@J-Ae=-zQZL*Bo u$4_hZYYNF}9>w$PK^$I=^7ld!0T6ltblYD5