Merge upstream

This commit is contained in:
Cyberboss
2017-03-27 09:32:08 -04:00
110 changed files with 1368 additions and 705 deletions
+3 -1
View File
@@ -11,7 +11,9 @@
var/health_scan
var/alarm_health = 0
/obj/item/device/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>")
/obj/item/device/assembly/health/activate()
if(!..())
+4
View File
@@ -17,6 +17,10 @@
"recognizer",
"voice sensor")
/obj/item/device/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>")
/obj/item/device/assembly/voice/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans)
if(speaker == src)
return