Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs.

code/game/objects/items/stacks/rods.dm

@@ -29,14 +29,15 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
 		var/obj/item/weapon/weldingtool/WT = W
 
 		if(get_amount() < 2)
-			user << "<span class='danger'>You need at least two rods to do this.</span>"
+			user << "<span class='warning'>You need at least two rods to do this.</span>"
 			return
 
 		if(WT.remove_fuel(0,user))
 			var/obj/item/stack/sheet/metal/new_item = new(usr.loc)
 			new_item.add_to_stacks(usr)
-			for (var/mob/M in viewers(src))
-				M.show_message("<span class='danger'>[src] is shaped into metal by [user.name] with the weldingtool.</span>", 3, "<span class='danger'>You hear welding.</span>", 2)
+			user.visible_message("<span class='warning'>[user.name] shaped [src] into metal with the weldingtool.</span>", \
+						 "<span class='notice'>You shaped [src] into metal with the weldingtool.</span>", \
+						 "<span class='warning'>You hear welding.</span>")
 			var/obj/item/stack/rods/R = src
 			src = null
 			var/replace = (user.get_inactive_hand()==R)

code/game/objects/items/stacks/tiles/plasteel.dm

@@ -31,14 +31,15 @@
 		var/obj/item/weapon/weldingtool/WT = W
 
 		if(get_amount() < 4)
-			user << "<span class='danger'>You need at least four tiles to do this.</span>"
+			user << "<span class='warning'>You need at least four tiles to do this.</span>"
 			return
 
 		if(WT.remove_fuel(0,user))
 			var/obj/item/stack/sheet/metal/new_item = new(usr.loc)
 			new_item.add_to_stacks(usr)
-			for (var/mob/M in viewers(src))
-				M.show_message("<span class='danger'>[src] is shaped into metal by [user.name] with the weldingtool.</span>", 3, "<span class='danger'>You hear welding.</span>", 2)
+			user.visible_message("<span class='warning'>[user.name] shaped [src] into metal with the weldingtool.</span>", \
+						 "<span class='notice'>You shaped [src] into metal with the weldingtool.</span>", \
+						 "<span class='warning'>You hear welding.</span>")
 			var/obj/item/stack/rods/R = src
 			src = null
 			var/replace = (user.get_inactive_hand()==R)

code/game/objects/items/weapons/storage/book.dm

@@ -85,13 +85,12 @@
 				for(var/obj/item/organ/limb/affecting in H.organs)
 					if(affecting.status == ORGAN_ORGANIC)
 						if(message_halt == 0)
-							for(var/mob/O in viewers(M, null))
-								O.show_message(text("<span class='userdanger'>[] heals [] with the power of [src.deity_name]!</span>", user, M), 1)
-							M << "<span class='danger'>May the power of [src.deity_name] compel you to be healed!</span>"
+							M.visible_message("<span class='notice'>[user] heals [M] with the power of [src.deity_name]!</span>")
+							M << "<span class='boldnotice'>May the power of [src.deity_name] compel you to be healed!</span>"
 							playsound(src.loc, "punch", 25, 1, -1)
 							message_halt = 1
 					else
-						src << "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>"
+						user << "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>"
 						return
 
 
@@ -101,18 +100,18 @@
 			if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet))
 				M.adjustBrainLoss(10)
 				M << "<span class='danger'>You feel dumber.</span>"
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[user] beats [M] over the head with [src]!</span>"), 1)
+			M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", \
+					"<span class='userdanger'>[user] beats [M] over the head with [src]!</span>")
 			playsound(src.loc, "punch", 25, 1, -1)
 
 	else if(M.stat == 2)
-		for(var/mob/O in viewers(M, null))
-			O.show_message(text("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>"), 1)
+		M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>")
 		playsound(src.loc, "punch", 25, 1, -1)
 	return
 
 /obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user as mob, proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 	if (istype(A, /turf/simulated/floor))
 		user << "<span class='notice'>You hit the floor with the bible.</span>"
 		if(user.mind && (user.mind.assigned_role == "Chaplain"))

code/game/verbs/suicide.dm

@@ -51,11 +51,13 @@
 				updatehealth()
 				return
 
+		var/suicide_message = pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \
+							"[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \
+							"[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \
+							"[src] is holding \his breath! It looks like \he's trying to commit suicide.")
+
+		visible_message("<span class='danger'>[suicide_message]</span>", "<span class='userdanger'>[suicide_message]</span>")
 
-		visible_message(pick("<span class='userdanger'>[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.</span>", \
-							"<span class='userdanger'>[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.</span>", \
-							"<span class='danger'>[src] is twisting \his own neck! It looks like \he's trying to commit suicide.</span>", \
-							"<span class='danger'>[src] is holding \his breath! It looks like \he's trying to commit suicide.</span>"))
 		adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
 
@@ -68,7 +70,8 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
-		viewers(loc) << "<span class='userdanger'>[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.</span>"
+		visible_message("<span class='danger'>[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.</span>", \
+						"<span class='userdanger'>[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.</span>")
 		spawn(50)
 			death(0)
 			suiciding = 0
@@ -83,7 +86,8 @@
 	if(confirm == "Yes")
 		suiciding = 1
 		//instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
-		viewers(src) << "<span class='userdanger'>[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.</span>"
+		visible_message("<span class='danger'>[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.</span>", \
+				"<span class='userdanger'>[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.</span>")
 		adjustOxyLoss(max(175- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
 
@@ -96,7 +100,8 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
-		viewers(src) << "<span class='userdanger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>"
+		visible_message("<span class='danger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>", \
+				"<span class='userdanger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>")
 		//put em at -175
 		adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
@@ -110,7 +115,8 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
-		viewers(src) << "<span class='userdanger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>"
+		visible_message("<span class='danger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>", \
+				"<span class='userdanger'>[src] is powering down. It looks like \he's trying to commit suicide.</span>")
 		//put em at -175
 		adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
@@ -122,8 +128,8 @@
 	var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No")
 	if(answer == "Yes")
 		card.removePersonality()
-		for (var/mob/M in viewers(loc))
-			M.show_message("<span class='notice'>[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"</span>", 3, "<span class='notice'>[src] bleeps electronically.</span>", 2)
+		var/turf/T = get_turf(src.loc)
+		T.visible_message("<span class='notice'>[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"</span>", "<span class='notice'>[src] bleeps electronically.</span>")
 		death(0)
 	else
 		src << "Aborting suicide attempt."
@@ -137,7 +143,9 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
-		viewers(src) << "<span class='userdanger'>[src] is thrashing wildly! It looks like \he's trying to commit suicide.</span>"
+		visible_message("<span class='danger'>[src] is thrashing wildly! It looks like \he's trying to commit suicide.</span>", \
+				"<span class='userdanger'>[src] is thrashing wildly! It looks like \he's trying to commit suicide.</span>", \
+				"<span class='notice'>You hear thrashing</span>")
 		//put em at -175
 		adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
@@ -152,6 +160,8 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
+		visible_message("<span class='danger'>[src] is growing dull and lifeless. It looks like it's lost the will to live.</span>", \
+						"<span class='userdanger'>[src] is growing dull and lifeless. It looks like it's lost the will to live.</span>")
 		setOxyLoss(100)
 		adjustBruteLoss(100 - getBruteLoss())
 		setToxLoss(100)

code/modules/mob/living/silicon/pai/life.dm

@@ -4,8 +4,7 @@
 	if(src.cable)
 		if(get_dist(src, src.cable) > 1)
 			var/turf/T = get_turf(src.loc)
-			for (var/mob/M in viewers(T))
-				M.show_message("<span class='danger'>[src.cable] rapidly retracts back into its spool.</span>", 3, "<span class='danger'>You hear a click and the sound of wire spooling rapidly.</span>", 2)
+			T.visible_message("<span class='warning'>[src.cable] rapidly retracts back into its spool.</span>", "<span class='danger'>You hear a click and the sound of wire spooling rapidly.</span>")
 			qdel(src.cable)
 			cable = null
 	if(silence_time)

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -58,17 +58,25 @@
 		//helmet and armor = 100% protection
 		if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
 			if( O.force )
-				usr << "<span class='danger'>[src] is wearing too much armor. You can't cause \him any damage.</span>"
-				for (var/mob/M in viewers(src, null))
-					M.show_message("\red \b [user] hits [src] with [O], however [src] is too armored.")
+				user << "<span class='warning'>[src] is wearing too much armor. You can't cause \him any damage.</span>"
+				visible_message("<span class='danger'> [user] hits [src] with [O], however [src] is too armored.</span>")
 			else
-				usr << "<span class='danger'>[src] is wearing too much armor. You can't reach \his skin.<span>"
-				for (var/mob/M in viewers(src, null))
-					M.show_message("<span class='danger'>[user] gently taps [src] with [O].</span>")
+				user << "<span class='warning'>[src] is wearing too much armor. You can't reach \his skin.<span>"
+				visible_message("<span class='notice'>[user] gently taps [src] with [O].</span>")
 			if(health>0 && prob(15))
 				emote("me", 1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
 			return
-	..()
+
+	if(istype(O, /obj/item/weapon/newspaper))
+		if(!stat)
+			user.visible_message("<span class='notice'>[user] baps [name] on the nose with the rolled up [O]</span>")
+			spawn(0)
+				for(var/i in list(1,2,4,8,4,2,1,2))
+					dir = i
+					sleep(1)
+	else
+		..()
+
 
 /mob/living/simple_animal/corgi/Topic(href, href_list)
 	if(usr.stat) return
@@ -426,18 +434,7 @@
 						return
 			step(AM, t)
 		now_pushing = null
-//PC stuff-Sieve
 
-/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
-	if(istype(O, /obj/item/weapon/newspaper))
-		if(!stat)
-			user.visible_message("<span class='notice'>[user] baps [name] on the nose with the rolled up [O]</span>")
-			spawn(0)
-				for(var/i in list(1,2,4,8,4,2,1,2))
-					dir = i
-					sleep(1)
-	else
-		..()
 
 /mob/living/simple_animal/corgi/regenerate_icons()
 	overlays = list()