Merge branch 'master' into random-space

Conflicts:
	_maps/asteroidstation.dm
This commit is contained in:
Jack Edge
2016-06-20 13:06:08 +01:00
485 changed files with 7854 additions and 196420 deletions
+3 -3
View File
@@ -551,10 +551,10 @@ var/list/admin_verbs_hideable = list(
var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null
if(!message)
return
var/templanguages = O.languages
O.languages |= ALL
var/templanguages = O.languages_spoken
O.languages_spoken |= ALL
O.say(message)
O.languages = templanguages
O.languages_spoken = templanguages
log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z] say \"[message]\"")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. say \"[message]\"</span>")
feedback_add_details("admin_verb","OS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!