cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2

Browse Source 
Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.
This commit is contained in:
carnie
2013-08-06 09:54:24 +01:00
parent 485e87728e d242f8aeaa
commit 3317aa9fe3
53 changed files with 944 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/musician.dm
+1 -1
View File
@@ -190,7 +190,7 @@
spawn()
lines = text2list(t, "\n")
if(copytext(lines[1],1,6) == "BPM: ")
tempo = 600 / text2num(copytext(lines[1],6))
tempo = 600 / max(1, text2num(copytext(lines[1],6)))
lines.Cut(1,2)
else
tempo = 5 // default 120 BPM