Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

This commit is contained in:
Zuhayr
2014-12-23 00:01:09 +10:30
3 changed files with 3 additions and 1 deletions
+1
View File
@@ -525,6 +525,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
M.add_ion_law(input)
for(var/mob/living/silicon/ai/O in mob_list)
O << "\red " + input + "\red...LAWS UPDATED"
O.show_laws()
log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
+1
View File
@@ -76,6 +76,7 @@
target << "\red <b>You have detected a change in your laws information:</b>"
target << law
target.add_ion_law(law)
target.show_laws()
if(message_servers)
for (var/obj/machinery/message_server/MS in message_servers)
+1 -1
View File
@@ -20,7 +20,7 @@
src.laws.add_ion_law(law)
for(var/mob/living/silicon/robot/R in mob_list)
if(R.lawupdate && (R.connected_ai == src))
R << "\red " + law + "\red...LAWS UPDATED"
R.show_laws()
/mob/living/silicon/ai/proc/ai_checklaws()
set category = "AI Commands"