Merge pull request #12466 from phil235/BugFixBoogalooH

Bugfixes: soulstone, reagent runtimes, etc
This commit is contained in:
Razharas
2015-10-19 10:02:42 +03:00
12 changed files with 80 additions and 64 deletions
+3
View File
@@ -219,6 +219,9 @@
if(!src)
return
listclearnulls(consenting_candidates) //some candidates might have left during sleep(50)
if(consenting_candidates.len)
var/client/C = null
C = pick(consenting_candidates)
@@ -156,7 +156,7 @@
nadeassembly.on_found(finder)
/obj/item/weapon/grenade/chem_grenade/prime()
if(stage != READY)
if(stage != READY || !reagents)
return
var/has_reagents