Merge branch 'master' into gyro

source/funkin/Preferences.hx

@@ -56,11 +56,19 @@ class Preferences
 
   static function get_naughtyness():Bool
   {
+    #if NO_FEATURE_NAUGHTYNESS
+    return false;
+    #else
     return Save?.instance?.options?.naughtyness;
+    #end
   }
 
   static function set_naughtyness(value:Bool):Bool
   {
+    #if NO_FEATURE_NAUGHTYNESS
+    value = false;
+    #end
+
     var save:Save = Save.instance;
     save.options.naughtyness = value;
     save.flush();

source/funkin/ui/freeplay/FreeplayState.hx

@@ -2189,7 +2189,7 @@ class FreeplayState extends MusicBeatSubState
 
     // Set the album graphic and play the animation if relevant.
     var newAlbumId:Null<String> = daSong?.data.getAlbumId(currentDifficulty, currentVariation);
-    if (albumRoll.albumId != newAlbumId && !busy)
+    if (albumRoll.albumId != newAlbumId)
     {
       albumRoll.albumId = newAlbumId;
       albumRoll.skipIntro();

source/funkin/ui/options/PreferencesMenu.hx

@@ -108,9 +108,11 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
    */
   function createPrefItems():Void
   {
+    #if FEATURE_NAUGHTYNESS
     createPrefItemCheckbox('Naughtyness', 'If enabled, raunchy content (such as swearing, etc.) will be displayed.', function(value:Bool):Void {
       Preferences.naughtyness = value;
     }, Preferences.naughtyness);
+    #end
     createPrefItemCheckbox('Downscroll', 'If enabled, this will make the notes move downwards.', function(value:Bool):Void {
       Preferences.downscroll = value;
     }, Preferences.downscroll,

source/funkin/util/Constants.hx

@@ -559,6 +559,11 @@ class Constants
   public static final GHOST_TAP_DELAY:Float = 3 / 8;
   #end
 
+  /**
+   * Otherwise known as "The FuckCunt Variable"
+   */
+  public static final CENSOR_EXPLETIVES:Bool = #if CENSOR_EXPLETIVES true #else false #end;
+
   /**
    * The maximum number of previous file paths for the Chart Editor to remember.
    */