Merge branch 'pr/14'

code/modules/ninja/suit/mask.dm

@@ -17,3 +17,44 @@ Contents:
 	item_state = "s-ninja_mask"
 	strip_delay = 120
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
+/obj/item/clothing/mask/gas/space_ninja/speechModification(message)
+	if(copytext(message, 1, 2) != "*")
+		var/list/temp_message = text2list(message, " ")
+		var/list/pick_list = list()
+		for(var/i = 1, i <= temp_message.len, i++)
+			pick_list += i
+		for(var/i=1, i <= abs(temp_message.len/3), i++)
+			var/H = pick(pick_list)
+			if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
+			temp_message[H] = ninjaspeak(temp_message[H])
+			pick_list -= H
+		message = list2text(temp_message, " ")
+
+		//The Alternate speech mod is now the main one.
+		message = replacetext(message, "l", "r")
+		message = replacetext(message, "rr", "ru")
+		message = replacetext(message, "v", "b")
+		message = replacetext(message, "f", "hu")
+		message = replacetext(message, "'t", "")
+		message = replacetext(message, "t ", "to ")
+		message = replacetext(message, " I ", " ai ")
+		message = replacetext(message, "th", "z")
+		message = replacetext(message, "is", "izu")
+		message = replacetext(message, "ziz", "zis")
+		message = replacetext(message, "se", "su")
+		message = replacetext(message, "br", "bur")
+		message = replacetext(message, "ry", "ri")
+		message = replacetext(message, "you", "yuu")
+		message = replacetext(message, "ck", "cku")
+		message = replacetext(message, "eu", "uu")
+		message = replacetext(message, "ow", "au")
+		message = replacetext(message, "are", "aa")
+		message = replacetext(message, "ay", "ayu")
+		message = replacetext(message, "ea", "ii")
+		message = replacetext(message, "ch", "chi")
+		message = replacetext(message, "than", "sen")
+		message = replacetext(message, ".", "")
+		message = lowertext(message)
+
+	return message

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

@@ -4,22 +4,7 @@
 
 	if(!ninjacost(0,N_ADRENALINE))
 		var/mob/living/carbon/human/H = affecting
-		H.SetSleeping(0)
-		H.SetStun(0)
-		H.SetKnockdown(0)
-		H.SetUnconscious(0)
-		H.adjustStaminaLoss(-150)
-		H.stuttering = 0
-		H.updatehealth()
-		H.update_stamina()
-		H.resting = 0
-		H.lying = 0
-		H.update_canmove()
-
-		H.reagents.add_reagent("inaprovaline", 3) //let's give another chance to dumb fucks who forget to breathe
-		H.reagents.add_reagent("synaptizine", 10)
-		H.reagents.add_reagent("omnizine", 10)
-		H.reagents.add_reagent("stimulants", 10)
+		H.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
 
 		H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")