Merge examine refactor for vorestation

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

@@ -167,8 +167,8 @@
 
 //////////////////
 /obj/item/weapon/rcd_ammo/examine(mob/user)
-	..()
-	to_chat(user, display_resources())
+	. = ..()
+	. += display_resources()
 
 // Used to show how much stuff (matter units, cell charge, etc) is left inside.
 /obj/item/weapon/rcd_ammo/proc/display_resources()

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

@@ -40,14 +40,9 @@
 	. = ..()
 
 /obj/item/weapon/extinguisher/examine(mob/user)
-<<<<<<< HEAD
-	if(..(user, 0))
-		to_chat(user, "[bicon(src)] [src.name] contains [src.reagents.total_volume] units of foam left!") //VOREStation Edit
-=======
 	. = ..()
 	if(get_dist(user, src) == 0)
-		. += "[src] has [src.reagents.total_volume] units of water left!"
->>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
+		. += "[src] has [src.reagents.total_volume] units of foam left!" //VOREStation Edit - Foam not water
 
 /obj/item/weapon/extinguisher/attack_self(mob/user as mob)
 	safety = !safety

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

@@ -197,14 +197,12 @@
 
 /obj/item/weapon/inducer/examine(mob/living/M)
 	. = ..()
-	var/dat = ""
 	if(cell)
-		dat += "<br><span class='notice'>Its display shows: [round(cell.charge)] / [cell.maxcharge].</span>"
+		. += "<span class='notice'>Its display shows: [round(cell.charge)] / [cell.maxcharge].</span>"
 	else
-		dat += "<br><span class='notice'>Its display is dark.</span>"
+		. += "<span class='notice'>Its display is dark.</span>"
 	if(opened)
-		dat += "<br><span class='notice'>Its battery compartment is open.</span>"
-	to_chat(M, dat)
+		. += "<span class='notice'>Its battery compartment is open.</span>"
 
 /obj/item/weapon/inducer/update_icon()
 	..()