143,902 Commits over 4,413 Days - 1.36cph!
Merge from main
DIrectory conflict on Clothes/vest.metal/vert.metal.female (deleted on this branch presumably to fix the typo?), preserved the delete
Many conflicts across clothing and vehicle prefabs due to the Entity Label cleanup, all merged automatically so should be safe
█▉▄▇▆ ▅▋▇▆ ▄▄▋ █▄▅▇▅▄█ ▋▌▉▊▇ ▉▇▌ ▄█▉█▊▌▍▇▉
▇▄▊▍ ▇ ▇▌ ▇▄▇▉ ▅▄▍▋▅▇ ▌▇▄▊▄ ▇▊▇▄ ▅ ▌▌ ▍▋▅▄ ▍▊█▅▆
▌▋▍▋▍█▇▌ ▍▍▌▇▇█▄█▍▆ ▇▊█▌ ▅▇▆▇▆▆▉▄ ▇▌▊▌▇█▇▉▍▄ ▊▆▉▍ ▊▌▅▋ ▌▉█▉ ▉▉▋▄▉ ▊█▉▆▅▆ ▌▊▍
▅▊▄▆▋▇▆▇▄ ▇▊▍▉ ▌▅▅ ▍▌▅▍ ▉▄▍
▊▇▇▍ ▇▉▋▌▍▄▍▅▌ ▆█▉▉▆▅▉█▌▌ ▉█ ▆▇▆▇▊█▋█ ▊▉▄▋▄▉▉▉▄ ▍▄█▌█ ▊▄ ▉▉▍▋▌▅▌▉▌▉ ▄▅▉█▆▊▅▊▅▋ █▋ █▊▊▄▇▌▌ ▄▊ ▌▋▆▌ ▅█ ▄▉▉▋ █▍▉▉ ▇▍▉▋ ▇▆ ▅▆▌▉ ▋▄▆▅ ▌▋▍▋ ▋▌▆▇ ▆▊ ▅▅▅ ▅▊▄▍ ▌▍▅▆▄▋ ▅█ ▋█▉▍ ▊▄▄▆ ▌▊▋▋ ▋▅ ▊▆▄▊▍▉▆▄
▅▄▊▋▌ ▊▇▆▋▊▆▇▅▋▋ ▌▅▊▄ ▅▆▊▊ ▅▇▊▉▊▄ ▌▄█▄ ▊▅▄▍ ██▍▋▋█▌▍▍ ▄▉▍▇
▊▋▍▉ █▋▌▋▊▆█▉█ ▆▄▆▋▄▄ ▋▅▇█ ▌▆▍▊▄ ▌▄▊▆ ▊▊▌▍▄▋▆▇▍█ ▌▋█▄▋▉
rentable shop be interior split
▍ ▋▄▄▆▊▋▆ ▌▋▇ ▅▊▊▅▌▋▊▌▄ ▆▊ ▆▇▉█▊▊▌█
▍ ▅▊▊▇▌▌▆▉▍ ▌▉▆▉▋▊ ▍█ ▌▆ ▍▅▍▊█ ▅▍█▇ ▋▇▌▄█ ▊▉▊▉▊▆ ▄▍▊▋ ▊▅▊█▍▄▆▍▋ ▊▍▋▅▍▆ ▅▍█ ▍▋▊▍▉▌ ▌▆▄ ▇▋
▇ ▆▉▄▍▆▉▋ ▅▌▊▆▆▄▊ ▋▊ ▉▋▅▉█ █▊▅▆▇ ▉█▇▆ ▄▌▇ ▊█▅▉▅
▋ ▇█▇▊▊▅▆ ▌▋█▌▅█▉ ▌█ ▋▊▍▅▊ ▍▉▌ ▇▋ ▋ ▊▍▅ ▆▊▆▊ ▇ ▊▉▊▌█▇▆ ▄▉▌▊▇▇ ▆▉▆█ █▋▅█
merge from /main/hackweek_techtree_multi_unlock
new tech tree unlock sound and varation for repeated sounds when multi-unlocking
▌▆▋▌▅▆ ▋▋▆▄ ▍█ ▋▉▌▋ ▊▊ ▄ ▌▇▉▇▆▋ ▌▋▋ ▌ ▄▇▋▅ ▋▆█ ▆▅▄▍▇█▆
▋▊▇█ ▆▉▌▋▍▆█ ▍▇██ ▉▋█▄▄▅▄▄▉▉▉ ▍█▇█▊ ▆▇▊▉▇▉▌▋▋ ▋▍▄█▇▊▌▍▅ ▆▌▍▊▋ ▅▋▉▌▍▋▉▇█ ▉ ▊▆▉▊▍▅ ▍▍▋▆▆▅▍ ▉▅▍▋▄ ▇▄▉ ▋▉▊▉ ▌▋▋▍▍▆ █▉▉▌▅▄▅ ▄▍▇ ▍▅█▉▍▌▄▊▍ ▄▉ ▄▇▍▌▋▍ ▅▄█▅▄▋ ▄▌▊▇▋ ▄▌▉ ▍█▋▊▉▄ ▅▉▄ ▋▄▍▍▊▇ ▅▉ ▍█▅▄▍█▅▍ ██▊▆█▆▊▄█▊▉▊▇▇ ▊▋▉ ▄▊▄▄▋ ▇█▉▋▋▊▊▉ ▍▍▉ ▊▄▊█▆▉ ██▌▉▄▋▉▆▊▋▇█▍ ▋▄ ▍▋▄▆ ▋▊▉▍▇
▋▄▍▄▇▌▍▋ ▋▉▄▇▍█ ▄▆▍▆▍▆▌▉▋▌▇▆ ▆▆▋▌▍ ▊▉▊▌▆ ▍█▇ ▊▆▇▍▆ ▇▌▅▍▍▍▊
▊█▉▊█▄ ▄▋█▌ ▉▋▉ █▊▄▄▍▍█▉▄▇▅▅▍▉▍▆▆▅▅▋▉▅▅▆▅ ▄▉▋▌▌▄ ▆▄█▍ ▋▋█ ▅▋▍ ▇▊▄██▉ ▉▄ ▉▆▊▇▄ ▄▆▉▋▍▍ █▋ ▋▆▇▌ ▄█▊▆█▌▄ ▇▌▆▉▄▌ ▊▉▄▊▆ ▉▇▍▄█ ▊▅▍ █▅▇▅▉▇▋▉▇▄▌▋▄
▅▉█▍ ▄█▋▆▅▊▇█▉▌▉▅ ▌▅▌▇▅▇ ▌▄▌▄▍ ▅▇ ▌▄ ▇▉▉▅▄▋▄▉▌█ ▍▄▊ ▊█ █▌█▇▄▋▊▇▋▌ ▋▇▄▄█▉▌
combat knife and sunken knife projectile correct rotation and weapon rack deploy correct rotation
▄▍▄▉▅▊▌ ▆▌▍▌▌▅▌▅▌▍ ▌▌▉▍▌▉▇▊ ▋▆ ▍▌▅ ▇▌▋█ █▍▅ ▊▅▊
▉▊▇▇ ▋▌▇▋▋▉▅▄ █▆▉▆▉▆▋ ▅▋▉▇ ▄▉▄ ▇▆▉ ▇▍ ▉▇█▄
Minor cleanups
Rework CCachedRenderData bounds checking
* Is now a warning + more checks
Fix armor UI element being slightly longer than HP UI element
HP and Armor HUD expands to fit 4 digits when necessary
Slightly adjust ammo HUD to fit 9999s comfortably
Default HUD supports showing Clip2 if weapon uses that
* it also supports cursed combinations like secondary and primary without clips at the same time, primary without clips and secondary with, etc
Try to fix ammo counter being red/orange when having ammo
▉▅▍▍▌▄█ ▋█▌ ▊▉▄ ▆▅▄▋▄ ▋▇▉ ▄▄▇ ▇▌▊▄▄▋▆ ▄▉▇ ▇▋▊ ▊▊▍ ▉▉▆▅ ▄▄▋▋▍▊█▉▍▆▋█▄▊▉ ▄▇█▋ ▋▊▉▍▋ ▌▇▇▄▇▋▌ ▍▌▍ ▇▇ ▄▌▅▇▆▋
▍▌▆▊▇▅ ▄▆▇█▌▋ █▋█ █▆▇▊ ▄▇▌ ▌▄▆▅▌█▋▍▌ ▌▅▇▄▋▌▍ ▉█▌ ▇▊▄▉▅▇▋
█▉▊█▍▇ ▉▋▆▅ ▅▍▋▆▋▋▌▋▊▊ ▆▉▊▊▅▉
▇ ▇▌▊▅▌▌▋ ▋▊▆▌▍▅ ▍▆▅▆▉▄▋▊ ▄▆▋ ▍▉▇▇▍▄█▅ ▆▆ ▉▊▉▊▉ ▍▍▌█▌▋ ▊▋▇ ▌▋▌▊ ▄▉▋ ▇▉▌▅▇
Merge from 3p_spectator_improvements
merge from camera_fog_fix
further reduce fogging in cameras
set crypt building skin to
10472 and set up steam item and temp icon
industrial shelving texture pass updates
Bowless Crossbow - updated textures, added transmission texture to bowstring
Set up inputs for new RRP compatible standard shader
