cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Cyborgs now use the same icon states for charge screen alerts as ethereals. (#4458)

Browse Source 
* Cyborgs now use the same icon states for charge screen alerts as ethereals. (#57966)

* Cyborgs now use the same icon states for charge screen alerts as ethereals.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-27 20:17:52 +01:00
committed by GitHub
parent 46dd1a7361
commit 40e8eb4531
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/_onclick/hud/alert.dm
View File

@@ -553,30 +553,33 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
/atom/movable/screen/alert/nocell /atom/movable/screen/alert/nocell
name = "Missing Power Cell" name = "Missing Power Cell"
desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance." 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 /atom/movable/screen/alert/emptycell
name = "Out of Power" name = "Out of Power"
desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ 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." 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 /atom/movable/screen/alert/lowcell
name = "Low Charge" name = "Low Charge"
desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." 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 //Ethereal
/atom/movable/screen/alert/etherealcharge /atom/movable/screen/alert/lowcell/ethereal
name = "Low Blood Charge" 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)." 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 /atom/movable/screen/alert/ethereal_overcharge
name = "Blood 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." 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 //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg
/atom/movable/screen/alert/hacked /atom/movable/screen/alert/hacked

6
code/modules/mob/living/carbon/human/species_types/ethereal.dm
View File

@@ -148,15 +148,15 @@
/datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/H, delta_time, times_fired) /datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/H, delta_time, times_fired)
switch(get_charge(H)) switch(get_charge(H))
if(-INFINITY to ETHEREAL_CHARGE_NONE) 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) if(H.health > 10.5)
apply_damage(0.65, TOX, null, null, H) apply_damage(0.65, TOX, null, null, H)
if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER) 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) if(H.health > 10.5)
apply_damage(0.325 * delta_time, TOX, null, null, H) apply_damage(0.325 * delta_time, TOX, null, null, H)
if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL) 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) if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD)
H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 1) H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 1)
apply_damage(0.2, TOX, null, null, H) apply_damage(0.2, TOX, null, null, H)

BIN
icons/hud/screen_alert.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 108 KiB