diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 70a8c331a68..cbd028ffa29 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -238,3 +238,11 @@ /// The filter name for the hover outline #define HOVER_OUTLINE_FILTER "hover_outline" + +// Alert style states +/// Don't change alert's icon +#define USER_HUD_STYLE_IGNORE 0 +/// Change the icon to user's current hud's ui_style +#define USER_HUD_STYLE_INHERIT 1 +/// Change the icon to user's chosen hud style from their prefs +#define USER_HUD_STYLE_PREFS 2 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index a157661683b..160f842623a 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -111,7 +111,7 @@ var/click_master = TRUE ///If set true, instead of using the default icon file for screen alerts, it will use the hud's ui style - var/use_user_hud_icon = FALSE + var/use_user_hud_icon = USER_HUD_STYLE_IGNORE ///If set, this overlay will be added to the icon. var/overlay_state ///The file to fetch the overlay from @@ -260,32 +260,32 @@ name = "Bronchodilated" desc = "You feel like your lungs are larger than usual! You're taking deeper breaths!" icon_state = "bronchodilated" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = 'icons/obj/medical/organs/organs.dmi' overlay_state = "lungs" /atom/movable/screen/alert/bronchoconstricted name = "Bronchocontracted" desc = "You feel like your lungs are smaller than usual! You might need a higher pressure environment/internals to breathe!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "bronchoconstricted" /atom/movable/screen/alert/gross name = "Grossed out." desc = "That was kind of gross..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "gross" /atom/movable/screen/alert/verygross name = "Very grossed out." desc = "You're not feeling very well..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "gross2" /atom/movable/screen/alert/disgusted name = "DISGUSTED" desc = "ABSOLUTELY DISGUSTIN'" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "gross3" /atom/movable/screen/alert/hot @@ -311,14 +311,14 @@ /atom/movable/screen/alert/hypnosis name = "Hypnosis" desc = "Something's hypnotizing you, but you're not really sure about what." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "hypnosis" var/phrase /atom/movable/screen/alert/mind_control name = "Mind Control" desc = "Your mind has been hijacked! Click to view the mind control command." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "mind_control" clickable_glow = TRUE var/command @@ -333,7 +333,7 @@ name = "Embedded Object" desc = "Something got lodged into your flesh and is causing major bleeding. It might fall out with time, but surgery is the safest way. \ If you're feeling frisky, examine yourself and click the underlined item to pull the object out." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "embeddedobject" clickable_glow = TRUE @@ -348,7 +348,7 @@ /atom/movable/screen/alert/negative name = "Negative Gravity" desc = "You're getting pulled upwards. While you won't have to worry about falling down anymore, you may accidentally fall upwards!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "negative" /atom/movable/screen/alert/weightless @@ -357,19 +357,19 @@ wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ magboots would let you walk around normally on the floor. Barring those, you can throw things, use a fire extinguisher, \ or shoot a gun to move around via Newton's 3rd Law of Motion." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "weightless" /atom/movable/screen/alert/highgravity name = "High Gravity" desc = "You're getting crushed by high gravity, picking up items and movement will be slowed." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /atom/movable/screen/alert/veryhighgravity name = "Crushing Gravity" desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /atom/movable/screen/alert/fire @@ -398,7 +398,7 @@ /atom/movable/screen/alert/give // information set when the give alert is made icon_state = "template" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT clickable_glow = TRUE /// The offer we're linked to, yes this is suspiciously like a status effect alert var/datum/status_effect/offering/offer @@ -569,7 +569,7 @@ /atom/movable/screen/alert/succumb name = "Succumb" desc = "Shuffle off this mortal coil." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = 'icons/mob/simple/mob.dmi' overlay_state = "ghost" clickable_glow = TRUE @@ -922,7 +922,7 @@ name = "Something interesting is happening!" desc = "This can be clicked on to perform an action." icon_state = "template" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_PREFS timeout = 30 SECONDS clickable_glow = TRUE /// Weakref to the target atom to use the action on @@ -950,7 +950,7 @@ /atom/movable/screen/alert/poll_alert name = "Looking for candidates" icon_state = "template" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_PREFS timeout = 30 SECONDS ghost_screentips = TRUE /// If true you need to call START_PROCESSING manually @@ -1102,7 +1102,7 @@ /atom/movable/screen/alert/buckled name = "Buckled" desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "buckled" click_master = FALSE clickable_glow = TRUE @@ -1122,7 +1122,7 @@ /atom/movable/screen/alert/restrained icon_state = "template" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT clickable_glow = TRUE /atom/movable/screen/alert/restrained/handcuffed @@ -1150,7 +1150,7 @@ return living_owner.resist_restraints() /atom/movable/screen/alert/shoes - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = /obj/item/clothing/shoes/sneakers::icon overlay_state = /obj/item/clothing/shoes/sneakers::icon_state clickable_glow = TRUE @@ -1171,7 +1171,7 @@ /atom/movable/screen/alert/shoes/untied name = "Untied Shoes" desc = "Your shoes are untied! Click the alert or your shoes to tie them." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = /obj/item/clothing/shoes/sneakers::icon overlay_state = /obj/item/clothing/shoes/sneakers::icon_state @@ -1182,7 +1182,7 @@ /atom/movable/screen/alert/unpossess_object name = "Unpossess" desc = "You are possessing an object. Click this alert to unpossess it." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "buckled" clickable_glow = TRUE @@ -1213,10 +1213,15 @@ for(var/i in 1 to alerts.len) screenmob.client.screen -= alerts[alerts[i]] return TRUE + var/user_pref_hud = ui_style2icon(mymob.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) for(var/i in 1 to length(alerts)) var/atom/movable/screen/alert/alert = alerts[alerts[i]] - if(alert.use_user_hud_icon) - alert.icon = ui_style + switch(alert.use_user_hud_icon) + if(USER_HUD_STYLE_INHERIT) + alert.icon = ui_style + if(USER_HUD_STYLE_PREFS) + if(user_pref_hud) + alert.icon = user_pref_hud alert.screen_loc = get_ui_alert_placement(i) screenmob.client.screen |= alert if(!viewmob) diff --git a/code/datums/components/aura_healing.dm b/code/datums/components/aura_healing.dm index 93d9c62c08f..3575c1cd1f5 100644 --- a/code/datums/components/aura_healing.dm +++ b/code/datums/components/aura_healing.dm @@ -161,7 +161,7 @@ /atom/movable/screen/alert/aura_healing name = "Aura Healing" icon_state = "template" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT clickable_glow = TRUE click_master = FALSE diff --git a/code/datums/components/hazard_area.dm b/code/datums/components/hazard_area.dm index 79a67fd78ad..409abb56a71 100644 --- a/code/datums/components/hazard_area.dm +++ b/code/datums/components/hazard_area.dm @@ -169,5 +169,5 @@ /atom/movable/screen/alert/status_effect/hazard_area name = "Hazardous Area" desc = "The area you are currently within is incredibly hazardous to you. Check your surroundings and vacate as soon as possible." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "hazard_area" diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index 31ee58bb77e..5415b2576ad 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -198,7 +198,7 @@ /atom/movable/screen/alert/irradiated name = "Irradiated" desc = "You're irradiated! Heal your toxins quick, and stand under a shower to halt the incoming damage." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "irradiated" #undef RADIATION_BURN_SPLOTCH_DAMAGE diff --git a/code/datums/components/radioactive_exposure.dm b/code/datums/components/radioactive_exposure.dm index 324e8c28e29..5d4c04699c6 100644 --- a/code/datums/components/radioactive_exposure.dm +++ b/code/datums/components/radioactive_exposure.dm @@ -75,5 +75,5 @@ /atom/movable/screen/alert/radioactive_area name = "Radioactive Area" desc = "This place is no good! We need to get some protection or get out fast!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "radioactive_area" diff --git a/code/datums/elements/bugkiller_reagent.dm b/code/datums/elements/bugkiller_reagent.dm index 226e59da332..666c9e1098f 100644 --- a/code/datums/elements/bugkiller_reagent.dm +++ b/code/datums/elements/bugkiller_reagent.dm @@ -87,5 +87,5 @@ /atom/movable/screen/alert/status_effect/bugkiller_death name = "Overwhelming Toxicity" desc = "Don't go into the light!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 50a2e229273..449519eb7c2 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -266,7 +266,7 @@ /atom/movable/screen/alert/status_effect/exercised name = "Exercise" desc = "You feel well exercised! Sleeping will improve your fitness." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "exercised" //Hippocratic Oath: Applied when the Rod of Asclepius is activated. @@ -378,7 +378,7 @@ /atom/movable/screen/alert/status_effect/regenerative_core name = "Regenerative Core Tendrils" desc = "You can move faster than your broken body could normally handle!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = 'icons/obj/medical/organs/mining_organs.dmi' overlay_state = "legion_core_stable" @@ -422,7 +422,7 @@ /atom/movable/screen/alert/status_effect/lightningorb name = "Lightning Orb" desc = "The speed surges through you!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "lightningorb" /datum/status_effect/mayhem @@ -561,7 +561,7 @@ /atom/movable/screen/alert/status_effect/nest_sustenance name = "Nest Vitalization" desc = "The resin seems to pulsate around you. It seems to be sustaining your vital functions. You feel ill..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "nest_life" /** @@ -641,7 +641,7 @@ /atom/movable/screen/alert/status_effect/radiation_immunity name = "Radiation shielding" desc = "You're immune to radiation, get settled quick!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "radiation_shield" /// Throw an alert we're in darkness!! Nightvision can make it hard to tell so this is useful @@ -673,7 +673,7 @@ /atom/movable/screen/alert/status_effect/shadow_regeneration name = "Shadow Regeneration" desc = "Bathed in soothing darkness, you will slowly heal yourself" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "lightless" /// Applies desensitized mood modifier to the mob, carrying between mind transfers diff --git a/code/datums/status_effects/buffs/food/_food_effect.dm b/code/datums/status_effects/buffs/food/_food_effect.dm index 15e6d914929..930c786110e 100644 --- a/code/datums/status_effects/buffs/food/_food_effect.dm +++ b/code/datums/status_effects/buffs/food/_food_effect.dm @@ -19,5 +19,5 @@ /atom/movable/screen/alert/status_effect/food name = "Hand-crafted meal" desc = "Eating it made me feel better." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "food_buff_1" diff --git a/code/datums/status_effects/buffs/food/chilling.dm b/code/datums/status_effects/buffs/food/chilling.dm index d2fb089f11f..cbc11e945ff 100644 --- a/code/datums/status_effects/buffs/food/chilling.dm +++ b/code/datums/status_effects/buffs/food/chilling.dm @@ -10,6 +10,6 @@ /atom/movable/screen/alert/status_effect/icecream_chilling name = "Cooling Off" desc = "Nothing beats a cup of ice cream during hot, plasma-flooded day..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "food_icecream" diff --git a/code/datums/status_effects/buffs/food/grant_trait.dm b/code/datums/status_effects/buffs/food/grant_trait.dm index 0b1e65dc848..c7ed9c2943f 100644 --- a/code/datums/status_effects/buffs/food/grant_trait.dm +++ b/code/datums/status_effects/buffs/food/grant_trait.dm @@ -22,7 +22,7 @@ /atom/movable/screen/alert/status_effect/shockimmune name = "Grounded" desc = "That meal made me feel like a superconductor..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "shock_immune" /datum/status_effect/food/trait/mute @@ -32,7 +32,7 @@ /atom/movable/screen/alert/status_effect/mute name = "..." desc = "..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "mute" /datum/status_effect/food/trait/ashstorm_immune @@ -42,7 +42,7 @@ /atom/movable/screen/alert/status_effect/ashstorm_immune name = "Ashstorm-proof" desc = "That meal makes me feel born on Lavaland." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "ashstorm_immune" /datum/status_effect/food/trait/waddle @@ -56,6 +56,6 @@ /atom/movable/screen/alert/status_effect/waddle name = "Waddling" desc = "That meal makes me want to joke around." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = /obj/item/clothing/mask/gas/clown_hat::icon overlay_state = /obj/item/clothing/mask/gas/clown_hat::icon_state diff --git a/code/datums/status_effects/buffs/food/speech.dm b/code/datums/status_effects/buffs/food/speech.dm index 95598c03bb9..dc77dac99eb 100644 --- a/code/datums/status_effects/buffs/food/speech.dm +++ b/code/datums/status_effects/buffs/food/speech.dm @@ -28,7 +28,7 @@ /atom/movable/screen/alert/status_effect/italian_speech name = "Linguini Embrace" desc = "You feel a sudden urge to gesticulate wildly." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "food_italian" /datum/status_effect/food/speech/french @@ -57,5 +57,5 @@ /atom/movable/screen/alert/status_effect/french_speech name = "Café Chic" desc = "Suddenly, everything seems worthy of a passionate debate." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "food_french" diff --git a/code/datums/status_effects/cuffed_item.dm b/code/datums/status_effects/cuffed_item.dm index c356f377f3d..4711af1cb01 100644 --- a/code/datums/status_effects/cuffed_item.dm +++ b/code/datums/status_effects/cuffed_item.dm @@ -143,7 +143,7 @@ /atom/movable/screen/alert/status_effect/cuffed_item name = "Cuffed Item" desc = "You've an item firmly cuffed to your arm. You probably won't be accidentally dropping it somewhere anytime soon." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT clickable_glow = TRUE click_master = FALSE diff --git a/code/datums/status_effects/debuffs/cursed.dm b/code/datums/status_effects/debuffs/cursed.dm index da3a5371910..810342e0fda 100644 --- a/code/datums/status_effects/debuffs/cursed.dm +++ b/code/datums/status_effects/debuffs/cursed.dm @@ -178,7 +178,7 @@ /atom/movable/screen/alert/status_effect/cursed name = "Cursed!" desc = "The brand on your hand reminds you of your greed, yet you seem to be okay otherwise." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "cursed_by_slots" /atom/movable/screen/alert/status_effect/cursed/update_desc() diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 81b4e7e7616..b55a385e237 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -274,7 +274,7 @@ /atom/movable/screen/alert/status_effect/asleep name = "Asleep" desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "asleep" //STASIS @@ -328,7 +328,7 @@ /atom/movable/screen/alert/status_effect/stasis name = "Stasis" desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "stasis" /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace @@ -590,7 +590,7 @@ /atom/movable/screen/alert/status_effect/trance name = "Trance" desc = "Everything feels so distant, and you can feel your thoughts forming loops inside your head..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "high" /datum/status_effect/trance/tick(seconds_between_ticks) @@ -717,7 +717,7 @@ /atom/movable/screen/alert/status_effect/convulsing name = "Shaky Hands" desc = "You've been zapped with something and your hands can't stop shaking! You can't seem to hold on to anything." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "convulsing" /datum/status_effect/dna_melt @@ -741,7 +741,7 @@ /atom/movable/screen/alert/status_effect/dna_melt name = "Genetic Breakdown" desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "dna_melt" /datum/status_effect/go_away @@ -797,7 +797,7 @@ /atom/movable/screen/alert/status_effect/go_away name = "TO THE STARS AND BEYOND!" desc = "I must go, my people need me!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "high" /datum/status_effect/fake_virus @@ -945,7 +945,7 @@ /atom/movable/screen/alert/status_effect/ants name = "Ants!" desc = span_warning("JESUS FUCKING CHRIST! CLICK TO GET THOSE THINGS OFF!") - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "antalert" clickable_glow = TRUE @@ -1026,7 +1026,7 @@ /atom/movable/screen/alert/status_effect/discoordinated name = "Discoordinated" desc = "You can't seem to properly use anything..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "convulsing" /datum/status_effect/discoordinated/on_apply() @@ -1065,7 +1065,7 @@ /atom/movable/screen/alert/status_effect/careful_driving name = "Careful Driving" desc = "That was close! You almost ran that one over!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /datum/movespeed_modifier/careful_driving @@ -1092,7 +1092,7 @@ /atom/movable/screen/alert/status_effect/midas_blight name = "Midas Blight" desc = "Your blood is being turned to gold, slowing your movements!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "midas_blight" /datum/status_effect/midas_blight/tick(seconds_between_ticks) @@ -1142,7 +1142,7 @@ /atom/movable/screen/alert/status_effect/designated_target name = "Designated Target" desc = "You've been lit up by some kind of bright energy! Wash it off to get rid of it, or you'll be a lot easier to hit!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "designated_target" /datum/status_effect/designated_target diff --git a/code/datums/status_effects/debuffs/decloning.dm b/code/datums/status_effects/debuffs/decloning.dm index 074fc8ec1fc..ea87b08dcc9 100644 --- a/code/datums/status_effects/debuffs/decloning.dm +++ b/code/datums/status_effects/debuffs/decloning.dm @@ -77,7 +77,7 @@ /atom/movable/screen/alert/status_effect/decloning name = "Cellular Meltdown" desc = "Your body is deforming, and doesn't feel like it's going to hold up much longer. You are going to need treatment soon." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "dna_melt" /datum/movespeed_modifier/decloning diff --git a/code/datums/status_effects/debuffs/drugginess.dm b/code/datums/status_effects/debuffs/drugginess.dm index e0b7a4da57f..75e23b1acda 100644 --- a/code/datums/status_effects/debuffs/drugginess.dm +++ b/code/datums/status_effects/debuffs/drugginess.dm @@ -36,5 +36,5 @@ /atom/movable/screen/alert/status_effect/high name = "High" desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "high" diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm index f45b26f5591..36860ae0a6b 100644 --- a/code/datums/status_effects/debuffs/drunk.dm +++ b/code/datums/status_effects/debuffs/drunk.dm @@ -231,7 +231,7 @@ name = "Drunk" desc = "All that alcohol you've been drinking is impairing your speech, \ motor skills, and mental cognition. Make sure to act like it." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "drunk" #undef TIPSY_THRESHOLD diff --git a/code/datums/status_effects/debuffs/hooked.dm b/code/datums/status_effects/debuffs/hooked.dm index cc5aa30fadb..4747941ca00 100644 --- a/code/datums/status_effects/debuffs/hooked.dm +++ b/code/datums/status_effects/debuffs/hooked.dm @@ -22,7 +22,7 @@ /atom/movable/screen/alert/status_effect/hooked name = "Snagged By Hook" desc = "You're being caught like a fish by some asshat! Click to safely remove the hook or move away far enough to snap it off." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "hooked" clickable_glow = TRUE @@ -59,5 +59,5 @@ /atom/movable/screen/alert/status_effect/hooked/jaws name = "Snagged By Jaws" desc = "You've been snagged by some sort of beartrap-slash-fishing-hook-gizmo! Click to safely remove the hook or move away far enough to snap it off." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "hooked_jaws" diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm index 661b73a203a..0df86b15130 100644 --- a/code/datums/status_effects/debuffs/slime/slime_leech.dm +++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm @@ -1,7 +1,7 @@ /atom/movable/screen/alert/status_effect/slime_leech name = "Covered in Slime" desc = "A slime is draining your very lifeforce! Remove it by hand, by hitting it, or by water." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "slime_leech" /datum/status_effect/slime_leech diff --git a/code/datums/status_effects/debuffs/slime/slimed.dm b/code/datums/status_effects/debuffs/slime/slimed.dm index b02d1dcc71f..30ee56a5a07 100644 --- a/code/datums/status_effects/debuffs/slime/slimed.dm +++ b/code/datums/status_effects/debuffs/slime/slimed.dm @@ -6,7 +6,7 @@ /atom/movable/screen/alert/status_effect/slimed name = "Covered in Slime" desc = "You are covered in slime and it's eating away at you! Click to start cleaning it off, or find a faster way to wash it away!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "slimed" clickable_glow = TRUE diff --git a/code/datums/status_effects/debuffs/spacer.dm b/code/datums/status_effects/debuffs/spacer.dm index e2e8b8be1d4..6f970eafac9 100644 --- a/code/datums/status_effects/debuffs/spacer.dm +++ b/code/datums/status_effects/debuffs/spacer.dm @@ -85,7 +85,7 @@ /atom/movable/screen/alert/status_effect/gravity_sickness name = "Gravity Sickness" desc = "The gravity of the planet around you is making you feel sick and tired." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /datum/mood_event/spacer diff --git a/code/datums/status_effects/debuffs/terrified.dm b/code/datums/status_effects/debuffs/terrified.dm index b0c984622e8..ee54190a4a5 100644 --- a/code/datums/status_effects/debuffs/terrified.dm +++ b/code/datums/status_effects/debuffs/terrified.dm @@ -26,7 +26,7 @@ /atom/movable/screen/alert/status_effect/terrified name = "Terrified!" desc = "You feel a supernatural darkness settle in around you, overwhelming you with panic! Get into the light!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "terrified" #undef TERROR_INITIAL_AMOUNT diff --git a/code/datums/status_effects/debuffs/tower_of_babel.dm b/code/datums/status_effects/debuffs/tower_of_babel.dm index 16bc92c2515..5552e691a47 100644 --- a/code/datums/status_effects/debuffs/tower_of_babel.dm +++ b/code/datums/status_effects/debuffs/tower_of_babel.dm @@ -56,5 +56,5 @@ /atom/movable/screen/alert/status_effect/tower_of_babel name = "Tower of babel" desc = "You seem to be babbling in a strange language..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "mind_control" diff --git a/code/datums/status_effects/debuffs/vision/blindness.dm b/code/datums/status_effects/debuffs/vision/blindness.dm index 0061c343b5f..26b1dcadd52 100644 --- a/code/datums/status_effects/debuffs/vision/blindness.dm +++ b/code/datums/status_effects/debuffs/vision/blindness.dm @@ -72,7 +72,7 @@ /atom/movable/screen/alert/status_effect/blind name = "Blind" desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, or something covering your eyes." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "blind" /// This status effect handles applying a temporary blind to the mob. diff --git a/code/datums/status_effects/drug_effects.dm b/code/datums/status_effects/drug_effects.dm index b498e3d3981..70184a4a123 100644 --- a/code/datums/status_effects/drug_effects.dm +++ b/code/datums/status_effects/drug_effects.dm @@ -10,7 +10,7 @@ /atom/movable/screen/alert/status_effect/woozy name = "Woozy" desc = "You feel a bit slower than usual, it seems doing things with your hands takes longer than it usually does." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "woozy" /datum/status_effect/high_blood_pressure @@ -37,7 +37,7 @@ /atom/movable/screen/alert/status_effect/high_blood_pressure name = "High blood pressure" desc = "Your blood pressure is real high right now ... You'd probably bleed like a stuck pig." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "highbloodpressure" /datum/status_effect/seizure @@ -60,7 +60,7 @@ /atom/movable/screen/alert/status_effect/seizure name = "Seizure" desc = "FJOIWEHUWQEFGYUWDGHUIWHUIDWEHUIFDUWGYSXQHUIODSDBNJKVBNKDML <--- this is you right now" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /datum/status_effect/stoned diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 1b5fc8d3e62..b2e358d2b94 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -67,7 +67,7 @@ /atom/movable/screen/alert/status_effect/in_love name = "In Love" desc = "You feel so wonderfully in love!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "in_love" /datum/status_effect/in_love @@ -170,7 +170,7 @@ /atom/movable/screen/alert/status_effect/heldup name = "Held Up" desc = "Making any sudden moves would probably be a bad idea!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "aimed" /datum/status_effect/grouped/heldup/on_apply() @@ -192,7 +192,7 @@ /atom/movable/screen/alert/status_effect/holdup name = "Holding Up" desc = "You're currently pointing a gun at someone. Click to cancel." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "aimed" clickable_glow = TRUE @@ -376,7 +376,7 @@ /atom/movable/screen/alert/status_effect/surrender name = "Surrender" desc = "Looks like you're in trouble now, bud. Click here to surrender. (Warning: You will be incapacitated.)" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "surrender" clickable_glow = TRUE diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index 331ae61a5f0..1fd6c53e8c1 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -3,7 +3,7 @@ /atom/movable/screen/alert/status_effect/determined name = "Determined" desc = "The serious wounds you've sustained have put your body into fight-or-flight mode! Now's the time to look for an exit!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "wounded" /datum/status_effect/determined diff --git a/code/game/machinery/camera/silicon_camera.dm b/code/game/machinery/camera/silicon_camera.dm index d573c59f632..1a3fe642c69 100644 --- a/code/game/machinery/camera/silicon_camera.dm +++ b/code/game/machinery/camera/silicon_camera.dm @@ -35,5 +35,5 @@ /atom/movable/screen/alert/being_recorded name = "Recorded" desc = "Someone is currently watching your internal camera through a camera console." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "recording" diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 096a402df83..fce0a42043d 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -454,7 +454,7 @@ /atom/movable/screen/alert/iv_connected name = "IV Connected" desc = "You have an IV connected to your arm. Remember to remove it or drag the IV stand with you before moving, or else it will rip out!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "iv_connected" #undef MIN_IV_TRANSFER_RATE diff --git a/code/game/objects/items/weaponry/melee/chainofcommand.dm b/code/game/objects/items/weaponry/melee/chainofcommand.dm index ed0482f4abc..26acfc4d490 100644 --- a/code/game/objects/items/weaponry/melee/chainofcommand.dm +++ b/code/game/objects/items/weaponry/melee/chainofcommand.dm @@ -66,7 +66,7 @@ /atom/movable/screen/alert/status_effect/commanded name = "Commanded" desc = "You are inspired to do things faster!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "commanded" /obj/item/melee/chainofcommand/tailwhip diff --git a/code/modules/antagonists/heretic/magic/void_prison.dm b/code/modules/antagonists/heretic/magic/void_prison.dm index 3cb06545370..6bc205b8749 100644 --- a/code/modules/antagonists/heretic/magic/void_prison.dm +++ b/code/modules/antagonists/heretic/magic/void_prison.dm @@ -97,7 +97,7 @@ /atom/movable/screen/alert/status_effect/void_prison name = "Void Prison" desc = "A Yawning void encases your mortal coil." //Go straight to jail, do not pass GO, do not collect 200$ - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT icon_state = "heretic_template" overlay_icon = 'icons/mob/actions/actions_ecult.dmi' overlay_state = "voidball_effect" diff --git a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm index dc3ddbd6d51..f6133e92915 100644 --- a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm +++ b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm @@ -13,7 +13,7 @@ /atom/movable/screen/alert/status_effect/veryhighgravity name = "Crushing Gravity" desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "paralysis" /datum/status_effect/void_chomped diff --git a/code/modules/antagonists/wizard/equipment/teleport_rod.dm b/code/modules/antagonists/wizard/equipment/teleport_rod.dm index a0cc6224ce2..9e0bfc5ccb4 100644 --- a/code/modules/antagonists/wizard/equipment/teleport_rod.dm +++ b/code/modules/antagonists/wizard/equipment/teleport_rod.dm @@ -214,7 +214,7 @@ /atom/movable/screen/alert/status_effect/teleport_flux name = "Teleport Flux" desc = "Your body exists in a state of flux, making further teleportation dangerous." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "flux" /atom/movable/screen/alert/status_effect/teleport_flux/perma diff --git a/code/modules/bitrunning/components/netpod_healing.dm b/code/modules/bitrunning/components/netpod_healing.dm index dd70c29a030..fead24f5491 100644 --- a/code/modules/bitrunning/components/netpod_healing.dm +++ b/code/modules/bitrunning/components/netpod_healing.dm @@ -62,7 +62,7 @@ /atom/movable/screen/alert/status_effect/embryonic name = "Embryonic Stasis" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "netpod_stasis" desc = "You feel like you're in a dream." diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index b76bcaba2eb..80284471da3 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -93,7 +93,7 @@ desc = "You %STACKS% explosive dust, kinetic impacts will cause it to detonate! \ The explosion will not harm you as long as you're not under atmospheric pressure. \ Click this alert to shake off the dust." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "brimdemon_1" /atom/movable/screen/alert/status_effect/brimdust_coating/MouseEntered(location,control,params) diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index 2c4ef8d057a..894a9dbe0db 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -51,7 +51,7 @@ /atom/movable/screen/alert/status_effect/lobster_rush name = "Lobster Rush" desc = "Adrenaline is surging through you!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "lobster" /datum/status_effect/lobster_rush/on_apply() diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm index 963d0b88f35..25a827295e8 100644 --- a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm +++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm @@ -146,7 +146,7 @@ /atom/movable/screen/alert/status_effect/overwatch name = "Overwatched" desc = "Freeze! You are being watched!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "aimed" /// Blocks further applications of the ability for a little while diff --git a/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm b/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm index 9c300ec0ea3..651cd848458 100644 --- a/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm +++ b/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm @@ -43,7 +43,7 @@ /atom/movable/screen/alert/status_effect/inflated name = "WUMBO" desc = "You feel big and strong!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "gross" /datum/status_effect/inflated/on_creation(mob/living/new_owner, ...) diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 4d244c90076..ac903c75104 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -371,7 +371,7 @@ /atom/movable/screen/alert/tazed name = "Tased!" desc = "You're being tased! You can click this or resist to attempt to stop it, assuming you've not already collapsed." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "stun" clickable_glow = TRUE diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index a6f4f369d08..49596037346 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -583,7 +583,7 @@ /atom/movable/screen/alert/penthrite name = "Strong Heartbeat" desc = "Your heart beats with great force!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_icon = 'icons/obj/medical/syringe.dmi' overlay_state = "luxpen" diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index dd35dc22662..fb7854944bc 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -1361,13 +1361,13 @@ /atom/movable/screen/alert/fruit_punch_good name = "Fruit Punch Blessing" desc = "The sweetness of the fruit punch and the friendly company of the liquid cooler are slowly restoring your health..." - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "punch_blessing" /atom/movable/screen/alert/fruit_punch_bad name = "Fruit Punishment" desc = "The unbearable sweetness of the fruit punch is too much to bear without the soothing aura of a liquid cooler! Your body is going into shock!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "punch_punishment" /datum/reagent/consumable/ethanol/bitters_soda diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 0e058ffdbff..6ed0030a2dd 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -197,7 +197,7 @@ /atom/movable/screen/alert/status_effect/bloodchill name = "Bloodchilled" desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "bloodchill" /datum/status_effect/bloodchill @@ -240,7 +240,7 @@ /atom/movable/screen/alert/status_effect/bonechill name = "Bonechilled" desc = "You feel a shiver down your spine after hearing the haunting noise of bone rattling. You'll move slower and get frostbite for a while!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "bloodchill" /datum/status_effect/rebreathing diff --git a/code/modules/spells/spell_types/shapeshift/_shape_status.dm b/code/modules/spells/spell_types/shapeshift/_shape_status.dm index e854a3faa9d..f052b0dfa88 100644 --- a/code/modules/spells/spell_types/shapeshift/_shape_status.dm +++ b/code/modules/spells/spell_types/shapeshift/_shape_status.dm @@ -242,7 +242,7 @@ name = "Shapeshifted" desc = "Your form is not your own... you're shapeshifted into another creature! \ A wizard could turn you back - or maybe you're stuck like this for good?" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "shapeshifted" clickable_glow = TRUE diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm index beb0ac4d499..288544cda2c 100644 --- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm +++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm @@ -235,7 +235,7 @@ /atom/movable/screen/alert/status_effect/anomalock_active name = "voltaic overdrive" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "anomalock_heart" desc = "Voltaic energy is flooding your muscles, keeping your body upright. You have 30 seconds before it falters!" diff --git a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm index f75835359de..6d9d78b4fe5 100644 --- a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm +++ b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm @@ -63,7 +63,7 @@ /atom/movable/screen/alert/status_effect/golem_statued name = "Statued" desc = "You no longer have the energy to move your body!" - use_user_hud_icon = TRUE + use_user_hud_icon = USER_HUD_STYLE_INHERIT overlay_state = "golem_statued" /datum/status_effect/golem_statued/on_apply() diff --git a/icons/hud/screen_ghost.dmi b/icons/hud/screen_ghost.dmi index a57a7c6b477..42220abc69e 100644 Binary files a/icons/hud/screen_ghost.dmi and b/icons/hud/screen_ghost.dmi differ