F9 screenshot button now sets branding convar back to what it was, rather than always enabling it

Added support for multiple colliders per gib (useful for primitives), and updated server gibs to allow for primitive colliders as well.

Add support for gibs to use the colliders they have on their original prefab, including primitive collider types. The physics material is now also assigned, plus a small amount of drag.

Merge from Main -> GeneralBugFixes

Fix up RHIB colliders

Fixed tool cupboard saying "unattened" (but will need a phrases rebuild)

Fixed another user being able to turn on/off single-user static "oven" objects (e.g. refinery, BBQ) while a user is using the UI.

Main inventory right-click can now fill all AutoTurret ammo slots, not just the first one

Prevent using the chainsaw while refilling.

Merge from Main -> GeneralBugFixes

Better fix for roadside object angles, which also fixes the other bug of roadside objects leaning left/right when spawning on up/down sloping roads.

Fixed roadside electrical boxes being misaligned with terrain. Roadside objects are now able to optionally align to the road's normal (while still facing in their assigned direction). I've set it to true for roadside decor (electrical boxes and road signs).

Merge from Main -> GeneralBugFixes

Locker now allows right-click moves from inventory for both clothing and belt items, putting them into the right slots. Previously only clothing was supported.

Improved locker fix that keeps the right amount of belt slots

Fixed invisible item slot in the locker UI

Fixed two modular car presets not having an engine!

Merge fix for server-side projectiles (autoturrets, NPCs) being able to shoot through armoured module walls in some cases. Allows mountables to set a custom size for the player's capsule collider.

Allow mountables to resize the player's collider when mounted. Set custom sizes for the modular car seats. Get player components in PreInitShared instead of InitShared so we don't need a special case for playerCollider.

Don't need PlayerCollider null checks anymore

Refactoring to tidy up playerCollider and physicsRigidbody a bit.

Rename triggerCollider to playerCollider as it's not a trigger

Fix car pushing no longer working properly due to the new handbrake system (#52873) + moved the push code.

Fixed modular car engine performance not being recalculated when the engine is repaired (regression in #53163).

Revert the changes in 53372 - Cars are now cheaper to repair on the lift vs. the hammer again, with hammer going back from 20% to 50% cost (sorry).

Previously I'd observed that wheel colliders were occasionally preventing the modular car rigidbody from sleeping, even with a forced sleep call and having motorTorque and brakeTorque set to zero. To counter that, I was simply disabling them entirely when the rigidbody went to sleep. However, that caused a surprising new bug: If you shot a sleeping car with a rocket, it would correctly wake the rigidbody, but the act of the wheels waking up as well would completely cancel the rocket explosion's force [because Unity], meaning the car didn't move. I've now determined that it was the steering being non-zero that was preventing sleep [because Unity], so I've removed the disable/enable for wheelcolliders and set steerAngle to zero on sleep as well, which lets sleep work correctly, and explosion forces on sleeping cars now work again.

Move damageRenderer serialisation out of #CLIENT define, so it won't get lost when switching to #SERVER

Fixed missing DamageRenderer scripts on some vehicle modules

Fixed modular car repairs with the hammer costing more than repairs on the vehicle lift. Hammer repair cost has been reduced to 20% of the module's original cost (was 50%), which matches the repair bench/vehicle lift standard.

Fixed minicopter and modular cars becoming unusable after loading from a save if the server was saved during engine startup

▉▋▊▅▉▇ ▉▅▄▉█▌▄▊██▌ ▆▆▌_▅█▄▇▅▄▋▊▅ ▇▊ ▍▉▊ ▇▍ ▄█▇▊▉▍█▊█ ▅▆█ ▊▅▍ ▊▊▊▊▅▋▆▍ █▊▌▄▋

Adjusting stuck-in-car damage

- Fixed car collisions with horses not always registering (at high speeds, RemoveInvalidEntities was removing them before they had a chance to tick). - Increased car vs. NPC damage by 25%. - Fixed the player-in-car hurt trigger not doing damage if the car wasn't moving.

Engine internal items now take 50% less damage when inheriting damage to the module itself (i.e. they'll survive twice as long)

Fixed the associated item on the armoured passenger module. Fixes repair not working correctly.

Adjusting collision factors

Remove hit force multiplier

When faking car vs. player/AI/animal collision, use realistic masses for each of them as a starting point. Added new "RealisticMass" field.

Improved car ability to climb hills: - Increased low-speed power by 25% - Increased grip both on and off road by 7%

▄▊█▅▇▊▋ ▉▄▋▌▇ ▍▇▅▌█▄▌ █▇ ▉▍▆█ ▋▆ ▉▉▊▌ █▋

Remove unused TriggerParent from 2module_passengers

Merge Vehicles -> Main. Adds gibs on individual car panels, armoured passenger module, lifts can be placed in tighter areas (including T-shaped floor sections), cars remain still when they should on slopes, + other tweaks and fixes.

New 2socket vehicle preset

Merge from Vehicles -> Glass

Minor fixes for gibs

Updated armoured module icons to match their new look

Merge new car-to-player/ai collision work -> Main

Adjusting drag values after some more testing

Adjusting damage and force values

Mass edit

Add additional drag when hitting things as well

Make IHurtTriggerUser server-only

Add an appropriate approximated collision damage and hit force to the car when it hits a human or animal

Merge modular car mass and engine power changes -> Main

Minor engine power edit

Adjust engine power output to match vehicle weight reduction

Reduced the mass of all modular car parts by 25%

Merge modular car save file fix -> Main

Fix vehicles thinking they're in a non-working state when loading saves

Merge from Main -> MoreModularCarWork

Remove F10 screenshot option again as the image FX don't upscale, defeating the point. ☹️

F10 now takes a large screenshot with FX (AA, DOF, sharpening) still on, much like F4 does. Also fixed a bug in F9 screenshots, they now disable AA as they're supposed to.

Gibs can now inherit velocity. Car module gibs now DO inherit velocity.

Merge from Main -> Vehicles

Merge vehicle decay changes -> Main.

Fix decay tick time scaling

Don't damage engine internal items when damage is of the decay type. Removes the need for the player trick of removing engine internals from stationary cars to stop them decaying. Don't decay modular cars at all if they're on a powered vehicle lift.

Make the other Health hurt methods non-virtual, since none are currently overridden and they all call into the main one.

Merge hackable crate mass increase -> Main

Increase HackableCrate mass from 500kg to 1500kg

Merge from Main->Vehicles

Make sure modules have SOME health when initially spawned in

Fixed armoured passenger module not disabling side window colliders when the panel was disabled (health conditional). Added one more vehicle preset.

New vehicle presets that use the passenger armoured module

Front sliding windows now functional on the new armoured passenger module.

Added item and icon for the new armoured passenger module. Renamed it from 1module_cockpit_armored_passengers to 1module_passengers_armored. Manifest rebuild.

Remove obsolete comment component from vehicle module base

Fix NRE in DisableInternalCollisions when net is null

Do both entity comparisons in HasEntityInParents, as is done elsewhere.

Do the IsOutside() check from the bounds mid point instead of the top, but continue on if the hit collider is part of the entity doing the check. Makes the outside check more reliable.

Reduced ScrapTransportHeli outer bounds to match its actual size, they were massive.

Added gibs for all the different panels that fall off modular cars as they take damage

Fix hot air balloon collider being present even when the balloon is not inflated

Adjust car front/rear hurt triggers

Reduce car collision damage to players and to NPCs

Stop the ridable horse's saddle from complaining that it can't switch parent to the ragdoll when the horse dies. It doesn't seem to need to switch, so I'm letting it be destroyed silently with an override - same as existing behaviour, but without the logging. Fixes "SwitchedParent Missed horse.corpse" server log spam.

Merge from Main -> Vehicles

Fix cars sliding weirdly on slopes, also improve the "handbrake" when dismounting cars at low speed, so they'll properly stay still

Merge from Main -> Vehicles

In extremely rare situations, TryConvertPositionToSocketIndex could fail on the client, with the modules not yet positioned correctly. Sync the socket index as a reliable replacement. Protocol++.

Change bumper world colliders from a capsule to two spheres, attempting to reduce the chance of getting stuck in something

Add a power pole to BillBTestMap

Removed the distance var from carstats as it didn't work well

Fix carstats NaN max health showing on partial cars

Not vehicles - fix spelling mistake in the description for window embrasures: form -> forms

Fix power usage showing as 1 when selecting the vehicle lift in the inventory. Now correctly shows the real use as 20

Merge from Main -> Vehicles

Merge from Main -> Vehicles

A couple of minor edits to the new carstats var

Added carstats console var