Skip to content

Commit 382109d

Browse files
authored
Merge pull request #1212 from BobPalmer/DEVELOP
Develop
2 parents 720d1d4 + 72e5e27 commit 382109d

File tree

105 files changed

+2154
-1984
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2154
-1984
lines changed

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.8.17 - 2017.03.17
2+
-------------------
3+
Dependency Updates
4+
15
0.8.16 - 2017.02.24
26
-------------------
37
Mechanics can now perform EVA maintenance
512 Bytes
Binary file not shown.
125 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

FOR_RELEASE/GameData/000_USITools/USITools.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"VERSION":{
1111
"MAJOR":0,
1212
"MINOR":8,
13-
"PATCH":16,
13+
"PATCH":17,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
0.3.10 - 2017.03.17
2+
-------------------
3+
New containers in a KIS SC-62 form factor (Thanks Wyzard256!)
4+
Module Manager corrections (Thanks theRagingIrisman!)
5+
Updated CTT positions of nuclear fuel tanks (Thanks Wyzard256!)
6+
17
0.3.9 - 2017.02.24
28
------------------
39
Added larger nuclear waste and fuel containers

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Adapter.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_Adapter
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_Adapter
@@ -57,7 +57,7 @@ PART
5757
{
5858
name = FSfuelSwitch
5959
resourceNames =LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant;MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics
60-
resourceAmounts = 225,275;2500;2500;2500;2500;500;500;2500;2500;2500;2500;2500;1250,1250;2500;2500;2500;2500;500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500
60+
resourceAmounts = 225,275;2500;2500;2500;2500;500;500;2500;2500;2500;2500;2500;1250,1250;2500;2500;2500;2500;500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500;2500
6161
initialResourceAmounts = 225,275;0;0;0;0;500;500;0;0;0;0;0;0,0;0;0;0;0;2500;0;0;0;0;0;0;0;0;0;0;0;0;0
6262
tankCost = 1000;1000;40000;1000;1000;1000;1500;7000;5000;4000;5000;4000;327000;5000;38000;22000;39000;600;50000;25000;100000;14000;1250;25;750;25;50;625000;37500;1500
6363
basePartMass = 0.5
@@ -66,14 +66,14 @@ PART
6666
}
6767

6868

69-
69+
7070
MODULE
7171
{
7272
name = USI_ModuleResourceWarehouse
73-
}
73+
}
7474

7575
MODULE
7676
{
7777
name = USI_ModuleRecycleBin
78-
}
78+
}
7979
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CargoBay.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_CargoBay
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_CargoBay
@@ -13,7 +13,7 @@ PART
1313
node_stack_innerB = 0.0, 0.0, -.86, 0.0, 0.0, 1.0,1
1414
node_stack_innerL = 0.0, 1.2, 0.0, 0.0, -1.0, 0.0,1
1515
node_stack_inner_R = 0.0, -1.2, 0.0, 0.0, 1.0, 0.0,1
16-
16+
1717
node_stack_topHatch = 0.0, 1.5, 0.4, 0.0, 1.0, 0.0,1
1818
node_stack_bottomHatch = 0.0, -1.5, 0.4, 0.0, -1.0, 0.0,1
1919
node_stack_top = 0.0, 1.5, 0.0, 0.0, 1.0, 0.0,2

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Crate.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_Crate
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_Crate
@@ -65,6 +65,6 @@ PART
6565
MODULE
6666
{
6767
name = USI_ModuleRecycleBin
68-
}
69-
68+
}
69+
7070
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg

+1-24
Original file line numberDiff line numberDiff line change
@@ -114,34 +114,11 @@ PART
114114
isTweakable = True
115115
}
116116

117-
RESOURCE
118-
{
119-
name = ReplacementParts
120-
amount = 1650
121-
maxAmount = 1650
122-
}
123-
117+
124118
MODULE
125119
{
126120
name = ModuleHabitation
127121
KerbalMonths = 0
128122
HabMultiplier = 3
129123
}
130-
131-
132-
MODULE
133-
{
134-
name = ModuleKISInventory
135-
maxVolume = 1000
136-
externalAccess = true
137-
internalAccess = true
138-
slotsX = 8
139-
slotsY = 5
140-
slotSize = 50
141-
itemIconResolution = 128
142-
selfIconResolution = 128
143-
openSndPath = KIS/Sounds/containerOpen
144-
closeSndPath = KIS/Sounds/containerClose
145-
defaultMoveSndPath = KIS/Sounds/itemMove
146-
}
147124
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_FlatBed.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_FlatBed
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_FlatBed
@@ -19,7 +19,7 @@ PART
1919
node_stack_bed7 = -0.8, 0.8, -0.1, 0.0, 0.0, -1.0,0
2020
node_stack_bed8 = -0.8, 0.0, -0.1, 0.0, 0.0, -1.0,0
2121
node_stack_bed9 = -0.8, -0.8, -0.1, 0.0, 0.0, -1.0,0
22-
22+
2323
node_stack_topHatch = 0.0, 1.225, 0.4, 0.0, 1.0, 0.0,1
2424
node_stack_bottomHatch = 0.0, -1.225, 0.4, 0.0, -1.0, 0.0,1
2525
node_stack_wheel1 = -1,0,.4,-1,0,0,1
@@ -54,6 +54,6 @@ PART
5454
{
5555
name = USIAnimation
5656
animationName = Deploy
57-
}
57+
}
5858
5959
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Hub.cfg

-16
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,6 @@ PART
5151
{
5252
name = USIAnimation
5353
animationName = Deploy
54-
}
55-
56-
MODULE
57-
{
58-
name = ModuleKISInventory
59-
maxVolume = 5000
60-
externalAccess = true
61-
internalAccess = true
62-
slotsX = 10
63-
slotsY = 8
64-
slotSize = 50
65-
itemIconResolution = 128
66-
selfIconResolution = 128
67-
openSndPath = KIS/Sounds/containerOpen
68-
closeSndPath = KIS/Sounds/containerClose
69-
defaultMoveSndPath = KIS/Sounds/itemMove
7054
}
7155

7256
RESOURCE

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_KISCrate.cfg

-17
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,4 @@ PART
3434
TechRequired = advConstruction
3535

3636
tags = USI Karibou cck-rovers rover KIS
37-
38-
MODULE
39-
{
40-
name = ModuleKISInventory
41-
maxVolume = 2500
42-
externalAccess = true
43-
internalAccess = true
44-
slotsX = 8
45-
slotsY = 5
46-
slotSize = 50
47-
itemIconResolution = 128
48-
selfIconResolution = 128
49-
openSndPath = KIS/Sounds/containerOpen
50-
closeSndPath = KIS/Sounds/containerClose
51-
defaultMoveSndPath = KIS/Sounds/itemMove
52-
}
53-
5437
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_PassengerCab.cfg

-30
Original file line numberDiff line numberDiff line change
@@ -87,37 +87,7 @@ PART
8787
isTweakable = True
8888
}
8989
90-
RESOURCE
91-
{
92-
name = ReplacementParts
93-
amount = 1650
94-
maxAmount = 1650
95-
}
9690
97-
MODULE
98-
{
99-
name = ModuleConnectedLivingSpace
100-
passable = true
101-
passableWhenSurfaceAttached = true
102-
surfaceAttachmentsPassable = true
103-
}
104-
105-
106-
MODULE
107-
{
108-
name = ModuleKISInventory
109-
maxVolume = 1000
110-
externalAccess = true
111-
internalAccess = true
112-
slotsX = 8
113-
slotsY = 5
114-
slotSize = 50
115-
itemIconResolution = 128
116-
selfIconResolution = 128
117-
openSndPath = KIS/Sounds/containerOpen
118-
closeSndPath = KIS/Sounds/containerClose
119-
defaultMoveSndPath = KIS/Sounds/itemMove
120-
}
12191
}
12292
12393
// Cost is used to balance without life support - with life support this costs the same as a Crew Cab.

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RCSBlock.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_RCSBlock
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_RCSBlock
@@ -49,21 +49,21 @@ PART
4949
rate = 0.6
5050
}
5151
}
52-
52+
5353
RESOURCE
5454
{
5555
name = MonoPropellant
5656
amount = 500
5757
maxAmount = 500
5858
}
59-
59+
6060
RESOURCE
6161
{
6262
name = ElectricCharge
6363
amount = 1000
6464
maxAmount = 1000
6565
}
66-
66+
6767
MODULE
6868
{
6969
name = ModuleRCS
@@ -79,5 +79,5 @@ PART
7979
}
8080
}
8181

82-
82+
8383
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RadialProbe.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PART
22
{
33
name = KER_RadialProbe
44
module = Part
5-
author = RoverDude
5+
author = RoverDude
66
MODEL
77
{
88
model = UmbraSpaceIndustries/Karibou/Assets/KER_RadialProbe

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RoverCab.cfg

-23
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ PART
5050
name = KaribouCabInternal
5151
}
5252

53-
MODULE
54-
{
55-
name = JSIAdvTransparentPod
56-
transparentTransforms = MainHull_000
57-
}
58-
5953
MODULE
6054
{
6155
name = ModuleCommand
@@ -163,21 +157,4 @@ PART
163157
{
164158
name = ModuleResourceDistributor
165159
}
166-
167-
MODULE
168-
{
169-
name = ModuleKISInventory
170-
maxVolume = 1000
171-
externalAccess = true
172-
internalAccess = true
173-
slotsX = 8
174-
slotsY = 5
175-
slotSize = 50
176-
itemIconResolution = 128
177-
selfIconResolution = 128
178-
openSndPath = KIS/Sounds/containerOpen
179-
closeSndPath = KIS/Sounds/containerClose
180-
defaultMoveSndPath = KIS/Sounds/itemMove
181-
}
182-
183160
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_SABRE.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PART
1010
scale = 1.0
1111
node_stack_left = -0.72,0.0,0.0,-1,0,0,1
1212
node_stack_right = 0.72,0.0,0.0,1,0,0,1
13-
13+
1414
mass = 3
1515
heatConductivity = 0.06 // half default
1616
skinInternalConductionMult = 4.0
@@ -173,7 +173,7 @@ PART
173173
useEngineResponseTime = True
174174
engineAccelerationSpeed = 0.2
175175
engineDecelerationSpeed = 0.35
176-
useVelocityCurve = False
176+
useVelocityCurve = False
177177
spoolEffectName = running_open
178178
engineSpoolIdle = 0.05
179179
engineSpoolTime = 2.0

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Shelter.cfg

+1-34
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ PART
6060
name = ModuleLifeSupport
6161
}
6262

63-
RESOURCE
64-
{
65-
name = ReplacementParts
66-
amount = 320
67-
maxAmount = 320
68-
}
69-
7063
MODULE
7164
{
7265
name = ModuleHabitation
@@ -75,33 +68,7 @@ PART
7568
StartActionName = Start Habitat
7669
StopActionName = Stop Habitat
7770
}
78-
79-
MODULE
80-
{
81-
name = ModuleKISItem
82-
shortcutKeyAction = drop
83-
useName = use
84-
usableFromEva = true
85-
usableFromContainer = true
86-
usableFromPod = true
87-
usableFromEditor = true
88-
stackable = false
89-
volumeOverride = 1000
90-
editorItemscategory = none //false
91-
moveSndPath = KIS/Sounds/itemMove
92-
equipable = false
93-
equipMode = part
94-
equipSlot = Back Pocket
95-
equipSkill =
96-
equipRemoveHelmet = false
97-
equipMeshName = helmet
98-
equipBoneName = helmet01
99-
equipPos = (0, 0, 0)
100-
equipDir = (0, 0, 0)
101-
carriable = true
102-
allowAttachOnStatic = false
103-
}
104-
71+
10572
MODULE
10673
{
10774
name = USIAnimation

0 commit comments

Comments
 (0)