Merge branch 'master' into upstream-merge-32161

This commit is contained in:
LetterJay
2017-11-11 23:02:13 -06:00
committed by GitHub
625 changed files with 27981 additions and 20284 deletions
@@ -315,13 +315,21 @@
category = list ("Misc. Machinery")
/datum/design/board/processor
name = "Machine Design (Processor Board)"
desc = "The circuit board for a processor."
name = "Machine Design (Food Processor Board)"
desc = "The circuit board for a food processor."
id = "processor"
req_tech = list("programming" = 1)
build_path = /obj/item/circuitboard/machine/processor
category = list ("Misc. Machinery")
/datum/design/board/slimeprocessor
name = "Machine Design (Slime Processor Board)"
desc = "The circuit board for a slime processor."
id = "slimeprocessor"
req_tech = list("programming" = 1, "plasmatech" = 1)
build_path = /obj/item/circuitboard/machine/processor/slime
category = list ("Misc. Machinery")
/datum/design/board/recycler
name = "Machine Design (Recycler Board)"
desc = "The circuit board for a recycler."
@@ -196,6 +196,7 @@
to_chat(SM, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")
to_chat(SM, "<span class='userdanger'>You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.</span>")
to_chat(user, "<span class='notice'>[SM] accepts [src] and suddenly becomes attentive and aware. It worked!</span>")
SM.copy_known_languages_from(user, TRUE)
qdel(src)
else
to_chat(user, "<span class='notice'>[SM] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>")