Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965

[MIRROR] Ports Goonchat

code/modules/uplink/uplink_item.dm

@@ -110,10 +110,10 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	var/obj/item/weapon/storage/box/B = A
 	if(istype(B) && B.contents.len > 0)
 		for(var/obj/item/I in B)
-			U.purchase_log += "<big>\icon[I]</big>"
+			U.purchase_log += "<big>[bicon(I)]</big>"
 	else
 		if(purchase_log_vis)
-			U.purchase_log += "<big>\icon[A]</big>"
+			U.purchase_log += "<big>[bicon(A)]</big>"
 
 	if(limited_stock > 0)
 		limited_stock -= 1
@@ -1379,7 +1379,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 			continue
 		crate_value -= I.cost
 		new I.item(C)
-		U.purchase_log += "<big>\icon[I.item]</big>"
+		U.purchase_log += "<big>[bicon(I.item)]</big>"
 
 	SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
 	return C

code/modules/uplink/uplink_item.dm.rej

@@ -1,10 +1 @@
-diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm	(rejected hunks)
-@@ -856,7 +856,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
- 
- /datum/uplink_item/suits/hardsuit/elite
- 	name = "Elite Syndicate Hardsuit"
--	desc = "An upgraded, elite version of the syndicate hardsuit. It features fire shielding, and also \
-+	desc = "An upgraded, elite version of the syndicate hardsuit. It features fireproofing, and also \
- 			provides the user with superior armor and mobility compared to the standard syndicate hardsuit."
- 	item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
- 	cost = 8
+poop