From 497f2cc2d3957d5c1c381899fc761131e1829299 Mon Sep 17 00:00:00 2001 From: Leshana Date: Mon, 22 May 2017 14:21:36 -0400 Subject: [PATCH] Fixes Runtime in 04_resleeving.dm,32: Cannot read null.ckey proc name: copy to mob (/datum/category_item/player_setup_item/vore/resleeve/copy_to_mob) And fixes Runtime in infocore.dm,175: code/modules/resleeving/infocore.dm:175:Assertion Failed: !deleted(M) proc name: init from mob (/datum/transhuman/body_record/proc/init_from_mob) --- code/modules/client/preference_setup/vore/04_resleeving.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/client/preference_setup/vore/04_resleeving.dm b/code/modules/client/preference_setup/vore/04_resleeving.dm index fc1b059f5e7..93f105195cd 100644 --- a/code/modules/client/preference_setup/vore/04_resleeving.dm +++ b/code/modules/client/preference_setup/vore/04_resleeving.dm @@ -24,6 +24,8 @@ /datum/category_item/player_setup_item/vore/resleeve/copy_to_mob(var/mob/living/carbon/human/character) if(character && !istype(character,/mob/living/carbon/human/dummy)) spawn(50) + if(deleted(character) || deleted(pref)) + return // They might have been deleted during the wait if(pref.resleeve_scan) var/datum/transhuman/body_record/BR = new() //Clearly related to size. BR.init_from_mob(character, pref.resleeve_scan, pref.resleeve_lock)