Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00
parent 41c9cf3a4a 67194ef0db
commit 0ffaf66d1f
186 changed files with 3316 additions and 1264 deletions
@@ -40,7 +40,7 @@
 			to_chat(C, msg)
 			if(C.prefs.toggles & SOUND_PRAYERS)
 				if(usr.job == "Chaplain")
-					C << 'sound/effects/pray.ogg'
+					SEND_SOUND(C, sound('sound/effects/pray.ogg'))
 	to_chat(usr, "Your prayers have been received by the gods.")

 	SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!