存营养膏

2025-09-19 20:06:29 +08:00
parent 0b6ae6c398
commit 2a6343097d
4 changed files with 12 additions and 4 deletions
--- a/1.6/1.6/Defs/TraitDefs/ARA_Traits.xml
+++ b/1.6/1.6/Defs/TraitDefs/ARA_Traits.xml
@@ -5,11 +5,8 @@
    <commonality>0</commonality>
    <degreeDatas>
      <li>
-<<<<<<< HEAD
        <degree>1</degree>
-=======
        <label>节肢类昆虫</label>
->>>>>>> 377cc3d7ce40e7320d0936dbd14071a1e9cfe27c
        <description>{PAWN_nameDef} 是一只巨大的节肢类昆虫，多对附肢、镜面反光的外骨骼和扭动的分节身体足以引发人类心底埋藏的强烈恐惧感。\n\n额，你该不会真以为它们是一群美少女吧？</description>
        <marketValueFactorOffset>-1</marketValueFactorOffset>
      </li>