diff --git a/Config/Mod_Performance Fish_PerformanceFishMod.xml b/Config/Mod_Performance Fish_PerformanceFishMod.xml deleted file mode 100644 index 5b5c8cebdb..0000000000 --- a/Config/Mod_Performance Fish_PerformanceFishMod.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Mods/Core_SK/Assemblies/Core_SK.dll b/Mods/Core_SK/Assemblies/Core_SK.dll index 2926003369..f8f96325b7 100755 Binary files a/Mods/Core_SK/Assemblies/Core_SK.dll and b/Mods/Core_SK/Assemblies/Core_SK.dll differ diff --git a/Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml b/Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml index 8b9547c4db..3061aec369 100644 --- a/Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml +++ b/Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml @@ -1583,11 +1583,16 @@
  • CopperTile
  • TinTile
  • +
  • AluminiumTile
  • +
  • CupronickelTile
  • +
  • SteinTile
  • SilverTile
  • GoldTile
  • GoldSolid
  • +
  • TitaniumTile
  • +
  • BetaPolyTile
  • OutsideFloors false diff --git a/Mods/Core_SK/Defs/Drugs/Drugs.xml b/Mods/Core_SK/Defs/Drugs/Drugs.xml index c9fe6bb0c8..6f3a3c4703 100644 --- a/Mods/Core_SK/Defs/Drugs/Drugs.xml +++ b/Mods/Core_SK/Defs/Drugs/Drugs.xml @@ -67,7 +67,7 @@
  • 0.1 - 0.3 + 0.35
  • Consciousness @@ -170,7 +170,7 @@
  • 0.01 - 0.67 + 0.72 -0.25 diff --git a/Mods/Core_SK/Defs/HediffDefs/HediffDefs_ResistPain.xml b/Mods/Core_SK/Defs/HediffDefs/HediffDefs_ResistPain.xml index ba36ffd491..eb919d5dc8 100644 --- a/Mods/Core_SK/Defs/HediffDefs/HediffDefs_ResistPain.xml +++ b/Mods/Core_SK/Defs/HediffDefs/HediffDefs_ResistPain.xml @@ -24,7 +24,7 @@ Don't know what pain is
  • - 0.1 + 0.15
  • @@ -35,7 +35,7 @@ Can only go forward.
  • - 0.25 + 0.3
  • @@ -46,7 +46,7 @@ Don't stand in his way
  • - 0.4 + 0.45
  • @@ -57,7 +57,7 @@ Real berserker
  • - 0.75 + 0.8
  • @@ -68,7 +68,7 @@ It's hard to break this skin
  • - 0.6 + 0.65
  • @@ -79,7 +79,7 @@ This skin softens any bumps.
  • - 0.7 + 0.75
  • diff --git a/Mods/Core_SK/Defs/RecipeDefs/Recipes_Production.xml b/Mods/Core_SK/Defs/RecipeDefs/Recipes_Production.xml index dbe260099e..734fd70f95 100644 --- a/Mods/Core_SK/Defs/RecipeDefs/Recipes_Production.xml +++ b/Mods/Core_SK/Defs/RecipeDefs/Recipes_Production.xml @@ -779,6 +779,47 @@ 0.8 Metals_C1 + + + + MakeSilicon_Set + + Melts down sand to extract the silicon from it. Quite fast. Produces 20. + Extracting silicon from sand. + 1800 + SmeltingSpeed + Smelt + Recipe_Smelt + +
  • EAF
  • +
    + 1 + +
  • + + +
  • SandResource
  • + + + 200 + +
    + + 20 + + + +
  • SandResource
  • +
    +
    + + 5 + + Crafting + 0.8 + Metals_C1 +
    + make_dirt diff --git a/Mods/Core_SK/Defs/TerrainDefs/Terrain_FloorMetallic.xml b/Mods/Core_SK/Defs/TerrainDefs/Terrain_FloorMetallic.xml index 37b4625f5b..7578642fcc 100644 --- a/Mods/Core_SK/Defs/TerrainDefs/Terrain_FloorMetallic.xml +++ b/Mods/Core_SK/Defs/TerrainDefs/Terrain_FloorMetallic.xml @@ -170,6 +170,128 @@ + + + + AluminiumTile + + 240 + Simple aluminium square tiles. + Terrain/Surfaces/GenericFloorTile + (190,205,190) + + 816 + 3 + 0.3 + 0.55 + 0.9 + + + 4 + + +
  • Metal_floor_C1
  • +
    + Medium +
    + + + + + CupronickelTile + + 240 + Simple melchior square tiles. + Terrain/Surfaces/GenericFloorTile + (168,157,125) + + 2040 + 4 + 0.3 + 0.55 + 0.9 + + + 4 + + +
  • Metal_floor_C1
  • +
    +
    + + + + + SteinTile + + 240 + Simple stein square tiles. + Terrain/Surfaces/GenericFloorTile + (130,157,141) + + 3060 + 5 + 0.3 + 0.55 + 0.9 + + + 4 + + +
  • Metal_floor_C1
  • +
    +
    + + + + + TitaniumTile + + 240 + Simple titanium square tiles. + Terrain/Surfaces/GenericFloorTile + (160,178,181) + + 4080 + 8 + 0.4 + 0.5 + 0.8 + + + 4 + + +
  • Metal_floor_D1
  • +
    +
    + + + + + BetaPolyTile + + 240 + Simple beta poly square tiles. + Terrain/Surfaces/GenericFloorTile + (100,60,60) + + 5090 + 11 + 0.55 + 0.4 + 0.6 + + + 4 + + +
  • Metal_floor_D1
  • +
    + Medium +
    + diff --git a/Mods/Core_SK/Languages/Russian/DefInjected/ArchitectSense.DesignationSubCategoryDefs/SubCategories.xml b/Mods/Core_SK/Languages/Russian/DefInjected/ArchitectSense.DesignationSubCategoryDefs/SubCategories.xml index 893b43c3ea..f8af1ee466 100644 --- a/Mods/Core_SK/Languages/Russian/DefInjected/ArchitectSense.DesignationSubCategoryDefs/SubCategories.xml +++ b/Mods/Core_SK/Languages/Russian/DefInjected/ArchitectSense.DesignationSubCategoryDefs/SubCategories.xml @@ -334,8 +334,8 @@ металл Металлические поверхности.\n\nПривлекательность: 3 - металлическая плитка - Металлическая плитка.\n\nПривлекательность: 2 + металлические пластины + Металлические пластины.\n\nПривлекательность: 2 металлические плиты Металлические плиты.\n\nПривлекательность: 3-10 diff --git a/Mods/Core_SK/Languages/Russian/DefInjected/RecipeDef/Recipes_Production.xml b/Mods/Core_SK/Languages/Russian/DefInjected/RecipeDef/Recipes_Production.xml index 40239d0fbc..b7ad4bd273 100644 --- a/Mods/Core_SK/Languages/Russian/DefInjected/RecipeDef/Recipes_Production.xml +++ b/Mods/Core_SK/Languages/Russian/DefInjected/RecipeDef/Recipes_Production.xml @@ -142,6 +142,10 @@ Получить кремний Получение кремния. Производится 5 штук. Получает кремний. + + Выплавить кремний (х20) + Выплавление кремния. Производится 20 штук. + Выплавляет кремний. Сделать искусственную кость Сделать искусственной кости. Производится 1 штука. @@ -150,7 +154,7 @@ Сделать Искусственные кости (х4) Сделать набор искусственных костей. Производится 4 штуки Сделать кости. - + Вырастить глаз Вырастить настоящий глаз из биоматерии. Выращивает глаз. diff --git a/Mods/Core_SK/Languages/Russian/DefInjected/TerrainDef/Terrain_Floors_SK.xml b/Mods/Core_SK/Languages/Russian/DefInjected/TerrainDef/Terrain_Floors_SK.xml index b523fdcd9e..9c0c37a5e5 100644 --- a/Mods/Core_SK/Languages/Russian/DefInjected/TerrainDef/Terrain_Floors_SK.xml +++ b/Mods/Core_SK/Languages/Russian/DefInjected/TerrainDef/Terrain_Floors_SK.xml @@ -77,6 +77,15 @@ Оловянная плитка Белое оловянное металлическое покрытие. + Алюминиевая плитка + Алюминиевое металлическое покрытие. + + Мельхиоровая плитка + Мельхиоровое металлическое покрытие. + + Штейновая плитка + Штейновое металлическое покрытие. + Чёрное металл. покрытие Металлическое покрытие для истинных злодеев. Мухахаха. @@ -86,6 +95,12 @@ Белое металл. покрытие Почувствуй себя в звездолете! + Титановая плитка + Титановое металлическое покрытие. + + Бета-полимерная плитка + Бета-полимерное покрытие. + Бежевый ковёр diff --git a/Mods/Core_SK/Languages/Russian/DefInjected/ThingCategoryDef/Categories_SK.xml b/Mods/Core_SK/Languages/Russian/DefInjected/ThingCategoryDef/Categories_SK.xml index af573c15d3..d51d889402 100644 --- a/Mods/Core_SK/Languages/Russian/DefInjected/ThingCategoryDef/Categories_SK.xml +++ b/Mods/Core_SK/Languages/Russian/DefInjected/ThingCategoryDef/Categories_SK.xml @@ -64,6 +64,7 @@ Заменители мяса Сладости Консервы + Лекарства Кулинарные ингредиенты Алкоголь Ящики diff --git a/Mods/Core_SK/Languages/Russian/DefInjected/ThingDef/Apparel_SK.xml b/Mods/Core_SK/Languages/Russian/DefInjected/ThingDef/Apparel_SK.xml index 0ef3000ce7..0668fe3709 100644 --- a/Mods/Core_SK/Languages/Russian/DefInjected/ThingDef/Apparel_SK.xml +++ b/Mods/Core_SK/Languages/Russian/DefInjected/ThingDef/Apparel_SK.xml @@ -102,8 +102,8 @@ Комбинезон морской пехоты Темно-зелёный комбинезон сил специального назначения. Закрывает также руки. - Разгрузка - Грузоподъемный жилет со множеством карманов для хранения вещей и оборудования. Ускоряет перезарядку оружия, но достаточно громоздка, чтобы носить. + Тактический жилет + Грузоподъемный жилет со множеством карманов для хранения вещей и оборудования. Ускоряет перезарядку оружия, но достаточно громоздкий. Рюкзак Удобный и вместительный рюкзак для хранения вещей. diff --git a/Mods/Core_SK/Languages/Russian/Keyed/Main.xml b/Mods/Core_SK/Languages/Russian/Keyed/Main.xml index 1e3eefd18b..06ae320428 100644 --- a/Mods/Core_SK/Languages/Russian/Keyed/Main.xml +++ b/Mods/Core_SK/Languages/Russian/Keyed/Main.xml @@ -951,8 +951,8 @@ Нужны загрузочная воронка для реактора античастиц Возле вашего реактора античастиц нет загрузочной воронки.\n\nДля работы, реактор античастиц потребляет антиматерию из загрузочной воронки.\n\nПостройте загрузочную воронку вплотную к реактору античастиц. - Нужна загрузочная воронка для адронного коллайдера - Возле вашего адронного коллайдера нет загрузочной воронки.\n\nДля работы, адронный коллайдер потребляет материю из загрузочной воронки.\n\nПостройте загрузочную воронку вплотную к адронному коллайдеру. + Нужен приёмник для адронного коллайдера + Возле вашего адронного коллайдера нет приёмника.\n\nДля работы, адронный коллайдер потребляет материю из приёмника.\n\nПостройте приёмник коллайдера вплотную к адронному коллайдеру. Исчерпает ресурс через: Шахта истощилась diff --git a/Mods/Core_SK/Patches/CombatExtended/Ammo/Neolithic/Arrows.xml b/Mods/Core_SK/Patches/CombatExtended/Ammo/Neolithic/Arrows.xml index d297fc6b68..253ad7a310 100644 --- a/Mods/Core_SK/Patches/CombatExtended/Ammo/Neolithic/Arrows.xml +++ b/Mods/Core_SK/Patches/CombatExtended/Ammo/Neolithic/Arrows.xml @@ -477,13 +477,7 @@ Defs/RecipeDef[defName="MakeAmmo_Arrow_Venom"]/fixedIngredientFilter/thingDefs/l - - Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs - -
  • FSX
  • -
  • Powder
  • -
    -
    + Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs/li[text()="WoodLog"]| Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs/li[text()="Prometheum"] @@ -518,6 +512,12 @@ Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs/l 1500 + + Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs + +
  • Sulfur
  • +
    +
    Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/ingredients @@ -541,11 +541,10 @@ Defs/RecipeDef[defName="MakeAmmo_Arrow_Flame"]/fixedIngredientFilter/thingDefs/l
  • -
  • FSX
  • -
  • Powder
  • +
  • Sulfur
  • - 2 + 5
    diff --git a/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Injuries.xml b/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Injuries.xml new file mode 100644 index 0000000000..8e2593c06e --- /dev/null +++ b/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Injuries.xml @@ -0,0 +1,110 @@ + + + + + + + Defs/HediffDef[defName="MissingBodyPart"]/injuryProps/bleedRate + + 0.075 + + + + + Defs/HediffDef[defName="MissingBodyPart"]/injuryProps/painPerSeverity + + 0.028 + + + + + + + Defs/HediffDef[@Name="BurnBase"]/injuryProps/painPerSeverity + + 0.0308 + + + + + + + Defs/HediffDef[defName="Crush"]/injuryProps/painPerSeverity + + 0.0252 + + + + + + + Defs/HediffDef[defName="Crack"]/injuryProps/painPerSeverity + + 0.0252 + + + + + + + Defs/HediffDef[defName="Cut"]/injuryProps/painPerSeverity + + 0.026 + + + + + + + Defs/HediffDef[defName="Scratch"]/injuryProps/painPerSeverity + + 0.0216 + + + + + + + Defs/HediffDef[defName="Bite"]/injuryProps/painPerSeverity + + 0.0216 + + + + + + + Defs/HediffDef[defName="Stab"]/injuryProps/painPerSeverity + + 0.0252 + + + + + + + Defs/HediffDef[defName="Gunshot"]/injuryProps/painPerSeverity + + 0.028 + + + + + + + Defs/HediffDef[defName="Shredded"]/injuryProps/painPerSeverity + + 0.028 + + + + + + + Defs/HediffDef[defName="Bruise"]/injuryProps/painPerSeverity + + 0.0216 + + + + \ No newline at end of file diff --git a/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Misc.xml b/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Misc.xml new file mode 100644 index 0000000000..d1ff8eab94 --- /dev/null +++ b/Mods/Core_SK/Patches/HediffDefs/Hediffs_Local_Misc.xml @@ -0,0 +1,15 @@ + + + + + Defs/HediffDef[defName="Scaria"]/stages + + +
  • + 0.6 +
  • +
    +
    +
    + +
    \ No newline at end of file diff --git a/Mods/HMC Biomes/Defs/TerrainDefs/Terrain_Floors.xml b/Mods/HMC Biomes/Defs/TerrainDefs/Terrain_Floors.xml index 601f040a24..9d06be4ed6 100644 --- a/Mods/HMC Biomes/Defs/TerrainDefs/Terrain_Floors.xml +++ b/Mods/HMC Biomes/Defs/TerrainDefs/Terrain_Floors.xml @@ -24,7 +24,7 @@ ConstructWood Misc4 -
  • Wooden_floor_A2
  • +
  • Wooden_floor_A3
  • 5
    diff --git a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_11M_Outerwear.xml b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_11M_Outerwear.xml index cd6d89198c..db890fe14a 100644 --- a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_11M_Outerwear.xml +++ b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_11M_Outerwear.xml @@ -163,6 +163,11 @@
  • SetMedieval
  • + +
  • LeatherworkerTable
  • +
  • HandTailoringBench
  • +
  • ElectricTailoringBench
  • +
    Apparel_A2
    diff --git a/Mods/Minerals/Assemblies/Minerals.dll b/Mods/Minerals/Assemblies/Minerals.dll index 0a01af714c..553199d845 100644 Binary files a/Mods/Minerals/Assemblies/Minerals.dll and b/Mods/Minerals/Assemblies/Minerals.dll differ diff --git a/Mods/Minerals/Defs/ThingDefs_Rocks/Basalt.xml b/Mods/Minerals/Defs/ThingDefs_Rocks/Basalt.xml index 9a51901f8a..5503b4139e 100644 --- a/Mods/Minerals/Defs/ThingDefs_Rocks/Basalt.xml +++ b/Mods/Minerals/Defs/ThingDefs_Rocks/Basalt.xml @@ -14,6 +14,9 @@ ZF_ChunkBasalt 0.4 + +
  • BaseRock
  • +
    diff --git a/Mods/Minerals/Defs/ThingDefs_Rocks/Claystone.xml b/Mods/Minerals/Defs/ThingDefs_Rocks/Claystone.xml index a23efb85d7..98079659b2 100644 --- a/Mods/Minerals/Defs/ThingDefs_Rocks/Claystone.xml +++ b/Mods/Minerals/Defs/ThingDefs_Rocks/Claystone.xml @@ -14,6 +14,9 @@ ChunkClaystone 0.4 + +
  • BaseRock
  • +
    diff --git a/Mods/Minerals/Defs/ThingDefs_Rocks/Mudstone.xml b/Mods/Minerals/Defs/ThingDefs_Rocks/Mudstone.xml index 3123fb85bd..e6b6ad1d47 100644 --- a/Mods/Minerals/Defs/ThingDefs_Rocks/Mudstone.xml +++ b/Mods/Minerals/Defs/ThingDefs_Rocks/Mudstone.xml @@ -15,6 +15,9 @@ ZF_ChunkMudstone 0.4 + +
  • BaseRock
  • +
    diff --git a/Mods/Minerals/Patches/BaseRocks.xml b/Mods/Minerals/Patches/BaseRocks.xml new file mode 100644 index 0000000000..5abb54ad1e --- /dev/null +++ b/Mods/Minerals/Patches/BaseRocks.xml @@ -0,0 +1,49 @@ + + + + + Defs/ThingDef[defName = "Sandstone"]/building + + +
  • BaseRock
  • +
    +
    +
    + + + Defs/ThingDef[defName = "Granite"]/building + + +
  • BaseRock
  • +
    +
    +
    + + + Defs/ThingDef[defName = "Slate"]/building + + +
  • BaseRock
  • +
    +
    +
    + + + Defs/ThingDef[defName = "Limestone"]/building + + +
  • BaseRock
  • +
    +
    +
    + + + Defs/ThingDef[defName = "Marble"]/building + + +
  • BaseRock
  • +
    +
    +
    + +
    \ No newline at end of file diff --git a/Mods/Simple Sidearms SK/Assemblies/SimpleSidearms.dll b/Mods/Simple Sidearms SK/Assemblies/SimpleSidearms.dll index 77852d5cb9..d46e94a83c 100644 Binary files a/Mods/Simple Sidearms SK/Assemblies/SimpleSidearms.dll and b/Mods/Simple Sidearms SK/Assemblies/SimpleSidearms.dll differ diff --git a/Mods/Weapon-Modularisation-SK-Armory/CombatExtended/1.4/Patches/ThingDefs_Weapons_SK/Patch_Rifles.xml b/Mods/Weapon-Modularisation-SK-Armory/CombatExtended/1.4/Patches/ThingDefs_Weapons_SK/Patch_Rifles.xml index 8e4a7329e4..4e79fdafd5 100644 --- a/Mods/Weapon-Modularisation-SK-Armory/CombatExtended/1.4/Patches/ThingDefs_Weapons_SK/Patch_Rifles.xml +++ b/Mods/Weapon-Modularisation-SK-Armory/CombatExtended/1.4/Patches/ThingDefs_Weapons_SK/Patch_Rifles.xml @@ -452,7 +452,7 @@ Cons: High production costs
  • 1 3 - AmmoSet_762x51mmNATO + AmmoSet_556x45mmNATO
  • @@ -474,7 +474,7 @@ Cons: High production costs 1.3 CombatExtended.Verb_ShootCE true - Bullet_762x51mmNATO_FMJ + Bullet_556x45mmNATO_FMJ 8 4 0.73