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 a2fbd692c53..83270efc56f 100644 Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ