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/assembly/assembly.dm

@@ -128,12 +128,12 @@
 	STOP_PROCESSING(SSobj, src)
 
 /obj/item/assembly/examine(mob/user)
-	..()
+	. = ..()
 	if(in_range(src, user) || loc == user)
 		if(secured)
-			to_chat(user, "[src] is ready!")
+			. += "[src] is ready!"
 		else
-			to_chat(user, "[src] can be attached!")
+			. += "[src] can be attached!"
 
 /obj/item/assembly/attack_self(mob/user)
 	if(!user)

code/modules/assembly/bomb.dm

@@ -13,8 +13,8 @@
 	origin_tech = "materials=1;engineering=1"
 
 /obj/item/onetankbomb/examine(mob/user)
-	..(user)
-	user.examinate(bombtank)
+	. = ..()
+	. += bombtank.examine(user)
 
 /obj/item/onetankbomb/update_icon()
 	if(bombtank)

code/modules/assembly/holder.dm

@@ -70,12 +70,12 @@
 
 
 /obj/item/assembly_holder/examine(mob/user)
-	..(user)
+	. = ..()
 	if(in_range(src, user) || loc == user)
 		if(secured)
-			to_chat(user, "[src] is ready!")
+			. += "[src] is ready!"
 		else
-			to_chat(user, "[src] can be attached!")
+			. += "[src] can be attached!"
 
 
 /obj/item/assembly_holder/HasProximity(atom/movable/AM)

code/modules/assembly/infrared.dm

@@ -29,8 +29,8 @@
 	return "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]."
 
 /obj/item/assembly/infra/examine(mob/user)
-	..()
-	to_chat(user, describe())
+	. = ..()
+	. += describe()
 
 /obj/item/assembly/infra/activate()
 	if(!..())

code/modules/assembly/mousetrap.dm

@@ -9,9 +9,9 @@
 	bomb_name = "contact mine"
 
 /obj/item/assembly/mousetrap/examine(mob/user)
-	..(user)
+	. = ..()
 	if(armed)
-		to_chat(user, "It looks like it's armed.")
+		. += "It looks like it's armed."
 
 /obj/item/assembly/mousetrap/activate()
 	if(..())