Merge examine refactor for vorestation

code/game/objects/items/devices/advnifrepair.dm

@@ -56,8 +56,9 @@
 	return 1
 
 /obj/item/device/nifrepairer/examine(mob/user)
-	if(..(user, 1))
+	. = ..()
+	if(Adjacent(user))
 		if(supply.total_volume)
-			to_chat(user, "<span class='notice'>\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing.</span>")
+			. += "<span class='notice'>\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing.</span>"
 		else
-			to_chat(user, "<span class='notice'>\The [src] is empty and ready to accept nanopaste.</span>")
+			. += "<span class='notice'>\The [src] is empty and ready to accept nanopaste.</span>"

code/game/objects/items/devices/radio/radio.dm

@@ -581,16 +581,10 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/device/radio/examine(mob/user)
 	. = ..()
-<<<<<<< HEAD
-	if ((in_range(src, user) || loc == user))
-		if (b_stat)
-			user.show_message("<span class='notice'>\The [src] can be attached and modified!</span>")
-=======
 	
 	if((in_range(src, user) || loc == user))
 		if(b_stat)
 			. += "<span class='notice'>\The [src] can be attached and modified!</span>"
->>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
 		else
 			. += "<span class='notice'>\The [src] can not be modified or attached!</span>"
 

code/game/objects/items/uav.dm

@@ -58,6 +58,18 @@
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 
+/obj/item/device/uav/examine(mob/user)
+	. = ..()
+	if(Adjacent(user))
+		. += "It has <i>'[nickname]'</i> scribbled on the side."
+	if(!cell)
+		. += "<span class='warning'>It appears to be missing a power cell.</span>"
+	
+	if(health <= (initial(health)/4))
+		. += "<span class='warning'>It looks like it might break at any second!</span>"
+	else if(health <= (initial(health)/2))
+		. += "<span class='warning'>It looks pretty beaten up...</span>"
+
 /obj/item/device/uav/attack_hand(var/mob/user)
 	//Has to be on the ground to work with it properly
 	if(!isturf(loc))

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()
 	..()