cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Paradise/master' into nanoui-is-dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-29 09:46:30 +00:00
parent c12a3654fd 28cea0e1d0
commit ee13f13a2a
14 changed files with 242 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/instruments/songs/_song.dm
+5 -8
View File
@@ -261,14 +261,6 @@
if(++elapsed_delay >= delay_by)
// We were sustaining the final note but not anymore
if(current_chord > length(compiled_chords))
stop_playing()
return
var/list/chord = compiled_chords[current_chord]
play_chord(chord)
elapsed_delay = 0
delay_by = tempodiv_to_delay(chord[length(chord)])
current_chord++
if(current_chord > length(compiled_chords) + 1)
if(repeat)
repeat--
current_chord = 1
@@ -277,6 +269,11 @@
else
stop_playing()
return
var/list/chord = compiled_chords[current_chord]
play_chord(chord)
elapsed_delay = 0
delay_by = tempodiv_to_delay(chord[length(chord)])
current_chord++
/**
* Converts a tempodiv to ticks to elapse before playing the next chord, taking into account our tempo.