Merge remote-tracking branch 'upstream/master' into rcs-update

This commit is contained in:
Fox-McCloud
2015-09-23 01:19:28 -04:00
86 changed files with 1403 additions and 2019 deletions
+2 -1
View File
@@ -21,7 +21,8 @@
/datum/song/Destroy()
instrumentObj = null
return ..()
..()
return QDEL_HINT_QUEUE
// note is a number from 1-7 for A-G
// acc is either "b", "n", or "#"