diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index bff50419ee2..8998d45c7ed 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 5ff64604205..114bfd24f15 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -408,7 +408,7 @@ datum S.start() sleep(10) S.start() - if(holder) + if(holder && holder.my_atom) holder.clear_reagents() return