From fda027b5d18a485e6f5ffb33a3eeed04f5848c94 Mon Sep 17 00:00:00 2001 From: nmajask Date: Tue, 21 Jun 2022 21:22:46 -0400 Subject: [PATCH 1/4] temp revert --- code/game/machinery/cryopod.dm | 3 +-- code/modules/mob/mob_helpers.dm | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 4e38b4c63a88..731e13eb6886 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -378,8 +378,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) R.contents -= R.mmi qdel(R.mmi) - var/mob/dead/observer/ghost = mob_occupant.ghostize(FALSE) - ghost.mind = null + mob_occupant.ghostize(FALSE) handle_objectives() QDEL_NULL(occupant) for(var/obj/item/I in get_turf(src)) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index e8d378d62144..88d763a979ca 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -483,9 +483,7 @@ var/mob/dead/observer/C = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost!") message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(M)])") - var/mob/dead/observer/G = M.ghostize(FALSE) - if(istype(G)) - G.mind = null + M.ghostize(FALSE) M.key = C.key return TRUE else From 19032543a07d8d813add8dec4cfea187cc683fe2 Mon Sep 17 00:00:00 2001 From: nmajask Date: Tue, 21 Jun 2022 23:33:42 -0400 Subject: [PATCH 2/4] Revert "temp revert" This reverts commit fda027b5d18a485e6f5ffb33a3eeed04f5848c94. --- code/game/machinery/cryopod.dm | 3 ++- code/modules/mob/mob_helpers.dm | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 731e13eb6886..4e38b4c63a88 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -378,7 +378,8 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) R.contents -= R.mmi qdel(R.mmi) - mob_occupant.ghostize(FALSE) + var/mob/dead/observer/ghost = mob_occupant.ghostize(FALSE) + ghost.mind = null handle_objectives() QDEL_NULL(occupant) for(var/obj/item/I in get_turf(src)) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 88d763a979ca..e8d378d62144 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -483,7 +483,9 @@ var/mob/dead/observer/C = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost!") message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(M)])") - M.ghostize(FALSE) + var/mob/dead/observer/G = M.ghostize(FALSE) + if(istype(G)) + G.mind = null M.key = C.key return TRUE else From 0f64a5e4b96d997e797a818e59dc8526fee8a854 Mon Sep 17 00:00:00 2001 From: nmajask Date: Tue, 21 Jun 2022 23:35:29 -0400 Subject: [PATCH 3/4] pain --- code/game/machinery/cryopod.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 4e38b4c63a88..53c627773159 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -379,7 +379,8 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) qdel(R.mmi) var/mob/dead/observer/ghost = mob_occupant.ghostize(FALSE) - ghost.mind = null + if(istype(ghost)) + ghost.mind = null handle_objectives() QDEL_NULL(occupant) for(var/obj/item/I in get_turf(src)) From 023ba2d87212485b2091cbe0094065294eafdf7b Mon Sep 17 00:00:00 2001 From: nmajask Date: Wed, 22 Jun 2022 16:48:14 -0400 Subject: [PATCH 4/4] pain --- code/game/machinery/cryopod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 53c627773159..5de9280cc0a4 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -379,7 +379,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) qdel(R.mmi) var/mob/dead/observer/ghost = mob_occupant.ghostize(FALSE) - if(istype(ghost)) + if(ghost) ghost.mind = null handle_objectives() QDEL_NULL(occupant)