From 3b0a71006cc0c50c5bcbd872ea2ffd7a55cdb08a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 20 Nov 2017 22:32:20 -0500 Subject: [PATCH] Update experimentor.dm --- code/modules/research/experimentor.dm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 35dac9190b..57ca602774 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -43,23 +43,6 @@ temp_list[O] = text2num(temp_list[O]) return temp_list -<<<<<<< HEAD -/* //uncomment to enable forced reactions. -/obj/machinery/r_n_d/experimentor/verb/forceReaction() - set name = "Force Experimentor Reaction" - set category = "Debug" - set src in oview(1) - var/reaction = input(usr,"What reaction?") in list(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) - var/oldReaction = item_reactions["[loaded_item.type]"] - item_reactions["[loaded_item.type]"] = reaction - experiment(item_reactions["[loaded_item.type]"],loaded_item) - spawn(10) - if(loaded_item) - item_reactions["[loaded_item.type]"] = oldReaction -*/ -======= ->>>>>>> b7a9a2a... Merge pull request #32844 from ShizCalev/code-cleanup - /obj/machinery/r_n_d/experimentor/proc/SetTypeReactions() var/probWeight = 0 for(var/I in typesof(/obj/item))