diff --git a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
index 2118479..21b3cfb 100644
--- a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
+++ b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
@@ -701,7 +701,7 @@
 			  <showRemainingTime>true</showRemainingTime>
 			  <damageAmount>30</damageAmount>
 			  <armorPenetration>0.10</armorPenetration>
-			  <disappearsAfterTicks>300</disappearsAfterTicks>
+			  <disappearsAfterTicks>200</disappearsAfterTicks>
 			</li>
 			<li Class="HediffCompProperties_DisappearsOnDeath"/>
 		</comps>
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
index db53728..610de89 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
@@ -58,16 +58,16 @@
 				</capacities>
 				<power>21</power>
 				<cooldownTime>3</cooldownTime>
-                <extraMeleeDamages>
-                    <li>
-                        <def>DRM_Arc</def>
-                        <amount>7</amount>
-                    </li>
-                    <li>
-                        <def>EMP</def>
-                        <amount>15</amount>
-                    </li>
-                </extraMeleeDamages>
+				<extraMeleeDamages>
+					<li>
+						<def>DRM_Arc</def>
+						<amount>7</amount>
+					</li>
+					<li>
+						<def>EMP</def>
+						<amount>15</amount>
+					</li>
+				</extraMeleeDamages>
 				<chanceFactor>10</chanceFactor>
 			</li>
 		</tools>
@@ -816,17 +816,20 @@
 		<costStuffCount>80</costStuffCount>
 		<stuffCategories>
 			<li>Metallic</li>
-		</stuffCategories>	
+		</stuffCategories>
 		<costList>
 			<WoolDragonian>40</WoolDragonian>
 			<Steel>40</Steel>
 			<ComponentIndustrial>5</ComponentIndustrial>
-		</costList>	
+		</costList>
 		<recipeMaker>
 			<skillRequirements>
 				<Crafting>10</Crafting>
 			</skillRequirements>
 		</recipeMaker>
+		<weaponTags>
+			<li>DR_BattleMace</li>
+		</weaponTags>
 		<tools>
 			<li>
 				<label>handle</label>
@@ -846,15 +849,15 @@
 				</capacities>
 				<power>20</power>
 				<extraMeleeDamages>
-                    <li>
-                        <def>DRM_Bomb</def>
-                        <amount>20</amount>
-                    </li>
-                    <li>
-                        <def>Stun</def>
-                        <amount>6</amount>
-                    </li>
-                </extraMeleeDamages>
+					<li>
+						<def>DRM_Bomb</def>
+						<amount>20</amount>
+					</li>
+					<li>
+						<def>Stun</def>
+						<amount>6</amount>
+					</li>
+				</extraMeleeDamages>
 				<cooldownTime>4</cooldownTime>
 				<chanceFactor>10</chanceFactor>
 			</li>
diff --git a/1.5/Royal1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_WeaponBladelink.xml b/1.5/Royal1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_WeaponBladelink.xml
index 7586c62..a1a46de 100644
--- a/1.5/Royal1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_WeaponBladelink.xml	
+++ b/1.5/Royal1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_WeaponBladelink.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
-  <DR_BattleHammerBladelink.label>龙娘 Δ'战锤</DR_BattleHammerBladelink.label>
+  <DR_BattleHammerBladelink.label>龙娘 Δ'轰雷战锤</DR_BattleHammerBladelink.label>
   <DR_BattleHammerBladelink.description>一柄内置了EMP发生器的战锤。当击中时会释放电击瘫痪机械装置，还会向附近的敌人释放闪电链。与超凡智能的联系增强了这把武器，当击中时将增强使用者。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一旦与持有者绑定，这件武器的智能人格将拒绝其它人的使用。</DR_BattleHammerBladelink.description>
   <!-- EN: handle -->
   <DR_BattleHammerBladelink.tools.handle.label>锤柄</DR_BattleHammerBladelink.tools.handle.label>