From d1b5cfb99f5636136311848b842ee527ee9ee5f5 Mon Sep 17 00:00:00 2001 From: monster860 Date: Sat, 28 May 2016 09:18:56 -0400 Subject: [PATCH 1/3] Fixes grabbing Ian and Runtime when using roundstart experimentor --- code/modules/research/experimentor.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index f0e3c089cfd..77fcbc67b6c 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -89,8 +89,9 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - trackedIan = locate(/mob/living/simple_animal/pet/corgi/Ian) in mob_list - trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in mob_list + spawn(1) + trackedIan = locate(/mob/living/simple_animal/pet/corgi/Ian) in mob_list + trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in mob_list SetTypeReactions() RefreshParts() From 50ecd8c3191fe88cd1379ce4346b7582dec6cbfb Mon Sep 17 00:00:00 2001 From: monster860 Date: Sat, 28 May 2016 09:19:07 -0400 Subject: [PATCH 2/3] Fix criticalReaction --- code/modules/research/experimentor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 77fcbc67b6c..b23b9f7d51f 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -248,7 +248,7 @@ recentlyExperimented = 1 icon_state = "h_lathe_wloop" var/chosenchem - var/criticalReaction = locate(exp_on) in critical_items ? TRUE : FALSE + var/criticalReaction = (exp_on.type in critical_items) ? TRUE : FALSE //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_POKE) visible_message("[src] prods at [exp_on] with mechanical arms.") From afa8bc732171ab597ce42c910efe3630baf6aed5 Mon Sep 17 00:00:00 2001 From: monster860 Date: Sat, 28 May 2016 09:19:14 -0400 Subject: [PATCH 3/3] fix experimentor clone mode --- code/modules/research/experimentor.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index b23b9f7d51f..8c6ded8312b 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -214,7 +214,8 @@ if(loaded_item) if(cloneMode && cloneCount > 0) visible_message("A duplicate [loaded_item] pops out!") - new loaded_item(get_turf(pick(oview(1,src)))) + var/type_to_make = loaded_item.type + new type_to_make(get_turf(pick(oview(1,src)))) --cloneCount if(cloneCount == 0) cloneMode = FALSE