Index: scripts/globals/spells/stoneskin.lua
===================================================================
--- scripts/globals/spells/stoneskin.lua	(revision 3812)
+++ scripts/globals/spells/stoneskin.lua	(working copy)
@@ -11,14 +11,14 @@
 -- OnSpellCast
 -----------------------------------------
 
-function OnMagicCastingCheck(caster,target,spell)
-	return 0;
-end;
-
+function OnMagicCastingCheck(caster,target,spell)
+	return 0;
+end;
+
 function onSpellCast(caster,target,spell)
 	local pMod = (caster:getSkillLevel(ENHANCING_MAGIC_SKILL)/3)+caster:getStat(MOD_MND);
 	local pAbs = 0;
-	local pEquipMods = 0;
+	local pEquipMods = caster:getMod(MOD_STONESKIN_HP);
 	local duration = 300;
 	if (pMod < 80) then
 		pAbs = pMod;
@@ -30,19 +30,6 @@
 	if (pAbs > STONESKIN_CAP) then -- hard cap of 350 from natural power
 		pAbs = STONESKIN_CAP;
 	end
-	-- equipment mods
-	if (caster:getEquipID(SLOT_NECK) == 13177) then -- stone gorget
-		pEquipMods = pEquipMods + 30;
-	end
-	if (caster:getEquipID(SLOT_HANDS) == 15034) then -- stone mufflers
-		pEquipMods = pEquipMods + 30;
-	end
-	if (caster:getEquipID(SLOT_WAIST) == 15960) then -- siegel sash
-		pEquipMods = pEquipMods + 20;
-	end
-	if (caster:getEquipID(SLOT_LEGS) == 11949) then -- haven hose
-		pEquipMods = pEquipMods + 20;
-	end
 
 	if (caster:hasStatusEffect(EFFECT_COMPOSURE) == true and caster:getID() == target:getID()) then
 		duration = duration * 3;
Index: scripts/globals/status.lua
===================================================================
--- scripts/globals/status.lua	(revision 3812)
+++ scripts/globals/status.lua	(working copy)
@@ -849,6 +849,8 @@
 MOD_REFRESH_DOWN		 = 0x195			-- plague, reduce mp
 MOD_REGAIN_DOWN			 = 0x196			-- plague, reduce tp
 
+MOD_STONESKIN_HP		 = 0x1AA
+
 MOD_EAT_RAW_FISH			  = 409
 MOD_EAT_RAW_MEAT			  = 410
 -----------------------------------
Index: src/map/modifier.h
===================================================================
--- src/map/modifier.h	(revision 3812)
+++ src/map/modifier.h	(working copy)
@@ -435,13 +435,14 @@
 	MOD_SUBLIMATION_BONUS         =0x191,
 	MOD_WYVERN_BREATH             =0x192,
 	MOD_STEP_ACCURACY             =0x193,// Bonus accuracy for Dancer's steps
+	MOD_STONESKIN_HP			  =0x1AA,// Stoneskin
 
 	MOD_MAG_BURST_BONUS           =408,
 	MOD_EAT_RAW_FISH			  = 409,
 	MOD_EAT_RAW_MEAT			  = 410
 };
 
-#define MAX_MODIFIER	       411
+#define MAX_MODIFIER	       0x242