diff --git a/CHANGELOG.md b/CHANGELOG.md index d90c7f66..41e2a921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 1.22 (pre-release): * [Change] Don't allow `KIS` to deploy or move the ground experiments. * [Change] Allow the small cargo to be carried by kerbal. +* [Change] Disable the default remove helmet hotkey `J` as it conflicts with "Breaking ground" DLC. * [Enhancement] Add medium portable cargo to carry 6 experiments. # 1.21 (May 16th, 2019): diff --git a/Source/ModuleKISInventory.cs b/Source/ModuleKISInventory.cs index a14c306e..a2f33772 100644 --- a/Source/ModuleKISInventory.cs +++ b/Source/ModuleKISInventory.cs @@ -1931,7 +1931,7 @@ void UpdateKey() { } // Put/remove helmet - if (KIS_Shared.IsKeyDown(evaHelmetKey)) { + if (!string.IsNullOrEmpty(evaHelmetKey) && KIS_Shared.IsKeyDown(evaHelmetKey)) { // If HelmetChange event haven't fired till this momemnt, then the helmet is ON. helmetEquippedState = helmetEquippedState ?? true; SetHelmet(!helmetEquippedState.Value); diff --git a/settings.cfg b/settings.cfg index 9eb22e55..51ad0e18 100644 --- a/settings.cfg +++ b/settings.cfg @@ -64,7 +64,7 @@ KISConfig { inventoryKey = tab rightHandKey = x - helmetKey = j + helmetKey = //j - J conflicts with Breaking Ground DLC. slotsX = 2 slotsY = 4 slotSize = 50