Adds missing span-endings

2017-09-11 15:09:53 +03:00
parent 8ee6fdb76a
commit 63122795f9
53 changed files with 1990 additions and 92 deletions
@@ -411,7 +411,7 @@
 			to_chat(src, "<span class='danger'>Error: Invalid (non-numeric) votes in the vote data.</span>")
 			return 0
 		if (!(vote in optionlist))
-			to_chat(src, "<span class='danger'>Votes for choices that do not appear to be in the poll detected<span>")
+			to_chat(src, "<span class='danger'>Votes for choices that do not appear to be in the poll detected.</span>")
 			return 0
 	if (!numberedvotelist.len)
 		to_chat(src, "<span class='danger'>Invalid vote data</span>")
@@ -162,7 +162,7 @@
 		return
 	src.loc = B.loc
 	src.client.eye = src
-	src.visible_message("<span class='warning'><B>[src] rises out of the pool of blood!</B>")
+	src.visible_message("<span class='warning'><B>[src] rises out of the pool of blood!</B></span>")
 	exit_blood_effect(B)
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/effect/proc_holder/alien/hide
 	name = "Hide"
 	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
@@ -59,4 +60,68 @@
 		return 0
 	else
 		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
-		return 0
+		return 0
+=======
+/obj/effect/proc_holder/alien/hide
+	name = "Hide"
+	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
+	plasma_cost = 0
+
+	action_icon_state = "alien_hide"
+
+/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user)
+	if(user.stat != CONSCIOUS)
+		return
+
+	if (user.layer != ABOVE_NORMAL_TURF_LAYER)
+		user.layer = ABOVE_NORMAL_TURF_LAYER
+		user.visible_message("<span class='name'>[user] scurries to the ground!</span>", \
+						"<span class='noticealien'>You are now hiding.</span>")
+	else
+		user.layer = MOB_LAYER
+		user.visible_message("[user.] slowly peeks up from the ground...", \
+					"<span class='noticealien'>You stop hiding.</span>")
+	return 1
+
+
+/obj/effect/proc_holder/alien/larva_evolve
+	name = "Evolve"
+	desc = "Evolve into a higher alien caste."
+	plasma_cost = 0
+
+	action_icon_state = "alien_evolve_larva"
+
+/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user)
+	if(!islarva(user))
+		return
+	var/mob/living/carbon/alien/larva/L = user
+
+	if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
+		to_chat(user, "<span class='danger'>You cannot evolve when you are cuffed.</span>")
+
+	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
+		to_chat(L, "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>")
+		to_chat(L, "<span class='info'>There are three to choose from:</span>")
+		to_chat(L, "<span class='name'>Hunters</span> <span class='info'>are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>")
+		to_chat(L, "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>")
+		to_chat(L, "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.</span>")
+		var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
+
+		if(user.incapacitated()) //something happened to us while we were choosing.
+			return
+
+		var/mob/living/carbon/alien/humanoid/new_xeno
+		switch(alien_caste)
+			if("Hunter")
+				new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc)
+			if("Sentinel")
+				new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc)
+			if("Drone")
+				new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc)
+
+		L.alien_evolve(new_xeno)
+		return 0
+	else
+		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
+		return 0
+>>>>>>> a479714... Adds missing span-endings (#30494)
@@ -128,12 +128,12 @@
 		return
 	if(isalien(owner)) //Different effects for aliens than humans
 		to_chat(owner, "<span class='userdanger'>Your Queen has been struck down!</span>")
-		to_chat(owner, "<span class='danger'>You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.")
+		to_chat(owner, "<span class='danger'>You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.</span>")
 		owner.emote("roar")
 		owner.Stun(200) //Actually just slows them down a bit.

 	else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash.
-		to_chat(owner, "<span class='danger'>You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")
+		to_chat(owner, "<span class='danger'>You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!</span>")
 		owner.emote("scream")
 		owner.Knockdown(100)

@@ -244,7 +244,7 @@

 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
 	if(on_fire)
-		to_chat(M, "<span class='warning'>You can't put them out with just your bare hands!")
+		to_chat(M, "<span class='warning'>You can't put them out with just your bare hands!</span>")
 		return

 	if(health >= 0 && !(status_flags & FAKEDEATH))
@@ -1108,7 +1108,7 @@

 					if(prob(15))
 						if(!( H.hair_style == "Shaved") || !(H.hair_style == "Bald") || (HAIR in species_traits))
-							to_chat(H, "<span class='danger'>Your hair starts to fall out in clumps...<span>")
+							to_chat(H, "<span class='danger'>Your hair starts to fall out in clumps...</span>")
 							addtimer(CALLBACK(src, .proc/go_bald, H), 50)

 				if(75 to 100)
@@ -80,11 +80,11 @@
 /datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
 	if(H.bodytemperature > 750)
 		if(!boom_warning && H.on_fire)
-			to_chat(H, "<span class='userdanger'>You feel like you could blow up at any moment!<span>")
+			to_chat(H, "<span class='userdanger'>You feel like you could blow up at any moment!</span>")
 			boom_warning = TRUE
 	else
 		if(boom_warning)
-			to_chat(H, "<span class='notice'>You feel more stable.<span>")
+			to_chat(H, "<span class='notice'>You feel more stable.</span>")
 			boom_warning = FALSE

 	if(H.bodytemperature > 850 && H.on_fire && prob(25))
@@ -650,7 +650,7 @@
 /mob/living/simple_animal/bot/mulebot/proc/RunOver(mob/living/carbon/human/H)
 	add_logs(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])")
 	H.visible_message("<span class='danger'>[src] drives over [H]!</span>", \
-					"<span class='userdanger'>[src] drives over you!<span>")
+					"<span class='userdanger'>[src] drives over you!</span>")
 	playsound(loc, 'sound/effects/splat.ogg', 50, 1)

 	var/damage = rand(5,15)
@@ -734,7 +734,7 @@
 			visible_message("[src] grabs [held_item] out of [C]'s hand!", "<span class='notice'>You snag [held_item] out of [C]'s hand!</span>", "<span class='italics'>You hear the sounds of wings flapping furiously.</span>")
 			return held_item

-	to_chat(src, "<span class='warning'>There is nothing of interest to take!</spawn>")
+	to_chat(src, "<span class='warning'>There is nothing of interest to take!</span>")
 	return 0

 /mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -385,7 +385,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return
 	for(var/mob/dead/observer/O in GLOB.player_list)
 		if(O.client)
-			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]<span>")
+			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]</span>")
 			if(ghost_sound)
 				SEND_SOUND(O, sound(ghost_sound))
 			if(flashwindow)