shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13483 from DeltaFire15/revenant-fix

Browse Source 
Fixes Revenants reviving
This commit is contained in:
silicons
2020-10-03 18:02:56 -07:00
committed by GitHub
parent 6e75c27c60 29d2a12d55
commit bbbdc57b2f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/revenant/revenant.dm
+4 -4
View File
@@ -390,7 +390,7 @@
if(old_key) if(old_key)
for(var/mob/M in GLOB.dead_mob_list) for(var/mob/M in GLOB.dead_mob_list)
if(M.client && M.client.key == old_key) //Only recreates the mob if the mob the client is in is dead if(M.client && M.client.key == old_key) //Only recreates the mob if the mob the client is in is dead
M.transfer_ckey(revenant.key, FALSE) M.transfer_ckey(revenant, FALSE)
key_of_revenant = TRUE key_of_revenant = TRUE
break break
if(!key_of_revenant) if(!key_of_revenant)
@@ -403,7 +403,7 @@
visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>") visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>")
return return
var/mob/C = pick(candidates) var/mob/C = pick(candidates)
C.transfer_ckey(revenant.key, FALSE) C.transfer_ckey(revenant, FALSE)
if(!revenant.key) if(!revenant.key)
qdel(revenant) qdel(revenant)
message_admins("No ckey was found for the new revenant. Oh well!") message_admins("No ckey was found for the new revenant. Oh well!")
@@ -411,8 +411,8 @@
visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>") visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>")
return return
message_admins("[key_of_revenant] has been [old_key == revenant.key ? "re":""]made into a revenant by reforming ectoplasm.") message_admins("[revenant.key] has been [old_key == revenant.key ? "re":""]made into a revenant by reforming ectoplasm.")
log_game("[key_of_revenant] was [old_key == revenant.key ? "re":""]made as a revenant by reforming ectoplasm.") log_game("[revenant.key] was [old_key == revenant.key ? "re":""]made as a revenant by reforming ectoplasm.")
visible_message("<span class='revenboldnotice'>[src] suddenly rises into the air before fading away.</span>") visible_message("<span class='revenboldnotice'>[src] suddenly rises into the air before fading away.</span>")
revenant.essence = essence revenant.essence = essence