Merge pull request #7843 from ShadowLarkens/screenalerts

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
54 changed files with 970 additions and 683 deletions
+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>")
+1 -1
View File
@@ -98,7 +98,7 @@
user.drop_from_inventory(cuffs)
cuffs.loc = target
target.handcuffed = cuffs
target.update_inv_handcuffed()
target.update_handcuffed()
target.drop_r_hand()
target.drop_l_hand()
target.stop_pulling()
@@ -27,7 +27,7 @@
source.handcuffed = null
if(source.buckled && source.buckled.buckle_require_restraints)
source.buckled.unbuckle_mob()
source.update_inv_handcuffed()
source.update_handcuffed()
if (source.client)
source.client.screen -= W
if (W)
@@ -37,7 +37,7 @@
C.handcuffed = null
if(C.buckled && C.buckled.buckle_require_restraints)
C.buckled.unbuckle_mob()
C.update_inv_handcuffed()
C.update_handcuffed()
return
else
..()