shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update experimentor.dm

Browse Source
This commit is contained in:
deathride58
2017-11-20 22:32:20 -05:00
committed by GitHub
parent 15165d970d
commit 3b0a71006c
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
-17
View File
@@ -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))