Converts visible_message notice spans to look more like emotes

code/modules/power/fusion/core/_core.dm

@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
 	if(Output.get_pairing())
 		reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume)
 		if(prob(5))
-			visible_message("<span class='notice'>\The [src] gurgles as it exports fluid.</span>")
+			visible_message("<b>\The [src]</b> gurgles as it exports fluid.")
 
 	if(owned_field)
 
@@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
 /obj/machinery/power/fusion_core/attack_hand(var/mob/user)
 	if(!Adjacent(user)) // As funny as it was for the AI to hug-kill the tokamak field from a distance...
 		return
-	visible_message("<span class='notice'>\The [user] hugs \the [src] to make it feel better!</span>")
+	visible_message("<b>\The [user]</b> hugs \the [src] to make it feel better!")
 	if(owned_field)
 		Shutdown()
 

code/modules/power/fusion/fuel_assembly/fuel_compressor.dm

@@ -27,14 +27,14 @@
 			to_chat(user, "<span class='warning'>You need at least three hundred units of material to form a fuel rod.</span>")
 			return 1
 		var/datum/reagent/R = thing.reagents.reagent_list[1]
-		visible_message("<span class='notice'>\The [src] compresses the contents of \the [thing] into a new fuel assembly.</span>")
+		visible_message("<b>\The [src]</b> compresses the contents of \the [thing] into a new fuel assembly.")
 		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), R.id, R.color)
 		thing.reagents.remove_reagent(R.id, R.volume)
 		user.put_in_hands(F)
 
 	else if(istype(thing, /obj/machinery/power/supermatter))
 		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), "supermatter")
-		visible_message("<span class='notice'>\The [src] compresses \the [thing] into a new fuel assembly.</span>")
+		visible_message("<b>\The [src]</b> compresses \the [thing] into a new fuel assembly.")
 		qdel(thing)
 		user.put_in_hands(F)
 		return 1
@@ -52,6 +52,7 @@
 	if(istype(thing, /obj/item/stack/material))
 		var/obj/item/stack/material/M = thing
 		var/datum/material/mat = M.get_material()
+<<<<<<< HEAD
 		if(!blitzprogress)
 			if(!mat.is_fusion_fuel)
 				to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
@@ -83,6 +84,29 @@
 			else
 				to_chat(user, "<span class='warning'>A blitz rod is currently in progress! Either add 25 phoron sheets to complete it, or eject the supermatter sheet!</span>")
 				return
+||||||| parent of e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
+		if(!mat.is_fusion_fuel)
+			to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
+			return
+		if(M.get_amount() < FUSION_ROD_SHEET_AMT)
+			to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
+			return
+		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
+		visible_message("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
+		M.use(FUSION_ROD_SHEET_AMT)
+		user.put_in_hands(F)
+=======
+		if(!mat.is_fusion_fuel)
+			to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
+			return
+		if(M.get_amount() < FUSION_ROD_SHEET_AMT)
+			to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
+			return
+		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
+		visible_message("<b>\The [src]</b> compresses the [mat.use_name] into a new fuel assembly.")
+		M.use(FUSION_ROD_SHEET_AMT)
+		user.put_in_hands(F)
+>>>>>>> e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
 
 	else if(do_special_fuel_compression(thing, user))
 		return

code/modules/power/fusion/fuel_assembly/fuel_injector.dm

@@ -61,9 +61,9 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
 		//CHOMPEdit End
 		if(cur_assembly)
 			cur_assembly.forceMove(get_turf(src))
-			visible_message("<span class='notice'>\The [user] swaps \the [src]'s [cur_assembly] for \a [W].</span>")
+			visible_message("<b>\The [user]</b> swaps \the [src]'s [cur_assembly] for \a [W].")
 		else
-			visible_message("<span class='notice'>\The [user] inserts \a [W] into \the [src].</span>")
+			visible_message("<b>\The [user]</b> inserts \a [W] into \the [src].")
 
 		user.drop_from_inventory(W)
 		W.forceMove(src)
@@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
 	if(cur_assembly)
 		cur_assembly.forceMove(get_turf(src))
 		user.put_in_hands(cur_assembly)
-		visible_message("<span class='notice'>\The [user] removes \the [cur_assembly] from \the [src].</span>")
+		visible_message("<b>\The [user]</b> removes \the [cur_assembly] from \the [src].")
 		cur_assembly = null
 		return
 	else