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

Merge pull request #1105 from Citadel-Station-13/upstream-merge-27497

Browse Source 
[MIRROR] fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result.
This commit is contained in:
LetterJay
2017-05-23 07:14:58 -05:00
committed by GitHub
parent cd583208b5 dc31873c3a
commit 64215e32e4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ghost_role_spawners.dm
+2
View File
@@ -152,6 +152,8 @@
var/transfer_choice = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
if(transfer_choice != "Yes")
return
if(QDELETED(src) || uses <= 0)
return
log_game("[user.ckey] golem-swapped into [src]")
user.visible_message("<span class='notice'>A faint light leaves [user], moving to [src] and animating it!</span>","<span class='notice'>You leave your old body behind, and transfer into [src]!</span>")
create(ckey = user.ckey, flavour = FALSE, name = user.real_name)