Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 0879caf

Browse files
committed
Misc stuff
1 parent aa387f3 commit 0879caf

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

Data/Base.rte/Craft/Rockets/MK2/RocketMK2.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ AddActor = ACRocket
548548
AutoGenerate = 1
549549
Material = Material
550550
CopyOf = Military Stuff
551-
Resolution = 20
551+
Resolution = 10
552552
Depth = 0
553553
DeepGroup = AtomGroup
554554
AutoGenerate = 1

Data/Base.rte/Devices/Shared.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ AddDevice = HeldDevice
5656
JointStrength = 200
5757
JointStiffness = 1
5858
HUDVisible = 0
59-
LifeTime = 1
6059

6160

6261
///////////////////////////////////////////////////////////////////////

Data/Base.rte/Materials.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ AddMaterial = Material
753753
PresetName = Flesh Scraps
754754
Bounce = 0.6
755755
Friction = 0.6
756-
StructuralIntegrity = 30
756+
StructuralIntegrity = 20
757757
DensityKGPerVolumeL = 1.0
758758
GibImpulseLimitPerVolumeL = 15
759759
GibWoundLimitPerVolumeL = 0.1

Data/Base.rte/Scripts/GrenadeFragment.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ end
55
function Update(self)
66
if not self.HitsMOs and math.floor(self.Age/TimerMan.DeltaTimeMS + 0.5) >= self.skipFrames then
77
self.HitsMOs = true;
8+
self:DisableScript("Base.rte/Scripts/GrenadeFragment.lua");
89
end
910
end

Data/Ronin.rte/Actors/Shared/RoninSoldier.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Update(self)
6969
if self.updateTimer:IsPastSimMS(1000) or damaged then
7070
self.updateTimer:Reset();
7171
self.aggressive = self.Health < (self.MaxHealth * 0.5);
72-
if self.Head then
72+
if self.Head and self.face then
7373
if self.aggressive or damaged or (self.controller and self.controller:IsState(Controller.WEAPON_FIRE)) then
7474
self.Head.Frame = self.face + (self.Head.FrameCount * 0.5);
7575
else

0 commit comments

Comments
 (0)