Skip to content

Commit

Permalink
Merge branch 'skyarkhangel:development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@kebabebak
kebabebak authored Dec 21, 2024
2 parents 8bf331a + c2c5127 commit 389b30f
Show file tree
Hide file tree
Showing 14 changed files with 357 additions and 28 deletions.
20 changes: 10 additions & 10 deletions Config/Mod_Cleanie_Cleanie.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<li>Barn</li>
<li>Barracks</li>
<li>Bedroom</li>
<li>CeremonialChamber</li>
<li>Classroom</li>
<li>ContainmentCell</li>
<li>DeathrestChamber</li>
<li>DiningRoom</li>
<li>GuestRoom</li>
<li>Hospital</li>
<li>Kitchen</li>
<li>Laboratory</li>
<li>AC_Laboratory</li>
<li>VBE_Library</li>
<li>Nursery</li>
<li>Playroom</li>
<li>PrisonBarracks</li>
Expand Down Expand Up @@ -52,35 +52,35 @@
<threshold>-0.5</threshold>
</li>
<li>
<weight>60</weight>
<weight>50</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>75</weight>
<weight>50</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>55</weight>
<weight>60</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>85</weight>
<weight>75</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>90</weight>
<weight>55</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>80</weight>
<weight>85</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>80</weight>
<weight>90</weight>
<threshold>-0.5</threshold>
</li>
<li>
<weight>50</weight>
<weight>80</weight>
<threshold>-0.5</threshold>
</li>
<li>
Expand Down
9 changes: 9 additions & 0 deletions Config/Mod_Common Sense_CommonSense.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<SettingsBlock>
<ModSettings Class="CommonSense.Settings">
<adv_cleaning>False</adv_cleaning>
<extended_recipe>False</extended_recipe>
<hauling_over_bills>False</hauling_over_bills>
<safe_wander>True</safe_wander>
</ModSettings>
</SettingsBlock>
2 changes: 1 addition & 1 deletion Mods/Androids/Defs/AlienRace/AlienRace_Androids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
</li>
<li>
<def>HumanlikeChild</def>
<minAge>4</minAge>
<minAge>3</minAge>
</li>
<li MayRequire="Ludeon.RimWorld.Biotech">
<def>HumanlikePreTeenager</def>
Expand Down
17 changes: 17 additions & 0 deletions Mods/Core_SK/Anomaly/Patches/HediffDefs/Hediffs_Mutants.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,22 @@
<li>ArmorGland</li>
</value>
</Operation>

<Operation Class="SK.PatchOperationReplaceExtended">
<xpath>Defs/HediffDef[defName="Shambler"]/stages/li</xpath>
<value>
<makeImmuneTo>
<li>IntestinalFailure</li>
<li>LiverFailure</li>
<li>KidneyFailure</li>
<li>ClinicalDeathNoHeartbeat</li>
<li>ClinicalDeathAsphyxiation</li>
<li>Coma</li>
<li>BrainDamage</li>
<li>SevereBrainDamage</li>
<li>VegetativeState</li>
</makeImmuneTo>
</value>
</Operation>

</Patch>
Binary file modified Mods/Core_SK/Assemblies/Core_SK.dll
View file
Binary file not shown.
20 changes: 20 additions & 0 deletions Mods/Core_SK/Biotech/Patches/MemeDefs/Ideology.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>

<!-- ========== Components ========== -->
<Operation Class="PatchOperationFindMod">
<mods>
<li>Ideology</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<li Class="PatchOperationRemove">
<xpath>Defs/MemeDef[defName="Bloodfeeding"]/startingResearchProjects</xpath>
</li>

</operations>
</match>
</Operation>

</Patch>
2 changes: 1 addition & 1 deletion Mods/Core_SK/Biotech/Patches/Research/Research.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<researchViewX>13.00</researchViewX>
<researchViewY>63.00</researchViewY>
<prerequisites>
<li>Research_table_C2</li>
<li>Oil_Industry_C5</li>
<li>VitalsMonitor</li>
</prerequisites>
</value>
Expand Down
23 changes: 11 additions & 12 deletions Mods/Core_SK/Defs/HediffDefs/HediffDefs_Global_DeathRattle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<HediffDef Name="FailureBase"
Abstract="True">
<HediffDef Name="FailureBase" Abstract="True">
<hediffClass>SK.Hediff_DeathRattle</hediffClass>
<defaultLabelColor>(1, 0.35, 0.35)</defaultLabelColor>
<initialSeverity>0.001</initialSeverity>
Expand Down Expand Up @@ -193,9 +192,9 @@
<li Class="HediffGiver_RandomDrugEffect">
<hediff>SevereBrainDamage</hediff>
<severityToMtbDaysCurve>
<points>
<li>(0.16, 0.09</li>
</points>
<points>
<li>0.16, 0.09</li>
</points>
</severityToMtbDaysCurve>
<partsToAffect>
<li>Brain</li>
Expand Down Expand Up @@ -246,9 +245,9 @@
<li Class="HediffGiver_RandomDrugEffect">
<hediff>BrainDamage</hediff>
<severityToMtbDaysCurve>
<points>
<li>(0.16, 0.09</li>
</points>
<points>
<li>0.16, 0.09</li>
</points>
</severityToMtbDaysCurve>
<partsToAffect>
<li>Brain</li>
Expand Down Expand Up @@ -276,9 +275,9 @@
<li Class="HediffGiver_RandomDrugEffect">
<hediff>VegetativeState</hediff>
<severityToMtbDaysCurve>
<points>
<li>(0.6, 1</li>
</points>
<points>
<li>0.6, 1</li>
</points>
</severityToMtbDaysCurve>
<partsToAffect>
<li>Brain</li>
Expand Down
125 changes: 125 additions & 0 deletions Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,38 @@
<li>TribalShield</li>
</tags>
<developmentalStageFilter>Child, Adult</developmentalStageFilter>
<renderNodeProperties>
<li>
<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
<texPath>Things/Apparel/Shields/ShieldTribal</texPath>
<shaderTypeDef>CutoutComplex</shaderTypeDef>
<parentTagDef>ApparelBody</parentTagDef>
<drawData>
<scale>0.65</scale>
<defaultData>
<layer>80</layer>
</defaultData>
<dataNorth>
<layer>-5</layer>
<offset>(-0.2, 0, -0.2)</offset>
</dataNorth>
<dataEast>
<layer>-5</layer>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>30</rotationOffset>
</dataEast>
<dataSouth>
<offset>(0.2, 0, -0.2)</offset>
<flip>true</flip>
</dataSouth>
<dataWest>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>-30</rotationOffset>
</dataWest>
</drawData>
</li>
</renderNodeProperties>
</apparel>
<thingCategories>
<li>ShieldCat</li>
Expand Down Expand Up @@ -173,6 +205,37 @@
<li>BoneShield</li>
<li>TribalShield</li>
</tags>
<renderNodeProperties>
<li>
<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
<texPath>Things/Apparel/Shields/ShieldBone</texPath>
<shaderTypeDef>CutoutComplex</shaderTypeDef>
<parentTagDef>ApparelBody</parentTagDef>
<drawData>
<scale>0.67</scale>
<defaultData>
<layer>80</layer>
</defaultData>
<dataNorth>
<layer>-5</layer>
<offset>(-0.1, 0, -0.2)</offset>
</dataNorth>
<dataEast>
<layer>-5</layer>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>20</rotationOffset>
</dataEast>
<dataSouth>
<offset>(0.1, 0, -0.2)</offset>
</dataSouth>
<dataWest>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>-20</rotationOffset>
</dataWest>
</drawData>
</li>
</renderNodeProperties>
</apparel>
<thingCategories>
<li>ShieldCat</li>
Expand Down Expand Up @@ -247,6 +310,37 @@
<li>TribalShield</li>
</tags>
<developmentalStageFilter>Child, Adult</developmentalStageFilter>
<renderNodeProperties>
<li>
<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
<texPath>Things/Apparel/Shields/Buckler</texPath>
<shaderTypeDef>CutoutComplex</shaderTypeDef>
<parentTagDef>ApparelBody</parentTagDef>
<drawData>
<scale>0.66</scale>
<defaultData>
<layer>80</layer>
</defaultData>
<dataNorth>
<layer>-5</layer>
<offset>(-0.1, 0, -0.2)</offset>
</dataNorth>
<dataEast>
<layer>-5</layer>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>30</rotationOffset>
</dataEast>
<dataSouth>
<offset>(0.1, 0, -0.2)</offset>
</dataSouth>
<dataWest>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>-30</rotationOffset>
</dataWest>
</drawData>
</li>
</renderNodeProperties>
</apparel>
<thingCategories>
<li>ShieldCat</li>
Expand Down Expand Up @@ -323,6 +417,37 @@
<li>TribalShield</li>
</tags>
<useDeflectMetalEffect>true</useDeflectMetalEffect>
<renderNodeProperties>
<li>
<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
<texPath>Things/Apparel/Shields/Shield</texPath>
<shaderTypeDef>CutoutComplex</shaderTypeDef>
<parentTagDef>ApparelBody</parentTagDef>
<drawData>
<scale>0.65</scale>
<defaultData>
<layer>80</layer>
</defaultData>
<dataNorth>
<layer>-5</layer>
<offset>(-0.2, 0, -0.2)</offset>
</dataNorth>
<dataEast>
<layer>-5</layer>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>30</rotationOffset>
</dataEast>
<dataSouth>
<offset>(0.2, 0, -0.2)</offset>
</dataSouth>
<dataWest>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>-30</rotationOffset>
</dataWest>
</drawData>
</li>
</renderNodeProperties>
</apparel>
<thingCategories>
<li>ShieldCat</li>
Expand Down
4 changes: 2 additions & 2 deletions Mods/Core_SK/Defs/ThingDefs_Resources/Items_Resource_Stuff_Leather.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
</stuffProps>
</ThingDef>

<ThingDef ParentName="SK_LeatherBase">
<!-- <ThingDef ParentName="SK_LeatherBase">
<defName>Leather_Bear</defName>
<label>bear fur pelt</label>
<description>The strong furry leather of a bear. Compared to most leather, it is quite a bit tougher and a bit better at all kinds of temperature regulation.</description>
Expand Down Expand Up @@ -319,7 +319,7 @@
<Mass>0.5</Mass>
</statFactors>
</stuffProps>
</ThingDef>
</ThingDef> -->

<!--========== Basic leathers: skin ============-->

Expand Down
Loading

0 comments on commit 389b30f

Please sign in to comment.