Merge 8a5f08ff52 into d33ad44ab5

init.lua

@@ -32,10 +32,15 @@ local messages = {}
 messages.lava = {
 	" melted into a ball of fire.",
 	" thought lava was cool.",
-	" melted into a ball of fire.",
 	" couldn't resist that warm glow of lava.",
 	" dug straight down.",
-	" didn't know lava was hot."
+	" didn't know lava was hot.",
+	" dived into a pool of lava and hit their head.",
+	"'s goose was cooked.",
+	" is now being fed to the Devil!",
+	" didn't bring a potion of fire resistance...",
+	"! Only $3.99 at Kentucky Fried Miners!",
+	", lava was not meant to be swam in."
 }
 
 -- Drowning death messages
@@ -45,7 +50,16 @@ messages.water = {
 	" failed at swimming lessons.",
 	" tried to impersonate an anchor.",
 	" forgot he wasn't a fish.",
-	" blew one too many bubbles."
+	" blew one too many bubbles.",
+	" is sleeping with the fishes.",
+	" regrets skipping the swimming lessons.",
+	" tried to swim in cement shoes.",
+	" took \"our ancestors were fish\" the wrong way.",
+	" forgot to wear a life jacket.",
+	" went to Davy Jones's locker.",
+	" is now soggy.",
+	" didn't bring a potion of underwater breathing...",
+	" was never a sea creature."
 }
 
 -- Burning death messages
@@ -54,7 +68,18 @@ messages.fire = {
 	" got a little too warm.",
 	" got too close to the camp fire.",
 	" just got roasted, hotdog style.",
-	" gout burned up. More light that way."
+	" gout burned up. More light that way.",
+	" spontaneously combusted.",
+	"'s goose was cooked.",
+	" found out they were highly flammable.",
+	" may need some ice for that burn.",
+	" tried to make love to a campfire.",
+	" walked on hot coals.",
+	" was fired.",
+	"'s fire eating performance took a turn for the worse.",
+	" is now being fed to the Devil!",
+	" didn't bring a potion of fire resistance...",
+	"! Only $3.99 at Kentucky Fried Miners!"
 }
 
 -- Other death messages
@@ -63,7 +88,34 @@ messages.other = {
 	" did something fatal.",
 	" gave up on life.",
 	" is somewhat dead now.",
-	" passed out -permanently."
+	" passed out -permanently.",
+	" got to test the theory of the eternal soul.",
+	" wanted to see if reincarnation was true.",
+	" is now a candidate for the Darwin Awards.",
+	" removed themselves from the gene pool.",
+	" bit the dust.",
+	" came to a sticky end.",
+	" is now dead as a dodo.",
+	" kicked the bucket.",
+	" was too good for this world.",
+	" cashed in their chips.",
+	" got rekt m80s",
+	' had to say: "Goodbye, cruel world."',
+	" isn't gonna be around anymore...",
+	"'s body had been knocked out.",
+	", YOU DIED, YOU DIED, YOU DIED, YOU DIED, YOU DIED!!",
+	" will become featured as a fossil in a natural history museum.",
+	" did not survive.",
+	" is going to have their funeral.",
+	" wasn't prepared for double trouble.",
+	" never was worthy.",
+	" got too trippy, so they died.",
+	" had a bad time.",
+	" will be remembered...",
+	" let themselves down...",
+	" became deceased."
+	" went to pieces!",
+	" goooooooooooooooooooooooooooooooot dunked on!"
 }
 
 function get_message(mtype)
@@ -78,7 +130,7 @@ minetest.register_on_dieplayer(function(player)
 	local player_name = player:get_player_name()
 	local node = minetest.registered_nodes[minetest.get_node(player:getpos()).name]
 	if minetest.is_singleplayer() then
-		player_name = "You"
+		player_name = "The player"
 	end
 	-- Death by lava
 	if node.groups.lava ~= nil then