Merge branch 'development' of https://github.com/NPXcoot/nssm into development

2016-10-18 22:37:34 +02:00 · 2016-10-18 22:37:34 +02:00 · 2a2490e155
commit 2a2490e155
parent 80debe0a2d b09d974758
14 changed files with 2 additions and 0 deletions
--- a/nssm_armor.lua
+++ b/nssm_armor.lua
@ -105,11 +105,13 @@ if minetest.get_modpath("3d_armor") then
 			crab = {name="Crab", armor=4, heal=0, use=500},
 			ice ={name="Ice Teeth", armor=3, heal=0, use=600},
 			mor ={name="Morlu", armor=5, use=100},
+			mast ={name="Masticone", armor=4, use=300},
 		}
 		local materials = {
 			crab="nssm:crab_carapace_fragment",
 			ice="nssm:little_ice_tooth",
 			mor="nssm:lustful_moranga",
+			mast="nssm:masticone_skull_fragments",
 		}
 			for k, v in pairs(stats) do
 				minetest.register_tool("nssm:shield_"..k, {
--- a/textures/inv_boots_sky.png
+++ b/textures/inv_boots_sky.png
--- a/textures/inv_chestplate_sky.png
+++ b/textures/inv_chestplate_sky.png
--- a/textures/inv_helmet_sky.png
+++ b/textures/inv_helmet_sky.png
--- a/textures/inv_leggings_sky.png
+++ b/textures/inv_leggings_sky.png
--- a/textures/inv_shield_masticone.png
+++ b/textures/inv_shield_masticone.png
--- a/textures/nssm_boots_sky.png
+++ b/textures/nssm_boots_sky.png
--- a/textures/nssm_boots_sky_preview.png
+++ b/textures/nssm_boots_sky_preview.png
--- a/textures/nssm_chestplate_sky.png
+++ b/textures/nssm_chestplate_sky.png
--- a/textures/nssm_chestplate_sky_preview.png
+++ b/textures/nssm_chestplate_sky_preview.png
--- a/textures/nssm_leggings_sky.png
+++ b/textures/nssm_leggings_sky.png
--- a/textures/nssm_leggings_sky_preview.png
+++ b/textures/nssm_leggings_sky_preview.png
--- a/textures/nssm_shield_masticone.png
+++ b/textures/nssm_shield_masticone.png
--- a/textures/nssm_shield_masticone_preview.png
+++ b/textures/nssm_shield_masticone_preview.png