Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450

2017-05-22 16:56:18 -05:00
parent 26448d7016 c56ae0396a
commit aad357bd74
176 changed files with 60606 additions and 60286 deletions
@@ -52,10 +52,7 @@
 	if(!check_rights(R_SOUNDS))
 		return

-	if(SSticker)
-		SSticker.round_end_sound = fcopy_rsc(S)
-	else
-		return
+	SSticker.SetRoundEndSound(S)

 	log_admin("[key_name(src)] set the round end sound to [S]")
 	message_admins("[key_name_admin(src)] set the round end sound to [S]")