diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 3618b852..d11ca53d 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -50,4 +50,3 @@ DISABLE_INDEX          = YES
 GENERATE_TREEVIEW      = YES
 HTML_DYNAMIC_SECTIONS  = YES
 HTML_TIMESTAMP         = YES
-
diff --git a/doc/Font Licenses/1001fonts-retron2000-eula.txt b/doc/Font Licenses/1001fonts-retron2000-eula.txt
index b97e9b19..65bdd15d 100644
--- a/doc/Font Licenses/1001fonts-retron2000-eula.txt	
+++ b/doc/Font Licenses/1001fonts-retron2000-eula.txt	
@@ -22,7 +22,7 @@ Commercial use refers to usage in a business environment, including:
  - anything that will generate direct or indirect income
 
 3. Modification
-Retron2000 may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file. 
+Retron2000 may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file.
 
 4. Conversion
 Retron2000 may be converted to other formats such as WOFF, SVG or EOT webfonts, as long as the font is not modified in any other way, such as changing names or altering individual glyphs.
@@ -34,4 +34,4 @@ While Retron2000 may freely be copied and passed along to other individuals for
 Retron2000 may be embedded into an application such as a web- or mobile app, independant of the number of the application users, as long as the application does not distribute Retron2000, such as offering it as a download.
 
 7. Disclaimer
-Retron2000 is offered 'as is' without any warranty. 1001fonts.com and the respective author of Retron2000 shall not be liable for any damage derived from using this typeface. By using Retron2000 you agree to the terms of this license.
\ No newline at end of file
+Retron2000 is offered 'as is' without any warranty. 1001fonts.com and the respective author of Retron2000 shall not be liable for any damage derived from using this typeface. By using Retron2000 you agree to the terms of this license.
diff --git a/doc/MultiCraft.6 b/doc/MultiCraft.6
index 7175c6f3..59589ea7 100644
--- a/doc/MultiCraft.6
+++ b/doc/MultiCraft.6
@@ -111,4 +111,3 @@ Juhani Numminen <juhaninumminen0@gmail.com>.
 
 .SH WWW
 http://www.minetest.net/
-
diff --git a/doc/MultiCraftServer.6 b/doc/MultiCraftServer.6
index ff3b6bfa..2d84bbbc 100644
--- a/doc/MultiCraftServer.6
+++ b/doc/MultiCraftServer.6
@@ -1,2 +1 @@
 .so man6/MultiCraft.6
-
diff --git a/doc/Other License.md b/doc/Other License.md
index 6a9c302b..18eddc84 100644
--- a/doc/Other License.md	
+++ b/doc/Other License.md	
@@ -17,6 +17,8 @@ object_marker_red.png
 
 player_marker.png
 
+smoke_puff.png
+
 sunrisebg.png
 
 unknown_.png
diff --git a/doc/Readme.md b/doc/Readme.md
index cf4c9265..3c37f8e4 100644
--- a/doc/Readme.md
+++ b/doc/Readme.md
@@ -181,7 +181,7 @@ General options:
     VERSION_EXTRA          - Text to append to version (e.g. VERSION_EXTRA=foobar -> MultiCraft 0.4.9-foobar)
 
 Library specific options:
-    
+
     BZIP2_INCLUDE_DIR               - Linux only; directory where bzlib.h is located
     BZIP2_LIBRARY                   - Linux only; path to libbz2.a/libbz2.so
     CURL_DLL                        - Only if building with cURL on Windows; path to libcurl.dll
@@ -238,7 +238,7 @@ Library specific options:
 
 * This section is outdated. In addition to what is described here:
   * If you wish to have sound support, you need libogg, libvorbis and libopenal
-  
+
 * You need:
 	* CMake:
 		http://www.cmake.org/cmake/resources/software.html
@@ -317,7 +317,7 @@ Library specific options:
 	* It will warn about missing stuff, ignore that at this point. (later don't)
 	* Make sure the configuration is as follows
 	  (note that the versions may differ for you):
-	  
+
                 BUILD_CLIENT             [X]
                 BUILD_SERVER             [ ]
                 CMAKE_BUILD_TYPE         Release
@@ -332,7 +332,7 @@ Library specific options:
                 GETTEXT_INCLUDE_DIR      DIR/gettext/include
                 GETTEXT_LIBRARIES        DIR/gettext/lib/intl.lib
                 GETTEXT_MSGFMT           DIR/gettext/bin/msgfmt
-	
+
 	* If CMake complains it couldn't find SQLITE3, choose "Advanced" box on the
 	  right top corner, then specify the location of SQLITE3_INCLUDE_DIR and
 	  SQLITE3_LIBRARY manually.
@@ -368,7 +368,7 @@ This is how we build Windows releases.
     set sourcedir=%CD%
     set installpath="C:\tmp\MultiCraft_install"
     set irrlichtpath="C:\tmp\irrlicht-1.7.2"
-    
+
     set builddir=%sourcedir%\bvc10
     mkdir %builddir%
     pushd %builddir%
@@ -383,8 +383,8 @@ This is how we build Windows releases.
     popd
     echo Finished.
     exit /b 0
-    
+
     :fail
     popd
     echo Failed.
-    exit /b 1
\ No newline at end of file
+    exit /b 1
diff --git a/doc/fst_api.txt b/doc/fst_api.txt
index c8bcb1e9..63f832f3 100644
--- a/doc/fst_api.txt
+++ b/doc/fst_api.txt
@@ -113,13 +113,13 @@ methods:
   ^ hide dialog
 - delete()
   ^ delete dialog from ui
-  
+
 members:
 - data
   ^ variable data attached to this dialog
 - parent
   ^ parent component to return to on exit
-  
+
 File: fst/buttonbar.lua
 -----------------------
 
diff --git a/doc/main_page.dox b/doc/main_page.dox
index 7a65b47c..fec073fe 100644
--- a/doc/main_page.dox
+++ b/doc/main_page.dox
@@ -5,4 +5,3 @@ This page documents the internal structure of the MultiCraft engine's C++ code.\
 Use the tree view at the left to navigate.
 
 */
-
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index eb0d2ed6..e7c2fc16 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -234,7 +234,7 @@ Limitations of Async operations
  -Limited set of available functions
 	e.g. No access to functions modifying menu like core.start,core.close,
 	core.file_open_dialog
-			
+
 
 Class reference
 ----------------
diff --git a/doc/protocol.txt b/doc/protocol.txt
index 963b472f..56789baa 100644
--- a/doc/protocol.txt
+++ b/doc/protocol.txt
@@ -59,12 +59,12 @@ function check_if_minetestserver_up($host, $port)
 	{
 		# We got a reply! read the peer id from it.
 		$peer_id = substr($buf, 9, 2);
-		
+
 		# Disconnect
 		$buf = "\x4f\x45\x74\x03".$peer_id."\x00\x00\x03";
 		socket_sendto($socket, $buf, strlen($buf), 0, $host, $port);
 		socket_close($socket);
-		
+
 		return true;
 	}
 	return false;
diff --git a/doc/world_format.txt b/doc/world_format.txt
index 976d14fd..9ee15ec0 100644
--- a/doc/world_format.txt
+++ b/doc/world_format.txt
@@ -628,4 +628,3 @@ Locking Chest metadata:
   TBD
 
 // END
-
diff --git a/textures/base/smoke_puff.png b/textures/base/smoke_puff.png
new file mode 100644
index 00000000..6311c32f
Binary files /dev/null and b/textures/base/smoke_puff.png differ