Merge pull request #957 from Giacomand/malf_robots

Malf Module Cleanup and Bugfixing

code/modules/mob/living/silicon/ai/ai.dm

@@ -31,7 +31,7 @@ var/list/ai_list = list()
 	var/obj/item/device/multitool/aiMulti = null
 
 	//MALFUNCTION
-	var/datum/AI_Module/module_picker/malf_picker
+	var/datum/module_picker/malf_picker
 	var/processing_time = 100
 	var/list/datum/AI_Module/current_modules = list()
 	var/fire_res_on_core = 0
@@ -48,6 +48,7 @@ var/list/ai_list = list()
 	var/datum/trackable/track = null
 
 	var/last_paper_seen = null
+	var/can_shunt = 1
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names

code/modules/power/apc.dm

@@ -796,6 +796,9 @@
 	if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC
 		malf << "<span class='warning'>You must evacuate your current apc first.</span>"
 		return
+	if(!malf.can_shunt)
+		malf << "<span class='warning'>You cannot shunt.</span>"
+		return
 	if(src.z != 1)
 		return
 	src.occupant = new /mob/living/silicon/ai(src,malf.laws,null,1)