Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes food processors disappearing (again) and fixes bleeding issues with removed body parts (also again) #6813

Merged
merged 2 commits into from
Jun 17, 2021
Merged

Fixes food processors disappearing (again) and fixes bleeding issues with removed body parts (also again) #6813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ce633
Fixes food processors
MaxIsJoe Jun 17, 2021
4335ab6
Fixes error with bleeding
MaxIsJoe Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions UnityProject/Assets/Prefabs/Objects/Kitchen/FoodProcessor.prefab
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnityProject/Assets/Scripts/Effects/LTEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public virtual void RpcStopAnim()

public void GetOriginalPosition()
{
originalPosition = transform.position;
originalPosition = this.gameObject.RegisterTile().WorldPositionServer;
}
}
}
11 changes: 9 additions & 2 deletions UnityProject/Assets/Scripts/HealthV2/Living/Damage/BodyPartDamage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,16 @@ private IEnumerator Bleedout()
while(isBleedingExternally)
{
yield return WaitFor.Seconds(4f);
if(Root.ContainsLimbs.Contains(this) != false) //This is to prevent rare moments where body parts still attempt to bleed when they no longer should.
if(Root != null) //This is to prevent rare moments where body parts still attempt to bleed when they no longer should.
{
healthMaster.CirculatorySystem.Bleed(UnityEngine.Random.Range(MinMaxInternalBleedingValues.x, MinMaxInternalBleedingValues.y));
if (Root.ContainsLimbs.Contains(this) != false)
{
healthMaster.CirculatorySystem.Bleed(UnityEngine.Random.Range(MinMaxInternalBleedingValues.x, MinMaxInternalBleedingValues.y));
}
}
else
{
break;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion UnityProject/Assets/Scripts/Objects/Machines/FoodProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ private void StartProcessor()
// time in seconds = 4 * items_in_processor / manipulator tier
int slotsOccupied = storage.GetNextFreeIndexedSlot().SlotIdentifier.SlotIndex;
processTimer = (float)(TIME_PER_ITEM * slotsOccupied / manipTier);
AnimateProcessor(1, processTimer, shakeValue, 0.1f);
AnimateProcessor(1, processTimer / 8, shakeValue, 0.1f);
UpdateManager.Add(CallbackType.UPDATE, UpdateMe);
playAudioLoop = true;

Expand Down