cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revive proc tweaks (#47522)

Browse Source 
* Revive proc tweaks

* atomize PR

* Implements nemvar's suggestion
This commit is contained in:
81Denton
2019-11-03 09:30:22 +01:00
committed by Rob Bailey
parent 4f8bff7a91
commit 972ee79ffb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living.dm
View File

@@ -516,7 +516,7 @@
/mob/living/proc/revive(full_heal = FALSE, admin_revive = FALSE)
SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, full_heal, admin_revive)
if(full_heal)
fully_heal(admin_revive = TRUE)
fully_heal(admin_revive = admin_revive)
if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain)
GLOB.dead_mob_list -= src
GLOB.alive_mob_list += src

4
code/modules/projectiles/guns/magic/wand.dm
View File

@@ -74,7 +74,7 @@
if(isliving(user))
var/mob/living/L = user
if(L.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead
user.revive(full_heal = TRUE, admin_revive = FALSE)
user.revive(full_heal = TRUE, admin_revive = TRUE)
to_chat(user, "<span class='notice'>You feel great!</span>")
return
to_chat(user, "<span class='warning'>You irradiate yourself with pure negative energy! \
@@ -116,7 +116,7 @@
</span>")
user.death(0)
return
user.revive(full_heal = TRUE, admin_revive = FALSE)
user.revive(full_heal = TRUE, admin_revive = TRUE)
to_chat(user, "<span class='notice'>You feel great!</span>")
/obj/item/gun/magic/wand/resurrection/debug //for testing

4
code/modules/projectiles/projectile/magic.dm
View File

@@ -23,7 +23,7 @@
if(L.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead
if(L.hellbound && L.stat == DEAD)
return BULLET_ACT_BLOCK
if(L.revive(full_heal = TRUE, admin_revive = FALSE))
if(L.revive(full_heal = TRUE, admin_revive = TRUE))
L.grab_ghost(force = TRUE) // even suicides
to_chat(L, "<span class='notice'>You rise with a start, you're undead!!!</span>")
else if(L.stat != DEAD)
@@ -51,7 +51,7 @@
else
if(target.hellbound && target.stat == DEAD)
return BULLET_ACT_BLOCK
if(target.revive(full_heal = TRUE, admin_revive = FALSE))
if(target.revive(full_heal = TRUE, admin_revive = TRUE))
target.grab_ghost(force = TRUE) // even suicides
to_chat(target, "<span class='notice'>You rise with a start, you're alive!!!</span>")
else if(target.stat != DEAD)