Merge remote-tracking branch 'upstream/development' into alpha

skyarkhangel · Jul 2, 2024 · 1f27daa · 1f27daa
2 parents 3ee5368 + 69aa3e4
commit 1f27daa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Helmets_UpperHead_Industrial.xml b/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Helmets_UpperHead_Industrial.xml
@@ -336,6 +336,7 @@
 			<developmentalStageFilter>Child, Adult</developmentalStageFilter>
 			<bodyPartGroups>
 				<li>UpperHead</li>
+				<li>Mouth</li>
 			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/CamoHelmet/USCM_CamoHelmet</wornGraphicPath>
 			<layers>

diff --git a/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Helmets_UpperHead_Spacer.xml b/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Helmets_UpperHead_Spacer.xml
@@ -251,7 +251,7 @@
 			<countsAsClothingForNudity>false</countsAsClothingForNudity>
 			<developmentalStageFilter>Child, Adult</developmentalStageFilter>
 			<bodyPartGroups>
-				<li>UpperHead</li>
+				<li>FullHead</li>
 			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Rimarsenal/InteractorHelmet</wornGraphicPath>
 			<layers>

diff --git a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml
@@ -831,6 +831,18 @@ Defs/RecipeDef[defName="MakeShell_Smoke"]/fixedIngredientFilter/thingDefs/li[tex
 		<attribute>ParentName</attribute>
 		<value>AmmoRecipeBase</value>
 	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeShell_Toxic"]/label</xpath>
+		<value>
+			<label>make a 81mm tox mortar shell x1</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeShell_Toxic"]/description</xpath>
+		<value>
+			<description>Craft 1 81mm tox mortar shell.</description>
+		</value>
+	</Operation>
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/RecipeDef[defName="MakeShell_Toxic"]/fixedIngredientFilter/thingDefs</xpath>
 		<value>

diff --git a/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml b/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml
@@ -2136,7 +2136,7 @@
 		</equippedStatOffsets>
 		<apparel>
 			<bodyPartGroups>
-				<li>UpperHead</li>
+				<li>FullHead</li>
 				<li>Eyes</li>
 				<li>Teeth</li>
 			</bodyPartGroups>
@@ -2365,7 +2365,7 @@
 		</equippedStatOffsets>
 		<apparel>
 			<bodyPartGroups>
-				<li>UpperHead</li>
+				<li>FullHead</li>
 				<li>Eyes</li>
 				<li>Teeth</li>
 			</bodyPartGroups>
@@ -2443,7 +2443,7 @@
 		</equippedStatOffsets>
 		<apparel>
 			<bodyPartGroups>
-				<li>UpperHead</li>
+				<li>FullHead</li>
 				<li>Eyes</li>
 				<li>Teeth</li>
 			</bodyPartGroups>
@@ -2522,7 +2522,7 @@
 		</equippedStatOffsets>
 		<apparel>
 			<bodyPartGroups>
-				<li>UpperHead</li>
+				<li>FullHead</li>
 				<li>Eyes</li>
 				<li>Teeth</li>
 			</bodyPartGroups>