From a1489a1f7b795f73d8319eadb16fa557862f8b36 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sat, 21 Aug 2021 01:43:31 +0900
Subject: [PATCH 1/9] =?UTF-8?q?=EB=B0=B8=EB=9F=B0=EC=8A=A4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/StatOverrideDefs/StatOverrideDef.xml | 4 ++--
 1.3/Defs/ThingDef/ThingDef_Item.xml           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/1.3/Defs/StatOverrideDefs/StatOverrideDef.xml b/1.3/Defs/StatOverrideDefs/StatOverrideDef.xml
index 7d6d102..e0750cc 100644
--- a/1.3/Defs/StatOverrideDefs/StatOverrideDef.xml
+++ b/1.3/Defs/StatOverrideDefs/StatOverrideDef.xml
@@ -23,7 +23,7 @@
     <statDef>ArmorRating_Sharp</statDef>
     <worker Class="AutomataRace.StatOverrideWorker_ArmorRating_Automaton">
       <addition>0</addition>
-      <multiplier>0.5</multiplier>
+      <multiplier>0.73</multiplier>
     </worker>
   </CustomizableRecipe.StatOverrideDef>
 
@@ -33,7 +33,7 @@
     <statDef>ArmorRating_Blunt</statDef>
     <worker Class="AutomataRace.StatOverrideWorker_ArmorRating_Automaton">
       <addition>0</addition>
-      <multiplier>0.5</multiplier>
+      <multiplier>0.73</multiplier>
     </worker>
   </CustomizableRecipe.StatOverrideDef>
 
diff --git a/1.3/Defs/ThingDef/ThingDef_Item.xml b/1.3/Defs/ThingDef/ThingDef_Item.xml
index 5a0bbd6..7eb0758 100644
--- a/1.3/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Item.xml
@@ -295,7 +295,7 @@
         <thingDefs>
           <li>Paniel_Race</li>
         </thingDefs>
-        <blockUnnecessaryUse>true</blockUnnecessaryUse>
+        <blockUnnecessaryUse>false</blockUnnecessaryUse>
       </li>
       <li Class="CompProperties_UseEffect">
         <compClass>CompUseEffect_DestroySelf</compClass>

From 0e7ccfe2451489ba7d2eee9009b26ba474882a73 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sat, 21 Aug 2021 15:29:13 +0900
Subject: [PATCH 2/9] =?UTF-8?q?=EB=B0=B8=EB=9F=B0=EC=8A=A4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/BackStoryDefs/BackStoryDefs.xml    | 98 ++++++++++-----------
 1.3/Defs/Drugs/Drugs_Fuel.xml               |  2 +-
 1.3/Defs/HediffDefs/Hediffs_Maintenance.xml | 16 ++--
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/1.3/Defs/BackStoryDefs/BackStoryDefs.xml b/1.3/Defs/BackStoryDefs/BackStoryDefs.xml
index a71c89f..2cd2cef 100644
--- a/1.3/Defs/BackStoryDefs/BackStoryDefs.xml
+++ b/1.3/Defs/BackStoryDefs/BackStoryDefs.xml
@@ -371,11 +371,11 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Construction</defName>
@@ -408,11 +408,11 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Construction</defName>
@@ -444,11 +444,11 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Construction</defName>
@@ -480,11 +480,11 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Construction</defName>
@@ -516,11 +516,11 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Construction</defName>
@@ -575,15 +575,15 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
@@ -608,15 +608,15 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
@@ -640,15 +640,15 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
@@ -672,15 +672,15 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
@@ -704,15 +704,15 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
@@ -760,15 +760,15 @@
     <skillGains>
       <li>
         <defName>Cooking</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>3</amount>
+        <amount>6</amount>
       </li>
       <li>
         <defName>Social</defName>
@@ -793,15 +793,15 @@
     <skillGains>
       <li>
         <defName>Cooking</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>6</amount>
+        <amount>9</amount>
       </li>
       <li>
         <defName>Social</defName>
@@ -825,15 +825,15 @@
     <skillGains>
       <li>
         <defName>Cooking</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>9</amount>
+        <amount>12</amount>
       </li>
       <li>
         <defName>Social</defName>
@@ -857,15 +857,15 @@
     <skillGains>
       <li>
         <defName>Cooking</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>12</amount>
+        <amount>15</amount>
       </li>
       <li>
         <defName>Social</defName>
@@ -889,15 +889,15 @@
     <skillGains>
       <li>
         <defName>Cooking</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Social</defName>
@@ -922,11 +922,11 @@
     <skillGains>
       <li>
         <defName>Construction</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Mining</defName>
-        <amount>15</amount>
+        <amount>18</amount>
       </li>
       <li>
         <defName>Crafting</defName>
@@ -956,31 +956,31 @@
     <skillGains>
       <li>
         <defName>Shooting</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Melee</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Construction</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Plants</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Crafting</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Medicine</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
       <li>
         <defName>Intellectual</defName>
-        <amount>2</amount>
+        <amount>4</amount>
       </li>
     </skillGains>
     <workDisables>
diff --git a/1.3/Defs/Drugs/Drugs_Fuel.xml b/1.3/Defs/Drugs/Drugs_Fuel.xml
index a4dbbd1..205e248 100644
--- a/1.3/Defs/Drugs/Drugs_Fuel.xml
+++ b/1.3/Defs/Drugs/Drugs_Fuel.xml
@@ -156,7 +156,7 @@
       <li>
         <label>required</label>
         <lifeThreatening>true</lifeThreatening>
-        <deathMtbDays>10</deathMtbDays>
+        <deathMtbDays>15</deathMtbDays>
         <capMods>
           <li>
             <capacity>Consciousness</capacity>
diff --git a/1.3/Defs/HediffDefs/Hediffs_Maintenance.xml b/1.3/Defs/HediffDefs/Hediffs_Maintenance.xml
index f93b8d7..774404b 100644
--- a/1.3/Defs/HediffDefs/Hediffs_Maintenance.xml
+++ b/1.3/Defs/HediffDefs/Hediffs_Maintenance.xml
@@ -53,7 +53,7 @@
           </li>
         </capMods>
         <statOffsets>
-          <PsychicSensitivity>0.60</PsychicSensitivity>
+          <PsychicSensitivity>0.40</PsychicSensitivity>
           <MentalBreakThreshold>0.04</MentalBreakThreshold>
           <WorkSpeedGlobal>-0.05</WorkSpeedGlobal>
           <MoveSpeed>-0.2</MoveSpeed>
@@ -64,16 +64,16 @@
         <minSeverity>0.75</minSeverity>
         <restFallFactor>1.0</restFallFactor>
         <capMods>
-          <li>
+          <!--<li>
             <capacity>Consciousness</capacity>
             <offset>0</offset>
-          </li>
+          </li>-->
         </capMods>
         <statOffsets>
-          <PsychicSensitivity>0.20</PsychicSensitivity>
+          <!--<PsychicSensitivity>0.20</PsychicSensitivity>
           <MentalBreakThreshold>0</MentalBreakThreshold>
           <WorkSpeedGlobal>0.0</WorkSpeedGlobal>
-          <MoveSpeed>0.0</MoveSpeed>
+          <MoveSpeed>0.0</MoveSpeed>-->
         </statOffsets>
       </li>
       <li>
@@ -83,13 +83,13 @@
         <capMods>
           <li>
             <capacity>Consciousness</capacity>
-            <offset>0.0</offset>
+            <offset>0.05</offset>
           </li>
         </capMods>
         <statOffsets>
-          <PsychicSensitivity>0.0</PsychicSensitivity>
+          <PsychicSensitivity>-0.20</PsychicSensitivity>
           <MentalBreakThreshold>-0.04</MentalBreakThreshold>
-          <WorkSpeedGlobal>0.05</WorkSpeedGlobal>
+          <WorkSpeedGlobal>0.1</WorkSpeedGlobal>
           <MoveSpeed>0.2</MoveSpeed>
         </statOffsets>
       </li>

From a936be3f238146e334457be759d32f5adb034fec Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sat, 21 Aug 2021 15:29:20 +0900
Subject: [PATCH 3/9] =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_Apparel.xml | 71 +++++++++++++-------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
index d0df149..4fa9636 100644
--- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
@@ -29,23 +29,6 @@
     </thingCategories>
   </ThingDef>
 
-  <ThingDef Name="PN_ApparelRoyaltyBase" ParentName="ApparelBase" Abstract="True">
-    <apparel>
-      <tags Inherit="false">
-        <li>PN_Apparel</li>
-      </tags>
-    </apparel>
-    <thingCategories Inherit="False">
-      <li>PNApparel</li>
-    </thingCategories>
-  </ThingDef>
-
-  <ThingDef Abstract="True" Name="PN_HatRoyaltyBase" ParentName="PN_ApparelRoyaltyBase">
-    <thingCategories Inherit="False">
-      <li>PNHeadgear</li>
-    </thingCategories>
-  </ThingDef>
-
   <!--==================================== 기본옷 ====================================-->
   <ThingDef ParentName="PN_ApparelBase">
     <defName>PN_ApparelBasic</defName>
@@ -62,9 +45,6 @@
       <li>Fabric</li>
       <li>Leathery</li>
     </stuffCategories>
-    <thingCategories>
-      <li>Apparel</li>
-    </thingCategories>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
       <WorkToMake>2800</WorkToMake>
@@ -193,8 +173,8 @@
       <li>Fabric</li>
       <li>Leathery</li>
     </stuffCategories>
-    <thingCategories>
-      <li>Apparel</li>
+    <thingCategories Inherit="False">
+      <li>PNApparel</li>
     </thingCategories>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
@@ -268,9 +248,6 @@
       </skillRequirements>
       <researchPrerequisite>PNRP_TierB_Apparel</researchPrerequisite>
     </recipeMaker>
-    <thingCategories>
-      <li>Apparel</li>
-    </thingCategories>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
       <WorkToMake>14000</WorkToMake>
@@ -433,9 +410,6 @@
       </skillRequirements>
       <researchPrerequisite>PNRP_TierB_Apparel</researchPrerequisite>
     </recipeMaker>
-    <thingCategories>
-      <li>Apparel</li>
-    </thingCategories>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
       <WorkToMake>14000</WorkToMake>
@@ -593,9 +567,6 @@
       </skillRequirements>
       <researchPrerequisite>PNRP_TierB_Apparel</researchPrerequisite>
     </recipeMaker>
-    <thingCategories>
-      <li>Apparel</li>
-    </thingCategories>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
       <WorkToMake>14000</WorkToMake>
@@ -724,8 +695,39 @@
     </colorGenerator>
   </ThingDef>
 
+  <!--==================================== 로열 그레이드 ====================================-->
+
+  <ThingCategoryDef>
+    <defName>PNRoyalApparel</defName>
+    <label>Royal Apparel</label>
+    <parent>PNApparel</parent>
+  </ThingCategoryDef>
+
+  <ThingCategoryDef>
+    <defName>PNRoyalHeadgear</defName>
+    <label>Royal Headgear</label>
+    <parent>PNHeadgear</parent>
+  </ThingCategoryDef>
+
+  <ThingDef Abstract="True" Name="PN_RoyalApparelBase" ParentName="ApparelMakeableBase">
+    <apparel>
+      <tags Inherit="false">
+        <li>PN_RoyalApparel</li>
+      </tags>
+    </apparel>
+    <thingCategories Inherit="False">
+      <li>PNRoyalApparel</li>
+    </thingCategories>
+  </ThingDef>
+
+  <ThingDef Abstract="True" Name="PN_RoyalHatBase" ParentName="PN_ApparelBase">
+    <thingCategories Inherit="False">
+      <li>PNRoyalHeadgear</li>
+    </thingCategories>
+  </ThingDef>
+
   <!--==================================== 티어C 근위대 ====================================-->
-  <ThingDef ParentName="PN_ApparelBase">
+  <ThingDef ParentName="PN_RoyalApparelBase">
     <defName>PN_ApparelRoyalguard</defName>
     <label>Paniel royal guard uniform</label>
     <description>...</description>
@@ -749,9 +751,6 @@
       </skillRequirements>
       <researchPrerequisite>PNRP_TierC_Apparel</researchPrerequisite>
     </recipeMaker>
-    <thingCategories>
-      <li>Apparel</li>
-    </thingCategories>
     <statBases>
       <WorkToMake>75000</WorkToMake>
       <MaxHitPoints>400</MaxHitPoints>
@@ -808,7 +807,7 @@
     </colorGenerator>
   </ThingDef>
 
-  <ThingDef ParentName="PN_HatBase">
+  <ThingDef ParentName="PN_RoyalHatBase">
     <defName>PN_ApparelRoyalguardHat</defName>
     <label>Paniel royal guard hat</label>
     <description>...</description>

From da238624994b81155ff655585f4dca9c9edb3dc6 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sat, 21 Aug 2021 18:57:39 +0900
Subject: [PATCH 4/9] =?UTF-8?q?=EA=B6=A4=EB=8F=84=20=EC=83=81=EC=84=A0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/Drugs/Drugs_Antibiotics.xml          |   1 -
 1.3/Defs/Drugs/Drugs_Fuel.xml                 |   3 +-
 .../TraderKindDefs/TraderKinds_OrbitalPnL     | 156 ------------------
 .../TraderKindDefs/TraderKinds_OrbitalPnL.xml |  81 +++++++++
 4 files changed, 82 insertions(+), 159 deletions(-)
 delete mode 100644 1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL
 create mode 100644 1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml

diff --git a/1.3/Defs/Drugs/Drugs_Antibiotics.xml b/1.3/Defs/Drugs/Drugs_Antibiotics.xml
index cd50738..df449b8 100644
--- a/1.3/Defs/Drugs/Drugs_Antibiotics.xml
+++ b/1.3/Defs/Drugs/Drugs_Antibiotics.xml
@@ -5,7 +5,6 @@
     <defName>PN_antibiotics</defName>
     <label>PnL antibiotics</label>
     <description>Warning: Do not use on humans.\nThis antibiotics is for automaton only.\n\nAntibiotics for new diseases unknown to Rimworld.</description>
-    <tradeability>None</tradeability>
     <graphicData>
       <texPath>Things/Item/PNAntibiotics</texPath>
       <graphicClass>Graphic_StackCount</graphicClass>
diff --git a/1.3/Defs/Drugs/Drugs_Fuel.xml b/1.3/Defs/Drugs/Drugs_Fuel.xml
index 205e248..e26da82 100644
--- a/1.3/Defs/Drugs/Drugs_Fuel.xml
+++ b/1.3/Defs/Drugs/Drugs_Fuel.xml
@@ -12,7 +12,6 @@
     <label>PnL fuel</label>
     <description>Warning: Do not use on humans.\nThis drug is for automaton only.\n\nFuel needed to move the automaton. Psychite is added for the mental stability of Automaton.</description>
     <tickerType>Normal</tickerType>
-    <tradeability>None</tradeability>
     <graphicData>
       <texPath>Things/Item/PNFuel</texPath>
       <graphicClass>Graphic_StackCount</graphicClass>
@@ -42,7 +41,7 @@
       <ingestReportString>Drinking {0}.</ingestReportString>
       <useEatingSpeedStat>false</useEatingSpeedStat>
       <chairSearchRadius>25</chairSearchRadius>
-      <drugCategory>Medical</drugCategory>
+      <drugCategory>Hard</drugCategory>
       <outcomeDoers>
         <li Class="IngestionOutcomeDoer_GiveHediff">
           <hediffDef>PN_ateFuel</hediffDef>
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL
deleted file mode 100644
index 5b9c4ef..0000000
--- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <TraderKindDef>
-    <defName>PNOrbital_PnLindustry</defName>
-    <label>PnL Industry trader</label>
-    <orbital>true</orbital>
-    <stockGenerators>
-
-      <!-- Resources -->
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Silver</thingDef>
-        <countRange>2000~4000</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>ComponentIndustrial</thingDef>
-        <countRange>15~30</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>ComponentSpacer</thingDef>
-        <countRange>1~2</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Steel</thingDef>
-        <countRange>500~800</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>WoodLog</thingDef>
-        <countRange>500~800</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Plasteel</thingDef>
-        <countRange>100~400</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Cloth</thingDef>
-        <countRange>200~600</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>MedicineIndustrial</thingDef>
-        <countRange>20~30</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Gold</thingDef>
-        <countRange>50~200</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Neutroamine</thingDef>
-        <countRange>100~200</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Chemfuel</thingDef>
-        <countRange>200~600</countRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Chocolate</thingDef>
-        <totalPriceRange>-70~100</totalPriceRange>
-      </li>
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Beer</thingDef>
-        <totalPriceRange>-70~200</totalPriceRange>
-      </li>
-      <li Class="StockGenerator_Category">
-        <categoryDef>Textiles</categoryDef>
-        <thingDefCountRange>1~2</thingDefCountRange>
-        <totalPriceRange>2200~4000</totalPriceRange>
-      </li>
-      <li Class="StockGenerator_Category">
-        <categoryDef>ResourcesRaw</categoryDef>
-        <excludedThingDefs>
-          <li>Silver</li>
-        </excludedThingDefs>
-        <thingDefCountRange>2~4</thingDefCountRange>
-        <totalPriceRange>800~1500</totalPriceRange>
-      </li>
-      <li Class="StockGenerator_Category">
-        <categoryDef>FoodRaw</categoryDef>
-        <excludedCategories>
-          <li>EggsFertilized</li>
-        </excludedCategories>
-        <thingDefCountRange>2~4</thingDefCountRange>
-        <totalPriceRange>800~1500</totalPriceRange>
-      </li>
-      <li Class="StockGenerator_Category">
-        <categoryDef>FoodMeals</categoryDef>
-        <thingDefCountRange>1~2</thingDefCountRange>
-        <countRange>15~30</countRange>
-      </li>
-      <li Class="StockGenerator_MultiDef">
-        <thingDefs>
-          <li>Kibble</li>
-          <li>Chocolate</li>
-          <li>Pemmican</li>
-        </thingDefs>
-      </li>
-
-      <!-- Drugs -->
-      <li Class="StockGenerator_Category">
-        <categoryDef>Drugs</categoryDef>
-        <thingDefCountRange>2~4</thingDefCountRange>
-        <totalPriceRange>1000~2000</totalPriceRange>
-      </li>
-
-      <!-- Techprints -->
-      <!-- none -->
-
-      <!-- Weapons -->
-      <!-- none -->
-
-      <!-- Apparel -->
-      <li Class="StockGenerator_Clothes">
-        <countRange>10~20</countRange>
-      </li>
-
-      <!-- Implants -->
-      <!-- none -->
-
-      <!-- Buildings -->
-      <li Class="StockGenerator_Category">
-        <categoryDef>BuildingsFurniture</categoryDef>
-        <thingDefCountRange>0~3</thingDefCountRange>
-        <countRange>1~2</countRange>
-      </li>
-
-      <!-- Exotic -->
-      <!-- none -->
-
-      <!-- Slaves -->
-      <!-- none -->
-
-      <!-- Animals -->
-      <li Class="StockGenerator_Animals">
-        <maxWildness>0.70</maxWildness>
-        <checkTemperature>false</checkTemperature>
-        <tradeTagsSell>
-          <li>AnimalFarm</li>
-          <li>AnimalPet</li>
-        </tradeTagsSell>
-        <tradeTagsBuy>
-          <li>AnimalExotic</li>
-        </tradeTagsBuy>
-        <kindCountRange>2~4</kindCountRange>
-        <countRange>10~20</countRange>
-      </li>
-
-      <!-- Buying -->
-      <li Class="StockGenerator_BuyExpensiveSimple" />
-      <li Class="StockGenerator_BuyTradeTag">
-        <tag>Art</tag>
-      </li>
-      <li Class="StockGenerator_BuyTradeTag">
-        <tag>MusicalInstrument</tag>
-      </li>
-
-    </stockGenerators>
-  </TraderKindDef>
-</Defs>
\ No newline at end of file
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
new file mode 100644
index 0000000..9f07402
--- /dev/null
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <TraderKindDef>
+    <defName>PNOrbital_PnLindustry</defName>
+    <label>PnL Industry</label>
+    <orbital>true</orbital>
+    <stockGenerators>
+
+      <!-- Resources -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Silver</thingDef>
+        <countRange>2000~4000</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentIndustrial</thingDef>
+        <countRange>15~30</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentSpacer</thingDef>
+        <countRange>8~16</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Steel</thingDef>
+        <countRange>500~800</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Plasteel</thingDef>
+        <countRange>100~400</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Gold</thingDef>
+        <countRange>50~200</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Chemfuel</thingDef>
+        <countRange>200~600</countRange>
+      </li>
+
+      <!-- Drugs -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_AutomatonFuel</thingDef>
+        <countRange>200~600</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_antibiotics</thingDef>
+        <countRange>2~6</countRange>
+      </li>
+      <!--<li Class="StockGenerator_Category">
+        <categoryDef>Drugs</categoryDef>
+        <thingDefCountRange>2~4</thingDefCountRange>
+        <totalPriceRange>1000~2000</totalPriceRange>
+      </li>-->
+
+      <!-- Techprints -->
+      <!-- none -->
+
+      <!-- Weapons -->
+      <!-- none -->
+
+      <!-- Apparel -->
+
+      <!-- Implants -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_ResurrectModule</thingDef>
+        <countRange>-6~1</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_ExperimentalModule</thingDef>
+        <countRange>-12~1</countRange>
+      </li>
+
+      <!-- Buildings -->
+
+      <!-- Animals -->
+
+      <!-- Buying -->
+      <li Class="StockGenerator_BuyExpensiveSimple" />
+
+    </stockGenerators>
+  </TraderKindDef>
+</Defs>
\ No newline at end of file

From 08282407ee490c4f3b8857aa8c509a32c5ee790d Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 22 Aug 2021 00:48:42 +0900
Subject: [PATCH 5/9] =?UTF-8?q?=EB=B2=A8=ED=8A=B8=20=EC=9C=A0=ED=8B=B8?=
 =?UTF-8?q?=EB=A6=AC=ED=8B=B0=20=EC=9E=A5=EB=B9=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_PanielRace.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/1.3/Defs/ThingDef/ThingDef_PanielRace.xml b/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
index 1d5fcfd..9172ff2 100644
--- a/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
+++ b/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
@@ -600,6 +600,17 @@
           <li>PN_ApparelSoldierHat</li>
           <li>PN_ApparelRoyalguard</li>
           <li>PN_ApparelRoyalguardHat</li>
+          <!--바닐라-->
+          <li>Apparel_ShieldBelt</li>
+          <li>Apparel_PsychicShockLance</li>
+          <li>Apparel_PsychicInsanityLance</li>
+          <li>Apparel_SmokepopBelt</li>
+          <li>OrbitalTargeterBombardment</li>
+          <li>OrbitalTargeterPowerBeam</li>
+          <li>TornadoGenerator</li>
+          <li MayRequire="Ludeon.RimWorld.Royalty">Apparel_PackJump</li>
+          <li MayRequire="Ludeon.RimWorld.Royalty">Apparel_PackBroadshield</li>
+          <li MayRequire="Ludeon.RimWorld.Royalty">OrbitalTargeterMechCluster</li>
         </apparelList>
         <whiteApparelList>
 

From c4c7f213d39091c5dd1e072f1cb14ff69b55670d Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 22 Aug 2021 00:48:51 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=ED=83=9C=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_Apparel.xml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
index 4fa9636..2a55119 100644
--- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
@@ -17,6 +17,9 @@
       <tags Inherit="false">
         <li>PN_Apparel</li>
       </tags>
+      <defaultOutfitTags Inherit="false">
+        <li>PNApparel</li>
+      </defaultOutfitTags>
     </apparel>
     <thingCategories Inherit="False">
       <li>PNApparel</li>
@@ -72,7 +75,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -133,7 +136,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -202,7 +205,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -287,7 +290,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -364,7 +367,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -446,7 +449,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -521,7 +524,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -602,7 +605,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -674,7 +677,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -786,7 +789,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">
@@ -858,7 +861,7 @@
         <li>Paniel_Basic</li>
       </tags>
       <defaultOutfitTags>
-        <li>PNApparel</li>
+
       </defaultOutfitTags>
     </apparel>
     <colorGenerator Class="ColorGenerator_Options">

From 7050ad05e4554f1b5afb23c03fc145106bc121ce Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 22 Aug 2021 00:49:02 +0900
Subject: [PATCH 7/9] =?UTF-8?q?=EC=83=81=EC=84=A0=20=EB=AC=BC=ED=92=88=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_Item.xml           |  2 --
 .../TraderKindDefs/TraderKinds_OrbitalPnL.xml | 25 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/1.3/Defs/ThingDef/ThingDef_Item.xml b/1.3/Defs/ThingDef/ThingDef_Item.xml
index 7eb0758..762959b 100644
--- a/1.3/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Item.xml
@@ -214,7 +214,6 @@
     <thingCategories>
       <li>PNKit</li>
     </thingCategories>
-    <tradeability>Sellable</tradeability>
     <costList>
       <ComponentIndustrial>1</ComponentIndustrial>
       <Steel>15</Steel>
@@ -263,7 +262,6 @@
     <thingCategories>
       <li>PNKit</li>
     </thingCategories>
-    <tradeability>Sellable</tradeability>
     <costList>
       <MechSerumHealer>1</MechSerumHealer>
       <ComponentIndustrial>1</ComponentIndustrial>
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
index 9f07402..0b1a9ea 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
@@ -45,17 +45,26 @@
         <thingDef>PN_antibiotics</thingDef>
         <countRange>2~6</countRange>
       </li>
-      <!--<li Class="StockGenerator_Category">
-        <categoryDef>Drugs</categoryDef>
-        <thingDefCountRange>2~4</thingDefCountRange>
-        <totalPriceRange>1000~2000</totalPriceRange>
-      </li>-->
 
-      <!-- Techprints -->
-      <!-- none -->
+      <!-- Automaton -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_RepairKit</thingDef>
+        <countRange>10~20</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_SelfRepairKit</thingDef>
+        <countRange>-2~1</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_BrainCasing</thingDef>
+        <countRange>2~6</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Leather_Automaton</thingDef>
+        <countRange>50~200</countRange>
+      </li>
 
       <!-- Weapons -->
-      <!-- none -->
 
       <!-- Apparel -->
 

From 7a994719ec0cffe858027a7b673177d07f007fe3 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 22 Aug 2021 01:21:34 +0900
Subject: [PATCH 8/9] =?UTF-8?q?MaxHitPoints=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_Security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1.3/Defs/ThingDef/ThingDef_Security.xml b/1.3/Defs/ThingDef/ThingDef_Security.xml
index 8a25cde..fff5a74 100644
--- a/1.3/Defs/ThingDef/ThingDef_Security.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Security.xml
@@ -73,7 +73,7 @@
       </li>
     </comps>
     <statBases>
-      <MaxHitPoints>220</MaxHitPoints>
+      <MaxHitPoints>520</MaxHitPoints>
       <Flammability>0.7</Flammability>
       <WorkToBuild>15000</WorkToBuild>
       <Mass>200</Mass>

From 6ee874568f73b7e71862a717c039b788b72b2fd4 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 22 Aug 2021 04:02:51 +0900
Subject: [PATCH 9/9] =?UTF-8?q?mentalStateGivers=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/HediffDefs/Hediffs_BodyParts.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/1.3/Defs/HediffDefs/Hediffs_BodyParts.xml b/1.3/Defs/HediffDefs/Hediffs_BodyParts.xml
index b09821f..84d60d3 100644
--- a/1.3/Defs/HediffDefs/Hediffs_BodyParts.xml
+++ b/1.3/Defs/HediffDefs/Hediffs_BodyParts.xml
@@ -161,24 +161,16 @@
           <MentalBreakThreshold>0.08</MentalBreakThreshold>
         </statOffsets>
         <mentalStateGivers>
-          <li>
-            <mentalState>FireStartingSpree</mentalState>
-            <mtbDays>240</mtbDays>
-          </li>
           <li>
             <mentalState>WanderConfused</mentalState>
-            <mtbDays>30</mtbDays>
-          </li>
-          <li>
-            <mentalState>Berserk</mentalState>
-            <mtbDays>240</mtbDays>
-          </li>
-          <li>
-            <mentalState>Tantrum</mentalState>
             <mtbDays>120</mtbDays>
           </li>
           <li>
-            <mentalState>InsultingSpree</mentalState>
+            <mentalState>Tantrum</mentalState>
+            <mtbDays>240</mtbDays>
+          </li>
+          <li>
+            <mentalState>Wander_OwnRoom</mentalState>
             <mtbDays>60</mtbDays>
           </li>
         </mentalStateGivers>