Merge pull request #2871 from Crazylemon64/autocloner_needs_power

Added sanity checks to cloner autoprocess, scanning, and growing
This commit is contained in:
TheDZD
2015-12-17 16:52:27 -05:00
2 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -187,7 +187,7 @@
//Start growing a human clone in the pod!
/obj/machinery/clonepod/proc/growclone(var/datum/dna2/record/R)
if(mess || attempting || panel_open)
if(mess || attempting || panel_open || stat & (NOPOWER|BROKEN))
return 0
var/datum/mind/clonemind = locate(R.mind)
if(!istype(clonemind)) //not a mind
+5 -1
View File
@@ -28,7 +28,7 @@
return ..()
/obj/machinery/computer/cloning/process()
if(!scanner || !pods.len || !autoprocess)
if(!scanner || !pods.len || !autoprocess || stat & NOPOWER)
return
if(scanner.occupant && (scanner.scan_level > 2))
@@ -341,6 +341,10 @@
return
/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob)
if (stat & NOPOWER)
return
if (scanner.stat & (NOPOWER|BROKEN))
return
if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (subject.species.flags & NO_SCAN))
scantemp = "<span class=\"bad\">Error: Unable to locate valid genetic data.</span>"
nanomanager.update_uis(src)