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

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
+2 -2
View File
@@ -86,8 +86,8 @@
/obj/machinery/r_n_d/experimentor/Initialize()
. = ..()
trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_list
trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_list
trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list
SetTypeReactions()
/obj/machinery/r_n_d/experimentor/RefreshParts()