July 5th TG sync (#1883)

July 5th TG sync

code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm

@@ -4,9 +4,9 @@
 
 	if(!ninjacost(0,N_ADRENALINE))//Have to make sure stat is not counted for this ability.
 		var/mob/living/carbon/human/H = affecting
-		H.SetParalysis(0)
-		H.SetStunned(0)
-		H.SetWeakened(0)
+		H.SetUnconscious(0)
+		H.SetStun(0)
+		H.SetKnockdown(0)
 
 		spawn(30)//Slight delay so the enemy does not immedietly know the ability was used. Due to lag, this often came before waking up.
 			H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"))

code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm

@@ -5,6 +5,6 @@
 
 	if(!ninjacost(250,N_STEALTH_CANCEL))
 		var/mob/living/carbon/human/H = affecting
-		playsound(H.loc, 'sound/effects/EMPulse.ogg', 60, 2)
+		playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
 		empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2

code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm

@@ -19,7 +19,7 @@
 		inview = 0
 
 	if(!ninjacost(cost))
-		if(istype(energyKatana.loc, /mob/living/carbon))
+		if(iscarbon(energyKatana.loc))
 			var/mob/living/carbon/C = energyKatana.loc
 			C.transferItemToLoc(energyKatana, get_turf(energyKatana), TRUE)
 

code/modules/ninja/suit/suit.dm

@@ -56,6 +56,7 @@ Contents:
 	var/s_bombs = 10//Number of starting ninja smoke bombs.
 	var/a_boost = 3//Number of adrenaline boosters.
 
+
 /obj/item/clothing/suit/space/space_ninja/get_cell()
 	return cell