Merge pull request #123 from SamCroswell/master

Ninja Teleport Quickfix, ERT Armory now has a blast door

code/game/gamemodes/events/ninja_abilities.dm

@@ -78,8 +78,7 @@ 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.name != "SpiderClan Outpost")
-			U << "[mobloc.loc.name]"
+		if(mobloc.loc.name != "\improper SpiderClan Outpost")
 			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)
@@ -118,7 +117,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.name != mobloc.loc.name)
+		if(mobloc.loc.name != "\improper SpiderClan Outpost")
 			if((!T.density)&&istype(mobloc, /turf))
 				spawn(0)
 					playsound(U.loc, 'sound/effects/sparks4.ogg', 50, 1)

code/game/gamemodes/events/ninja_equipment.dm

@@ -501,7 +501,6 @@ ________________________________________________________________________________
 	var/mob/living/carbon/human/U = affecting
 	var/mob/living/silicon/ai/A = AI
 	var/display_to = s_control ? U : A//Who do we want to display certain messages to?
-	var/turf/mobloc // For use later on during a check in Kamikaze
 
 	if(s_control)
 		if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on.
@@ -595,8 +594,7 @@ ________________________________________________________________________________
 
 		if("Unlock Kamikaze")
 			if(input(U)=="Divine Wind")
-				mobloc = get_turf(U.loc)
-				if(mobloc.loc != /area/ninja_outpost)
+				if(U.loc.loc.name != "\improper SpiderClan Outpost")
 					if( !(U.stat||U.wear_suit!=src||!s_initialized))
 						if( !(cell.charge<=1||s_busy) )
 							s_busy = 1