diff --git a/BedwarsAFKv2/liteconfig/common/macros/config.txt b/BedwarsAFKv2/liteconfig/common/macros/config.txt
index b905e4c..bacae6a 100644
--- a/BedwarsAFKv2/liteconfig/common/macros/config.txt
+++ b/BedwarsAFKv2/liteconfig/common/macros/config.txt
@@ -13,6 +13,10 @@
 //Set this to 1 if you have ++ and want to use it, 0 if your don't have ++
 @#nicking = 0;
 
+//Tipping feature - the bot will run /tipall every time it joins the lobby
+//Set this to 1 if you want to use it, 0 if you don't.
+@#tipping = 1;
+
 // ---------------- //
 // IGNORE, BOT CONFIG // 
 // ---------------- //
diff --git a/BedwarsAFKv2/liteconfig/common/macros/failsafe.txt b/BedwarsAFKv2/liteconfig/common/macros/failsafe.txt
index 8abe788..438149c 100644
--- a/BedwarsAFKv2/liteconfig/common/macros/failsafe.txt
+++ b/BedwarsAFKv2/liteconfig/common/macros/failsafe.txt
@@ -13,6 +13,13 @@ foreach(teams);
     next;
     if(&currentlocation == "Lobby");
     stop(bwstart)
+	
+	if(%@#tipping% == 1)
+	log("&f[&cBW&f] You have tipping enabled. Disable this in user config if you don't want it.")
+	echo("/tipall")
+	wait(40t)
+	endif;
+	
     if(%@#nicking% == 1)
     log("&f[&cBW&f] You have nicking enabled. Changing your nick. Disable this in user config if you don't want it.")
     echo("/nick random")