Merge pull request #748 from SkyMarshal/Airlocks

New Objective system (WIPish), as well as fixes for #747, #734, #733, as well as fixing the portalathe, and moving the be_syndicate var up to the client.

code/modules/mob/living/living.dm

@@ -101,6 +101,26 @@
 			return 1
 	return 0
 
+/mob/living/proc/check_contents_for_reagent(A)
+	var/list/L = list()
+	L += src.contents
+	for(var/obj/item/weapon/storage/S in L)
+		L |= S.return_inv()
+	for(var/obj/item/weapon/gift/G in L)
+		L |= G.gift
+		if (istype(G.gift, /obj/item/weapon/storage))
+			L |= G.gift:return_inv()
+	for(var/obj/item/weapon/evidencebag/E in L)
+		L |= E:contents
+	for(var/obj/item/smallDelivery/S in L)
+		L |= S.wrapped
+
+	for(var/obj/item/weapon/reagent_containers/B in L)
+		for(var/datum/reagent/R in B.reagents.reagent_list)
+			if(R.type == A)
+				return 1
+	return 0
+
 
 /mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
 	  return 0 //only carbon liveforms have this proc

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

@@ -106,7 +106,7 @@
 					src.see_in_dark = 0
 					src.see_invisible = 0
 
-					if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item))
+					if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item) && !istype(get_area(src), /area/shuttle))
 						if (src:aiRestorePowerRoutine==0)
 							src:aiRestorePowerRoutine = 1
 

code/modules/mob/new_player/new_player.dm

@@ -265,7 +265,8 @@
 		job_master.EquipRank(character, rank, 1)
 		EquipCustomItems(character)
 		character.loc = pick(latejoin)
-		character.be_syndicate = src.preferences.be_special
+		if(character.client)
+			character.client.be_syndicate = preferences.be_special
 		ticker.mode.latespawn(character)
 		AnnounceArrival(character, rank)
 

code/modules/mob/new_player/preferences.dm

@@ -862,7 +862,6 @@ datum/preferences
 
 		character.age = age
 		character.dna.b_type = b_type
-		character.be_syndicate = be_special
 
 		character.r_eyes = r_eyes
 		character.g_eyes = g_eyes
@@ -906,6 +905,7 @@ datum/preferences
 					character.client.ooccolor = ooccolor
 					character.client.be_alien = be_special&BE_ALIEN
 					character.client.be_pai = be_special&BE_PAI
+					character.client.be_syndicate = be_special
 
 	proc/copydisabilities(mob/living/carbon/human/character)
 		if(disabilities & 1)