diff --git a/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml b/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml
index d304e38..fb30c56 100644
--- a/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml
+++ b/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml
@@ -50,8 +50,9 @@
- true
+ false
true
+ true
PN_WeaponsMelee
@@ -86,7 +87,7 @@
- true
+ false
true
PN_WeaponsMeleeBladelink
diff --git a/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml b/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml
index 428e5cc..3a296ef 100644
--- a/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml
+++ b/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml
@@ -145,7 +145,7 @@
PNHead6
PNHead7
PNHead8-->
- HeadsAverageNormal
+ PN_HeadsAverageNormal
Female
@@ -328,7 +328,7 @@
1
Paniel/Ear/PanielLeftEar
- left hearing sensor
+ left hearing sensor
CutoutComplex
false
skin
@@ -364,7 +364,7 @@
1
Paniel/Ear/PanielRightEar
- right hearing sensor
+ right hearing sensor
CutoutComplex
false
skin
@@ -400,7 +400,7 @@
1
Paniel/Tail/PanielTail
- tail
+ tail
CutoutComplex
false
skin
@@ -438,13 +438,6 @@
Paniel/Body/
Paniel/Heads/
-
Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin
@@ -533,9 +526,9 @@
-
+
@@ -651,8 +644,8 @@
LookChangeDesired
- PN_OfficerCommandThought
- PN_MeisterAdviceThought
+
@@ -781,12 +774,11 @@
38
4
1.00
- 0.25
1
1.20
100
0.99
- 0.2
+ 0.8
0.6
0.00
0.0
@@ -949,4 +941,10 @@
+
+
+ PN_HeadsAverageNormal
+ Paniel/Heads/HeadsAverage_Normal
+ None
+
\ No newline at end of file
diff --git a/1.4/Defs/BackStoryDefs/BackStoryDefs.xml b/1.4/Defs/BackStoryDefs/BackStoryDefs.xml
index 14027f6..6377499 100644
--- a/1.4/Defs/BackStoryDefs/BackStoryDefs.xml
+++ b/1.4/Defs/BackStoryDefs/BackStoryDefs.xml
@@ -1,7 +1,7 @@
-
+
Female
Female
@@ -12,10 +12,10 @@
PN_storys
-
+
-
+
Paniel_Awful_Backstory
Automaton (awful)
Automaton (awfl)
@@ -113,9 +113,9 @@
-
+
-
+
Paniel_Poor_Backstory
Automaton (poor)
Automaton (poor)
@@ -132,9 +132,9 @@
-
+
-
+
Paniel_Normal_Backstory
Automaton (normal)
Automaton (norm)
@@ -152,9 +152,9 @@
-
+
-
+
Paniel_Good_Backstory
Automaton (good)
Automaton (good)
@@ -172,9 +172,9 @@
-
+
-
+
Paniel_Excellent_Backstory
Automaton (excellent)
Automaton (exc)
@@ -191,9 +191,9 @@
-
+
-
+
Paniel_Masterwork_Backstory
Automaton (masterwork)
Automaton (mast)
@@ -210,9 +210,9 @@
-
+
-
+
Paniel_Legendary_Backstory
Automaton (legendary)
Automaton (legd)
@@ -230,10 +230,10 @@
-
+
-
+
Paniel_Automaton_Backstory
Automaton
Automaton
@@ -252,9 +252,9 @@
-
+
-
+
Paniel_AutomatonB_Backstory
Automaton for Noble
Noble Automaton
@@ -274,9 +274,9 @@
-
+
-
+
Paniel_Royalmaiden_Backstory
Automaton for Royal
Royal Automaton
@@ -293,10 +293,10 @@
-
+
-
+
Paniel_FailureA_Backstory
Automaton Failure
Failure
@@ -326,9 +326,9 @@
PN_Give_Awful_Failure
-
+
-
+
Paniel_FailureB_Backstory
Automaton Failure
Failure
@@ -348,11 +348,11 @@
PN_Give_Poor_Failure
-
+
-
-
+
+
Industriousness
100
@@ -361,7 +361,7 @@
TorturedArtist
100
-
+
Artistic
Social
@@ -370,10 +370,10 @@
Crafting
PlantWork
-
+
-
-
+
+
TooSmart
@@ -383,10 +383,10 @@
SlowLearner
-
-
+
+
-
+
Paniel_MilitiaA_Backstory
Automaton Militia
Militia
@@ -413,9 +413,9 @@
PN_Give_Normal_Combat
-
+
-
+
Paniel_MilitiaB_Backstory
Automaton Militia
Militia
@@ -445,9 +445,9 @@
PN_Give_Good_Combat
-
+
-
+
Paniel_SoldierA_Backstory
Automaton Soldier
Soldier
@@ -477,9 +477,9 @@
PN_Give_Excellent_Combat
-
+
-
+
Paniel_SoldierB_Backstory
Automaton Soldier
Soldier
@@ -509,9 +509,9 @@
PN_Give_Masterwork_Combat
-
+
-
+
Paniel_Royalguard_Backstory
Automaton Royal guard
Royal guard
@@ -541,16 +541,16 @@
PN_Give_Legendary_Combat
-
+
-
-
+
+
Brawler
100
-
+
Animals
Social
@@ -558,10 +558,10 @@
Caring
PlantWork
-
+
-
-
+
+
TooSmart
@@ -571,10 +571,10 @@
SlowLearner
-
-
+
+
-
+
Paniel_ApprenticeA_Backstory
Automaton Apprentice
Apprentice
@@ -601,9 +601,9 @@
PN_Give_Normal_Engineer
-
+
-
+
Paniel_ApprenticeB_Backstory
Automaton Apprentice
Apprentice
@@ -633,9 +633,9 @@
PN_Give_Good_Engineer
-
+
-
+
Paniel_JourneymanA_Backstory
Automaton journeyman
Journeyman
@@ -665,9 +665,9 @@
PN_Give_Excellent_Engineer
-
+
-
+
Paniel_JourneymanB_Backstory
Automaton journeyman
Journeyman
@@ -697,9 +697,9 @@
PN_Give_Masterwork_Engineer
-
+
-
+
Paniel_Meister_Backstory
Automaton Meister
Meister
@@ -729,11 +729,11 @@
PN_Give_Legendary_Engineer
-
+
-
-
+
+
Brawler
100
@@ -742,16 +742,16 @@
TorturedArtist
100
-
+
Animals
Mining
Intellectual
-
+
-
-
+
+
TooSmart
@@ -761,10 +761,10 @@
SlowLearner
-
-
+
+
-
+
Paniel_MaidA_Backstory
Automaton Maid
Maid
@@ -791,9 +791,9 @@
PN_Give_Normal_Domestic
-
+
-
+
Paniel_MaidB_Backstory
Automaton Maid
Maid
@@ -823,9 +823,9 @@
PN_Give_Good_Domestic
-
+
-
+
Paniel_HousemaidA_Backstory
Automaton Housekeeper maid
Housekeeper Maid
@@ -855,9 +855,9 @@
PN_Give_Excellent_Domestic
-
+
-
+
Paniel_HousemaidB_Backstory
Automaton Housekeeper maid
Housekeeper
@@ -887,9 +887,9 @@
PN_Give_Masterwork_Domestic
-
+
-
+
Paniel_Ladysmaid_Backstory
Automaton Lady's maid
Lady's maid
@@ -919,5 +919,5 @@
PN_Give_Legendary_Domestic
-
+
diff --git a/1.4/Defs/BackStoryDefs/BackStoryDefs_PA.xml b/1.4/Defs/BackStoryDefs/BackStoryDefs_PA.xml
index c0836a1..b5fc716 100644
--- a/1.4/Defs/BackStoryDefs/BackStoryDefs_PA.xml
+++ b/1.4/Defs/BackStoryDefs/BackStoryDefs_PA.xml
@@ -1,8 +1,8 @@
-
-
+
+
Pyromaniac
100
@@ -19,10 +19,10 @@
SlowLearner
100
-
-
+
+
-
+
Paniel_MilitiaA_Backstory_PA
Automaton Militia (PA)
Militia
@@ -48,9 +48,9 @@
PN_Give_Normal_Combat_PA
-
+
-
+
Paniel_MilitiaB_Backstory_PA
Automaton Militia (PA)
Militia
@@ -80,9 +80,9 @@
PN_Give_Good_Combat_PA
-
+
-
+
Paniel_SoldierA_Backstory_PA
Automaton Soldier (PA)
Soldier
@@ -112,9 +112,9 @@
PN_Give_Excellent_Combat_PA
-
+
-
+
Paniel_SoldierB_Backstory_PA
Automaton Soldier (PA)
Soldier
@@ -144,9 +144,9 @@
PN_Give_Masterwork_Combat_PA
-
+
-
+
Paniel_Royalguard_Backstory_PA
Automaton Royal guard (PA)
Royal guard
@@ -176,11 +176,11 @@
PN_Give_Legendary_Combat_PA
-
+
-
-
+
+
Pyromaniac
100
@@ -197,10 +197,10 @@
SlowLearner
100
-
-
+
+
-
+
Paniel_ApprenticeA_Backstory_PA
Automaton Apprentice (PA)
Apprentice
@@ -226,9 +226,9 @@
PN_Give_Normal_Engineer_PA
-
+
-
+
Paniel_ApprenticeB_Backstory_PA
Automaton Apprentice (PA)
Apprentice
@@ -258,9 +258,9 @@
PN_Give_Good_Engineer_PA
-
+
-
+
Paniel_JourneymanA_Backstory_PA
Automaton journeyman (PA)
Journeyman
@@ -290,9 +290,9 @@
PN_Give_Excellent_Engineer_PA
-
+
-
+
Paniel_JourneymanB_Backstory_PA
Automaton journeyman (PA)
Journeyman
@@ -322,9 +322,9 @@
PN_Give_Masterwork_Engineer_PA
-
+
-
+
Paniel_Meister_Backstory_PA
Automaton Meister (PA)
Meister
@@ -354,11 +354,11 @@
PN_Give_Legendary_Engineer_PA
-
+
-
-
+
+
Pyromaniac
100
@@ -375,10 +375,10 @@
SlowLearner
100
-
-
+
+
-
+
Paniel_MaidA_Backstory_PA
Automaton Maid (PA)
Maid
@@ -404,9 +404,9 @@
PN_Give_Normal_Domestic_PA
-
+
-
+
Paniel_MaidB_Backstory_PA
Automaton Maid (PA)
Maid
@@ -436,9 +436,9 @@
PN_Give_Good_Domestic_PA
-
+
-
+
Paniel_HousemaidA_Backstory_PA
Automaton Housekeeper maid (PA)
Housekeeper Maid
@@ -468,9 +468,9 @@
PN_Give_Excellent_Domestic_PA
-
+
-
+
Paniel_HousemaidB_Backstory_PA
Automaton Housekeeper maid (PA)
Housekeeper
@@ -500,9 +500,9 @@
PN_Give_Masterwork_Domestic_PA
-
+
-
+
Paniel_Ladysmaid_Backstory_PA
Automaton Lady's maid (PA)
Lady's maid
@@ -532,11 +532,11 @@
PN_Give_Legendary_Domestic_PA
-
+
-
+
Paniel_Testsubject_Backstory
Automaton Test subject (PA)
Test subject
@@ -586,7 +586,7 @@
-->
-
+
NaturalMood
2
@@ -617,6 +617,6 @@
-2
100
-
-
+
+
\ No newline at end of file
diff --git a/1.4/Defs/FactionDefs/Factions_Player.xml b/1.4/Defs/FactionDefs/Factions_Player.xml
index c3665d7..156fd7d 100644
--- a/1.4/Defs/FactionDefs/Factions_Player.xml
+++ b/1.4/Defs/FactionDefs/Factions_Player.xml
@@ -27,7 +27,6 @@
NamerInitialSettlementColony
NamerFactionOutlander
NamerSettlementOutlander
- 1
ClassicStart
diff --git a/1.4/Defs/FactionDefs/Factions_PnL.xml b/1.4/Defs/FactionDefs/Factions_PnL.xml
index 9d3a7c7..cbee9b3 100644
--- a/1.4/Defs/FactionDefs/Factions_PnL.xml
+++ b/1.4/Defs/FactionDefs/Factions_PnL.xml
@@ -94,7 +94,6 @@
Offworld
- 0.8
PN_Caravan_PnLindustry
diff --git a/1.4/Defs/HediffDefs/Hediffs_Automaton.xml b/1.4/Defs/HediffDefs/Hediffs_Automaton.xml
index 0db41de..701b3b4 100644
--- a/1.4/Defs/HediffDefs/Hediffs_Automaton.xml
+++ b/1.4/Defs/HediffDefs/Hediffs_Automaton.xml
@@ -81,6 +81,7 @@
0
0
0
+ -0.75
0
diff --git a/1.4/Defs/ThingDef/ThingDef_Shell.xml b/1.4/Defs/ThingDef/ThingDef_Shell.xml
index 1896761..1e2bc1c 100644
--- a/1.4/Defs/ThingDef/ThingDef_Shell.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Shell.xml
@@ -418,9 +418,7 @@
Smoke
11
- Gas_Smoke
- 1
- 1
+ BlindSmoke
30~60
@@ -474,8 +472,7 @@
Explosion_Smoke
MortarRound_PreImpact
MortarRound_Ambient
- Gas_Smoke
- 1
+ BlindSmoke
diff --git a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
index aa6d6fc..18208d1 100644
--- a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
@@ -846,6 +846,7 @@
An experimental railgun that fires powerful explosions in a narrow area.\nOnce fired, it will break down and cannot be used.
Normal
Spacer
+ false
Things/Weapons/PNPrototypeRailGun
Graphic_Single
diff --git a/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml b/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
index 3456e77..df890e3 100644
--- a/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
@@ -902,14 +902,15 @@
Projectile_Explosive
- 2.4
- Smoke
40
- Gas_Smoke
- 1
+ Smoke
+
+ 2.4
+ BlindSmoke
+ true
0.2
0.6
- true
+ 0.5
Things/Projectile/LauncherShot