diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f979a9f5..628e7cd1 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -134,9 +134,12 @@ if(mess || attempting) return FALSE - //only check for clone's mind if it's not experimental cloning - if(!experimental) + //runtime error protection + if(mindref) clonemind = locate(mindref) in SSticker.minds + + //only exit out of cloning with no mind if cloning is not experimental. + if(!experimental) if(!istype(clonemind)) //not a mind return FALSE if(!QDELETED(clonemind.current)) @@ -216,12 +219,10 @@ attempting = FALSE //sizecode stuff, check size of scanned individual to then pass in later. someone should turn size into a dna trait tbh - if(mindref) - clonemind = locate(mindref) in SSticker.minds - if(istype(clonemind)) - var/mob/living/current = clonemind.current //gets body of current mind - if(!isnull(current)) - size = current.size_multiplier * 100 + if(istype(clonemind)) + var/mob/living/current = clonemind.current //gets body of current mind + if(!isnull(current)) + size = current.size_multiplier * 100 return TRUE diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm index 90f81ecf..c5b40a46 100644 --- a/code/game/machinery/exp_cloner.dm +++ b/code/game/machinery/exp_cloner.dm @@ -295,11 +295,8 @@ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else - //disabled vars from how cloning.dm does it - //var/ckey = mob_occupant.ckey + //put here for ease of use / ability to change, rather than in the method call to growclone var/name = mob_occupant.real_name - //var/id = copytext_char(md5(mob_occupant.real_name), 2, 6) - //var/UE = dna.unique_enzymes var/mind = null var/UI = dna.uni_identity var/SE = dna.mutation_index