From dc31873c3a2cbe4ec9f45447da31bca25ecd49c8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 22 May 2017 07:27:43 -0500 Subject: [PATCH] fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result. --- code/game/objects/structures/ghost_role_spawners.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 05414f0a4d..91fbf13e3c 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -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("A faint light leaves [user], moving to [src] and animating it!","You leave your old body behind, and transfer into [src]!") create(ckey = user.ckey, flavour = FALSE, name = user.real_name)