Fixed up AI Malfunction

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

@@ -35,7 +35,7 @@ var/list/ai_list = list()
 //Hud stuff
 
 	//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
@@ -50,6 +50,7 @@ var/list/ai_list = list()
 
 	var/camera_light_on = 0	//Defines if the AI toggled the light on the camera it's looking through.
 	var/datum/trackable/track = null
+	var/can_shunt = 1
 	var/last_announcement = ""
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
@@ -653,7 +654,7 @@ var/list/ai_list = list()
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo2"))
 	return
 
-/*/mob/living/silicon/ai/proc/corereturn()
+/mob/living/silicon/ai/proc/corereturn()
 	set category = "Malfunction"
 	set name = "Return to Main Core"
 
@@ -661,7 +662,7 @@ var/list/ai_list = list()
 	if(!istype(apc))
 		src << "\blue You are already in your Main Core."
 		return
-	apc.malfvacate()*/
+	apc.malfvacate()
 
 //Toggles the luminosity and applies it by re-entereing the camera.
 /mob/living/silicon/ai/proc/toggle_camera_light()

code/modules/power/apc.dm

@@ -903,24 +903,27 @@
 					malfai << "Hack complete. The APC is now under your exclusive control."
 					update_icon()
 
-	/*else if (href_list["occupyapc"])
+	else if (href_list["occupyapc"])
 		malfoccupy(usr)
 
 
 	else if (href_list["deoccupyapc"])
-		malfvacate()*/
+		malfvacate()
 
 	if(usingUI)
 		src.updateDialog()
 
 	return
 
-/*/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)
+/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)
 	if(!istype(malf))
 		return
 	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)
@@ -953,7 +956,7 @@
 		if(forced)
 			src.occupant.loc = src.loc
 			src.occupant.death()
-			src.occupant.gib()*/
+			src.occupant.gib()
 
 
 /obj/machinery/power/apc/proc/ion_act()