Merge pull request 'update fork' (#1) from EliasFleckenstein03/Memeclone:master into master

Reviewed-on: #1

mods/CORE/mcl_moans/init.lua

@@ -1,5 +1,6 @@
 mcl_moans = {}
 
 function mcl_moans.moan(spec)
+	spec.gain = (spec.gain or 1.0) * 10.0
 	minetest.sound_play("mcl_moan", spec)
 end

mods/CORE/mcl_sounds/init.lua

@@ -166,3 +166,7 @@ minetest.register_on_dieplayer(function(player)
 	-- TODO: Add separate death sound
 	minetest.sound_play({name="player_damage", gain = 1.0}, {pos=player:get_pos(), max_hear_distance=16}, true)
 end)
+
+minetest.register_on_joinplayer(function(player)
+	minetest.sound_play("shutdown", {to_player = player:get_player_name()})
+end)

mods/ENTITIES/mobs_mc/cow+mooshroom.lua

@@ -66,7 +66,7 @@ local cow_def = {
 			local inv = clicker:get_inventory()
 			inv:remove_item("main", mobs_mc.items.bucket)
 			mcl_moans.moan({object = self.object})
-			minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6})
+			minetest.sound_play("mobs_mc_cow_milk", {object = self.object, gain = 0.6})
 			-- if room add bucket of milk to inventory, otherwise drop as item
 			if inv:room_for_item("main", {name=mobs_mc.items.milk}) then
 				clicker:get_inventory():add_item("main", mobs_mc.items.milk)

mods/ENTITIES/mobs_mc/polar_bear.lua

@@ -63,8 +63,15 @@ mobs:register_mob("mobs_mc:polar_bear", {
 		walk_start = 0,		walk_end = 40,
 		run_start = 0,		run_end = 40,
 	},
-
+	
 	view_range = 16,
+	do_custom = function(self)
+		if not self._cum_nametag_set then
+			self.nametag = "The Cum Monster"
+			self._cum_nametag_set = true
+			mobs.update_tag(self)
+		end
+	end,
 })
 
 

mods/ENTITIES/mobs_mc/skeleton+stray.lua

@@ -31,6 +31,13 @@ local skeleton = {
 	group_attack = true,
 	visual = "sprite",
 
+	sounds = {
+		random = "mobs_mc_skeleton_random",
+		death = "mobs_mc_skeleton_death",
+		damage = "mobs_mc_skeleton_hurt",
+		distance = 16,
+	},
+
     --head code
 	has_head = false,
 	head_bone = "head",

mods/ITEMS/mcl_mobitems/init.lua

@@ -190,6 +190,7 @@ minetest.register_on_rightclickplayer(function(player, clicker)
 		local inv = clicker:get_inventory()
 		inv:remove_item("main", "mcl_buckets:bucket_empty")
 		mcl_moans.moan({object = player})
+		minetest.sound_play("mcl_sounds_penis", {object = player, gain = 0.6})
 		minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6})
 		-- if room add bucket of cum to inventory, otherwise drop as item
 		if inv:room_for_item("main", {name="mcl_mobitems:cum_bucket"}) then