Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/modules/assembly/assembly.dm

@@ -112,8 +112,8 @@
 	return TRUE
 
 /obj/item/assembly/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]</span>")
+	. = ..()
+	. += "<span class='notice'>\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]</span>"
 
 
 /obj/item/assembly/attack_self(mob/user)

code/modules/assembly/doorcontrol.dm

@@ -8,9 +8,9 @@
 	var/cooldown = FALSE //Door cooldowns
 
 /obj/item/assembly/control/examine(mob/user)
-	..()
+	. = ..()
 	if(id)
-		to_chat(user, "<span class='notice'>Its channel ID is '[id]'.</span>")
+		. += "<span class='notice'>Its channel ID is '[id]'.</span>"
 
 /obj/item/assembly/control/activate()
 	cooldown = TRUE

code/modules/assembly/health.dm

@@ -11,8 +11,8 @@
 	var/alarm_health = HEALTH_THRESHOLD_CRIT
 
 /obj/item/assembly/health/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.</span>")
+	. = ..()
+	. += "<span class='notice'>Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.</span>"
 
 /obj/item/assembly/health/activate()
 	if(!..())

code/modules/assembly/infrared.dm

@@ -38,8 +38,8 @@
 	. = ..()
 
 /obj/item/assembly/infra/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The infrared trigger is [on?"on":"off"].</span>")
+	. = ..()
+	. += "<span class='notice'>The infrared trigger is [on?"on":"off"].</span>"
 
 /obj/item/assembly/infra/activate()
 	if(!..())

code/modules/assembly/mousetrap.dm

@@ -9,8 +9,8 @@
 
 
 /obj/item/assembly/mousetrap/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The pressure plate is [armed?"primed":"safe"].</span>")
+	. = ..()
+	. += "<span class='notice'>The pressure plate is [armed?"primed":"safe"].</span>"
 
 /obj/item/assembly/mousetrap/activate()
 	if(..())

code/modules/assembly/proximity.dm

@@ -21,8 +21,8 @@
 	. = ..()
 
 /obj/item/assembly/prox_sensor/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The proximity sensor is [timing ? "arming" : (scanning ? "armed" : "disarmed")].</span>")
+	. = ..()
+	. += "<span class='notice'>The proximity sensor is [timing ? "arming" : (scanning ? "armed" : "disarmed")].</span>"
 
 /obj/item/assembly/prox_sensor/activate()
 	if(!..())

code/modules/assembly/signaler.dm

@@ -169,8 +169,8 @@ Code:
 	return TRUE
 
 /obj/item/assembly/signaler/receiver/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The radio receiver is [on?"on":"off"].</span>")
+	. = ..()
+	. += "<span class='notice'>The radio receiver is [on?"on":"off"].</span>"
 
 /obj/item/assembly/signaler/receiver/receive_signal(datum/signal/signal)
 	if(!on)

code/modules/assembly/timer.dm

@@ -31,8 +31,8 @@
 	. = ..()
 
 /obj/item/assembly/timer/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The timer is [timing ? "counting down from [time]":"set for [time] seconds"].</span>")
+	. = ..()
+	. += "<span class='notice'>The timer is [timing ? "counting down from [time]":"set for [time] seconds"].</span>"
 
 /obj/item/assembly/timer/activate()
 	if(!..())

code/modules/assembly/voice.dm

@@ -22,8 +22,8 @@
 								 "voice sensor")
 
 /obj/item/assembly/voice/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode.</span>")
+	. = ..()
+	. += "<span class='notice'>Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode.</span>"
 
 /obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
 	. = ..()