diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 885170c7547..444f1197abe 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -553,30 +553,33 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /atom/movable/screen/alert/nocell name = "Missing Power Cell" desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance." - icon_state = "nocell" + icon_state = "no_cell" /atom/movable/screen/alert/emptycell name = "Out of Power" desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." - icon_state = "emptycell" + icon_state = "empty_cell" /atom/movable/screen/alert/lowcell name = "Low Charge" desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." - icon_state = "lowcell" + icon_state = "low_cell" //Ethereal -/atom/movable/screen/alert/etherealcharge +/atom/movable/screen/alert/lowcell/ethereal name = "Low Blood Charge" desc = "Your charge is running low, find a source of energy! Use a recharging station, eat some Ethereal-friendly food, or syphon some power from lights, a power cell, or an APC (done by right clicking on combat mode)." - icon_state = "etherealcharge" + +/atom/movable/screen/alert/emptycell/ethereal + name = "No Blood Charge" + desc = "You are out of juice, find a source of energy! Use a recharging station, eat some Ethereal-friendly food, or syphon some power from lights, a power cell, or an APC (done by right clicking on combat mode)." /atom/movable/screen/alert/ethereal_overcharge name = "Blood Overcharge" desc = "Your charge is running dangerously high, find an outlet for your energy! Right click an APC while not in combat mode." - icon_state = "ethereal_overcharge" + icon_state = "cell_overcharge" //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg /atom/movable/screen/alert/hacked diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 8df654d9698..e3ccb3c2e10 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -148,15 +148,15 @@ /datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/H, delta_time, times_fired) switch(get_charge(H)) if(-INFINITY to ETHEREAL_CHARGE_NONE) - H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 3) + H.throw_alert("ethereal_charge", /atom/movable/screen/alert/emptycell/ethereal) if(H.health > 10.5) apply_damage(0.65, TOX, null, null, H) if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER) - H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 2) + H.throw_alert("ethereal_charge", /atom/movable/screen/alert/lowcell/ethereal, 3) if(H.health > 10.5) apply_damage(0.325 * delta_time, TOX, null, null, H) if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL) - H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 1) + H.throw_alert("ethereal_charge", /atom/movable/screen/alert/lowcell/ethereal, 2) if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD) H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 1) apply_damage(0.2, TOX, null, null, H) diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi index a92dc82d2f9..611f0379628 100755 Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ