TG sync Sunday (#201)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

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

@@ -33,6 +33,7 @@ var/list/ai_list = list()
 	var/list/connected_robots = list()
 	var/aiRestorePowerRoutine = 0
 	var/requires_power = POWER_REQ_ALL
+	var/can_be_carded = TRUE
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list())
 	var/viewalerts = 0
@@ -790,6 +791,10 @@ var/list/ai_list = list()
 		if(!mind)
 			user << "<span class='warning'>No intelligence patterns detected.</span>"    //No more magical carding of empty cores, AI RETURN TO BODY!!!11
 			return
+		if(!can_be_carded)
+			user << "<span class='boldwarning'>Transfer failed.</span>"
+			return
+		ShutOffDoomsdayDevice()
 		new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location.
 		ai_restore_power()//So the AI initially has power.
 		control_disabled = 1//Can't control things remotely if you're stuck in a card!
@@ -881,7 +886,7 @@ var/list/ai_list = list()
 	malfhacking = 0
 	clear_alert("hackingapc")
 
-	if(!istype(apc) || qdeleted(apc) || apc.stat & BROKEN)
+	if(!istype(apc) || QDELETED(apc) || apc.stat & BROKEN)
 		src << "<span class='danger'>Hack aborted. The designated APC no \
 			longer exists on the power network.</span>"
 		playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 1)
@@ -902,6 +907,9 @@ var/list/ai_list = list()
 			exclusive control."
 		apc.update_icon()
 
+/mob/living/silicon/ai/resist()
+	return
+
 /mob/living/silicon/ai/spawned/New(loc, datum/ai_laws/L, mob/target_ai)
 	if(!target_ai)
 		target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct

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

@@ -19,17 +19,8 @@
 	shuttle_caller_list -= src
 	SSshuttle.autoEvac()
 
-	if(nuking)
-		set_security_level("red")
-		nuking = FALSE
-		for(var/obj/item/weapon/pinpointer/P in pinpointer_list)
-			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
-			P.nuke_warning = FALSE
+	ShutOffDoomsdayDevice()
 
-	if(doomsday_device)
-		doomsday_device.timing = FALSE
-		SSshuttle.clearHostileEnvironment(doomsday_device)
-		qdel(doomsday_device)
 	if(explosive)
 		spawn(10)
 			explosion(src.loc, 3, 6, 12, 15)
@@ -40,3 +31,15 @@
 			if(istype(loc, /obj/item/device/aicard))
 				loc.icon_state = "aicard-404"
 
+/mob/living/silicon/ai/proc/ShutOffDoomsdayDevice()
+	if(nuking)
+		set_security_level("red")
+		nuking = FALSE
+		for(var/obj/item/weapon/pinpointer/P in pinpointer_list)
+			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
+			P.nuke_warning = FALSE
+
+	if(doomsday_device)
+		doomsday_device.timing = FALSE
+		SSshuttle.clearHostileEnvironment(doomsday_device)
+		qdel(doomsday_device)

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

@@ -87,7 +87,7 @@
 	cameraFollow = null
 	unset_machine()
 
-	if(!eyeobj || !eyeobj.loc || qdeleted(eyeobj))
+	if(!eyeobj || !eyeobj.loc || QDELETED(eyeobj))
 		src << "ERROR: Eyeobj not found. Creating new eye..."
 		eyeobj = new(loc)
 		eyeobj.ai = src

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

@@ -19,7 +19,7 @@
 			// messenging the client
 			malfhacked(malfhack)
 
-		if(!eyeobj || qdeleted(eyeobj) || !eyeobj.loc)
+		if(!eyeobj || QDELETED(eyeobj) || !eyeobj.loc)
 			view_core()
 
 		if(machine)

code/modules/mob/living/silicon/robot/death.dm

@@ -30,4 +30,4 @@
 
 	update_icons()
 
-	sql_report_cyborg_death(src)
+	sql_report_death(src)