Merge remote-tracking branch 'upstream/master' into universal-damage

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

code/modules/modular_computers/hardware/_hardware.dm

@@ -78,11 +78,11 @@
 /obj/item/computer_hardware/examine(var/mob/user)
 	. = ..()
 	if(damage > damage_failure)
-		to_chat(user, "<span class='danger'>It seems to be severely damaged!</span>")
+		. += "<span class='danger'>It seems to be severely damaged!</span>"
 	else if(damage > damage_malfunction)
-		to_chat(user, "<span class='warning'>It seems to be damaged!</span>")
+		. += "<span class='warning'>It seems to be damaged!</span>"
 	else if(damage)
-		to_chat(user, "<span class='notice'>It seems to be slightly damaged.</span>")
+		. += "<span class='notice'>It seems to be slightly damaged.</span>"
 
 // Component-side compatibility check.
 /obj/item/computer_hardware/proc/can_install(obj/item/modular_computer/M, mob/living/user = null)

code/modules/modular_computers/hardware/ai_slot.dm

@@ -16,9 +16,9 @@
 
 
 /obj/item/computer_hardware/ai_slot/examine(mob/user)
-	..()
+	. = ..()
 	if(stored_card)
-		to_chat(user, "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it")
+		. += "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it"
 
 /obj/item/computer_hardware/ai_slot/on_install(obj/item/modular_computer/M, mob/living/user = null)
 	M.add_verb(device_type)

code/modules/modular_computers/hardware/card_slot.dm

@@ -107,6 +107,6 @@
 		return
 
 /obj/item/computer_hardware/card_slot/examine(mob/user)
-	..()
+	. = ..()
 	if(stored_card || stored_card2)
-		to_chat(user, "There appears to be something loaded in the card slots.")
+		. += "There appears to be something loaded in the card slots."

code/modules/modular_computers/hardware/hard_drive.dm

@@ -20,8 +20,8 @@
 	store_file(new/datum/computer_file/program/filemanager(src))		// File manager, allows text editor functions and basic file manipulation.
 
 /obj/item/computer_hardware/hard_drive/examine(user)
-	..()
-	to_chat(user, "<span class='notice'>It has [max_capacity] GQ of storage capacity.</span>")
+	. = ..()
+	. += "<span class='notice'>It has [max_capacity] GQ of storage capacity.</span>"
 
 /obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user)
 	..()

code/modules/modular_computers/hardware/printer.dm

@@ -14,8 +14,8 @@
 	to_chat(user, "Paper level: [stored_paper]/[max_paper]")
 
 /obj/item/computer_hardware/printer/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Paper level: [stored_paper]/[max_paper]</span>")
+	. = ..()
+	. += "<span class='notice'>Paper level: [stored_paper]/[max_paper]</span>"
 
 
 /obj/item/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "")