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

[MIRROR] Ports Goonchat

code/game/objects/items/weapons/AI_modules.dm

@@ -523,7 +523,7 @@ AI MODULES
 	laws[1] = generate_ion_law()
 	to_chat(user, "<span class='notice'>You press the button on [src].</span>")
 	playsound(user, 'sound/machines/click.ogg', 20, 1)
-	src.loc.visible_message("<span class='warning'>\icon[src] [laws[1]]</span>")
+	src.loc.visible_message("<span class='warning'>[bicon(src)] [laws[1]]</span>")
 
 /******************** Mother Drone  ******************/
 

code/game/objects/items/weapons/cards_ids.dm

@@ -92,15 +92,15 @@
 	if(mapload && access_txt)
 		access = text2access(access_txt)
 
-/obj/item/weapon/card/id/vv_edit_var(var_name, var_value)
-	. = ..()
-	if(.)
-		switch(var_name)
-			if("assignment","registered_name")
-				update_label()
-
+/obj/item/weapon/card/id/vv_edit_var(var_name, var_value)
+	. = ..()
+	if(.)
+		switch(var_name)
+			if("assignment","registered_name")
+				update_label()
+
 /obj/item/weapon/card/id/attack_self(mob/user)
-	user.visible_message("<span class='notice'>[user] shows you: \icon[src] [src.name].</span>", \
+	user.visible_message("<span class='notice'>[user] shows you: [bicon(src)] [src.name].</span>", \
 					"<span class='notice'>You show \the [src.name].</span>")
 	src.add_fingerprint(user)
 	return

code/game/objects/items/weapons/cards_ids.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm	(rejected hunks)
+@@ -86,7 +86,7 @@
+ 	var/dorm = 0		// determines if this ID has claimed a dorm already
+ 
+ /obj/item/weapon/card/id/attack_self(mob/user)
+-	user.visible_message("<span class='notice'>[user] shows you: \icon[src] [src.name].</span>", \
++	user.visible_message("<span class='notice'>[user] shows you: [bicon(src)] [src.name].</span>", \
+ 					"<span class='notice'>You show \the [src.name].</span>")
+ 	src.add_fingerprint(user)
+ 	return

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -36,9 +36,9 @@
 		to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
 		return
 	for(var/obj/item/I in loadedItems)
-		to_chat(user, "<span class='info'>\icon [I] It has \the [I] loaded.</span>")
+		to_chat(user, "<span class='info'>[bicon(I)] It has \the [I] loaded.</span>")
 	if(tank)
-		to_chat(user, "<span class='notice'>\icon [tank] It has \the [tank] mounted onto it.</span>")
+		to_chat(user, "<span class='notice'>[bicon(tank)] It has \the [tank] mounted onto it.</span>")
 
 
 /obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params)

code/game/objects/items/weapons/powerfist.dm

@@ -24,7 +24,7 @@
 		to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
 		return
 	if(tank)
-		to_chat(user, "<span class='notice'>\icon [tank] It has \the [tank] mounted onto it.</span>")
+		to_chat(user, "<span class='notice'>[bicon(tank)] It has \the [tank] mounted onto it.</span>")
 
 
 /obj/item/weapon/melee/powerfist/attackby(obj/item/weapon/W, mob/user, params)