Merge pull request #119 from SamCroswell/master

CentComm changes

code/defines/obj.dm

@@ -25,17 +25,12 @@
 	anchored = 1
 	density = 0
 
-	var/list/teleportpoints = list()
-
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 		return attack_hand(user)
 
 
 	attack_hand(mob/user as mob)
-		for(var/obj/effect/landmark/L in landmarks_list)
-			if(L.name == "carpspawn")
-				teleportpoints.Add(L)
 
 
 		if (user.mind.special_role=="Ninja")
@@ -45,7 +40,7 @@
 					if(user.z != src.z)        return
 
 					user.loc.loc.Exited(user)
-					user.loc = pick(teleportpoints) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
+					user.loc = pick(carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
 
 
 					playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)

code/game/gamemodes/events/ninja_abilities.dm

@@ -78,7 +78,8 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 		var/mob/living/carbon/human/U = affecting
 		var/turf/destination = get_teleport_loc(U.loc,U,9,1,3,1,0,1)
 		var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
-		if(mobloc.loc != /area/ninja_outpost)
+		if(mobloc.loc.name != "SpiderClan Outpost")
+			U << "[mobloc.loc.name]"
 			if(destination&&istype(mobloc, /turf))//The turf check prevents unusual behavior. Like teleporting out of cryo pods, cloners, mechs, etc.
 				spawn(0)
 					playsound(U.loc, "sparks", 50, 1)
@@ -117,7 +118,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 	if(!ninjacost(C,1))
 		var/mob/living/carbon/human/U = affecting
 		var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
-		if(mobloc.loc != /area/ninja_outpost)
+		if(mobloc.loc.name != mobloc.loc.name)
 			if((!T.density)&&istype(mobloc, /turf))
 				spawn(0)
 					playsound(U.loc, 'sound/effects/sparks4.ogg', 50, 1)

code/game/objects/effects/landmarks.dm

@@ -73,6 +73,9 @@
 			ninjastart += loc
 			del(src)
 
+		if("carpspawn")
+			carplist += loc
+
 	landmarks_list += src
 	return 1
 

code/global.dm

@@ -138,6 +138,7 @@ var/list/prisonsecuritywarp = list()	//prison security goes to these
 var/list/prisonwarped = list()	//list of players already warped
 var/list/blobstart = list()
 var/list/ninjastart = list()
+var/list/carplist = list()
 //	list/traitors = list()	//traitor list
 var/list/cardinal = list( NORTH, SOUTH, EAST, WEST )
 var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)