cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7843 from ShadowLarkens/screenalerts

Browse Source 
Ported /tg/ style screen alerts, replacing the hunger icon with them
This commit is contained in:
Aronai Sieyes
2020-05-14 09:52:06 -04:00
committed by GitHub
parent bfeb081f30 17c80270e4
commit 3bbec85296
54 changed files with 970 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/defib.dm
+3 -5
View File
@@ -386,11 +386,9 @@
// This proc is used so that we can return out of the revive process while ensuring that busy and update_icon() are handled
/obj/item/weapon/shockpaddles/proc/do_revive(mob/living/carbon/human/H, mob/user)
if(!H.client && !H.teleop)
for(var/mob/observer/dead/ghost in player_list)
if(ghost.mind == H.mind)
ghost.notify_revive("Someone is trying to resuscitate you. Re-enter your body if you want to be revived!", 'sound/effects/genetics.ogg')
break
var/mob/observer/dead/ghost = H.get_ghost()
if(ghost)
ghost.notify_revive("Someone is trying to resuscitate you. Re-enter your body if you want to be revived!", 'sound/effects/genetics.ogg', source = src)
//beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
user.visible_message("<span class='warning'>\The [user] begins to place [src] on [H]'s chest.</span>", "<span class='warning'>You begin to place [src] on [H]'s chest...</span>")