merge

2021-10-29 21:50:58 -07:00
parent 319c5e23fe
commit 186b552103
64 changed files with 208 additions and 205 deletions
@@ -60,9 +60,9 @@
 	calculate_samples()

 /datum/instrument/proc/ready()
-	if(CHECK_BITFIELD(instrument_flags, INSTRUMENT_LEGACY))
+	if((instrument_flags & INSTRUMENT_LEGACY))
 		return legacy_instrument_path && legacy_instrument_ext
-	else if(CHECK_BITFIELD(instrument_flags, INSTRUMENT_DO_NOT_AUTOSAMPLE))
+	else if((instrument_flags & INSTRUMENT_DO_NOT_AUTOSAMPLE))
 		return length(samples)
 	return (length(samples) >= 128)