Fixed two modular car presets not having an engine!

water entry sound tweaks

Cherry pick Mac IL2CPP build fixes

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

Fixed Holmzy's barrel problem

phrases

Above ground pool now has more health

Barricade cover spawn changes

moved Easter menu video back into archive

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.

merge new tea icons to main

▆▆▍▄▍ ▅▉▌▄ ▍▆▄▋▄▍ ▄▌▅▅▄█▍ (▉▄█▆█▉▅▄▅▅ ▌▆ ▍▆▅▆▅)

network++

~ merge from mixing table

picking 53426

Mixing table crafting cost changes

Roofs cost the same as floors (build + upkeep) since they also have the same health

Square / triangle roofs no longer try to join when placed next to each other in a straight line (only triangle / triangle will)

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).

mixing table, tea, and berry sounds

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

fixed layering issues on the mixing table causing ground watch to fail

▇▇▆▊ ▅▊▌▌ ▉▋▌▋▉▅ ▅▉▇▌▍ ▍▉▅▄▊▄▍ ▉▆▄▊▍ ▉▆ ▅▊▇ ▋▆▊▄▄ ▍▆ ▄▋▄ ▊▍▉ ▉▋▅▄▆▌ ▅▇▉▉▅ (▄▉▋▍▌▇▉▇, ▉▋▌ ▄▅▍ ▍▉▍▍ ▍▄▇▊▋▉▍▋ █▍▆▉▄▅▊ ▉▍▉ ▅▇▆█'▉ ▆█▋▊ ▊▍▅▇▆▅▇▊) ▉▋█▌▆▍▄ ▌▉▄▄▊▊█▊▍▇ █▉▋▉█▅▅ ▍▌▇▌ ▇▊▄▇▋▉ ▄▌▉▊▍▇ ▆▉▄▅ █▅▄▆ ▇▅▍▌▊ ▉▄▅▉▆▌█▊▆▉▍▄ ▋▍▅ ▇▌█ ▋█▆█▄█▍▋ ▌▌▄▉▅▊▅ ▊▅█▍▆▆▌ ▉▊▄ ▍▄▄▊▆▌▍++

Reduced bone arrow thickness

Fixed getting dismounted while flying low over AirWolf on HapisIsland

Fixed supply drop flying away after getting hit by projectiles

merge from /main/stairs_upkeep_fix

merge from save197

Merge from summer_dlc_skin_reassignment

menu background video update

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).

fixed cave small easy missing culling volumes

T1 vehicle parts crate now spawns two vehicle components

merge from save197

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

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.

Phrases again

merge from mixing table

phrases

merge from door_open_blockage

~ merge from mixingTable

~ network++

Merge from hostile_safe_zone (only show hostile marker when within 200m of safe zone)

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

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

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

Skin bundle update

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.

~old manual skin approval

Subtracting 53182 (SimplerBuildingColliders) since it doesn't improve performance and makes things more difficult to work with for artists and less unified

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

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.

Fix bunny onesie viewmodel casting shadows

Merge from patrol_heli_wash

Merge from summer_dlc (liquid spec fix)

Merge from summer_dlc

Fixed save loadout command sometimes saving items in an incorrect order

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

Change the order of the inventory loadout command parameters to start with the loadout and not the target player/range

Merge modular car mass and engine power changes -> Main

Merge modular car save file fix -> Main

merge from SimplerBuildingColliders

~ coffin can be locked - modded request

Added some more console responses when using the inventory loadout commands Added inventory.listloadouts to list all saved loadouts Loadouts will now save the contents of an item, so weapon attachments will now be saved/loaded

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.

Merge vehicle decay changes -> Main.

Pressing the up arrow key while typing a demo name in the demo recorder UI will now fill in the last recorded demo name (for easily naming takes like 001, 002, etc)

Merge hackable crate mass increase -> Main

~phrase fix

Merge from monument_hierarchy_flatten

Merge from midiconvar

~ phrases

Updated HBHF sensor description to match the true detection range Slightly increased HBHF range (15m)

Fixed White Volcano Firework typo

merge from modder_prefab_requests

faster water pumps and pumps yield more water per pump

~ Added Hapis Farming vending machine for map makers

Merge from thirdpersonskins (bone club, bone knife and satchel charge skin fixes)

~Merge from midiconvar

Don't open crafting or inventory while debug camera is active

Don't show hostile note if LocalPlayer no longer exists (like in a demo)

Adjust turret lerping so it isn't framerate dependent (will need testing on staging)