145,719 Commits over 4,444 Days - 1.37cph!
Merge from cinematic_speed_fix
Fixed some warnings being thrown when entering and exiting cinematic anims
▋ █▋█▇ ▊█▅▊▍▊▋▄▋█▆▇▊▉▅▅▉▍█▌▅▋▄█▄▇ ▊▅ ▉█▇█ ▄▅ ▄▉▄ ▋▆▇▉▊█ ▋▍▇▋▋▊▊▅
▆ ▅▄▅▍▋▍▊ ▉▉▌ ▄▇▆▋▉▍ ▄▉▋▄▇▋▄ ▋▉▌▇▅▆▍ █▋ █▅ ▇▉█ ▄█ ▋▋▅▅▋▊▇█
▅ ▉▊▋▄▄▄ ▊▆▌██▄▆ ▇▇▅▋ █▍▋▌▇▇▉▆▅▅ ▉▊▆ ▍▍██▆▍▄▊▇▆▆ ▄▌▋ ▌▊██▊▍ █▉▄▄▇ ▅▆▆▌▌▍▄ ▊▉▉ ▉▉▋ ▄█▄▅▅ ▋▉▌▉▊▊▉▋▋▍ ▊▌▇▌▇▄▅▋▌ ▌█▇▅ █▇▆▇▄▊ ▇▅▌▇█▇▉ ▉▊▉▉▆▄▅▅ ▍▋▅▊▆▊ ▍▊▆▆ ▊█▇▇▅█▇ █▅█▋▌ ▉▌ ▉▋▉▉▅▇ ▊▇▅ ▄▉▉▄ ▊▌▍▇▉▊▄▋▍▅ ▅█▅▅▋▍▋ ▇▅▆▇▅█ ▅██▍▊▆▆▇▌▊ ▇▊ ▊▅▄▆
▅▇▌▍▆▉ ▆▊▋▇ █▇▆▅▉▌█▆▇█▆▌▋▄▅▊▋▊██▋▌▇▇▄▄
▄ ▋██▇▋ ▇▊▉▊ ▍▋▌▅ ▅▊ ▊▄▆▊▍▇▇
Allow the 'retry' button to be pressed indefinitely
steam_retry_button_fix -> main
█ ▋▉▍▅▊▆▅▊▄ ▌▆▄ █▆▆ ▊▋▄▍▄▊ ▅▌▆▌▍▅▍ ▆█ █▊▄▍▋▅ ▅█ ▍▆ ▊▉█▌█▆▆▅ ▌█▉▅█ █▋ ▉▊▋▆▊▅▅█▉▇ ▊▍▉▉▄█▆▅▊ █▄ ▋▍▌▊▋▍ ▄▋▌▇▆▊▅▅▉█▅▆▅█▅ ▌▉▌▆▊▉▌▍▆▍ ▋▄▊▋▊▌ ▊▌ ▅▄▋▊▄▇▇█▇▉▄▅▌▉▍▍▍█ ▄▇▅▇▆ ▋▊▇▉▉██▌▊ █▇▍▇▇▅ ▉█▍▆▆▆▍▅▄▅▅▋ ▋▆▌▇ ▋▌▋▍▄▊▋ ▋▍ ▍▋▇▊█
Fix retry steam button not working
Cobalt Statue - Helix textures, material and prefab LODs
Possible threading fix for voice delay issue
Bypass dynamic pricing for rentable shops (they are player controlled but technically are NPC vending machines)
Enforce a 6 hour protection window from store takeovers
Add rentableshop.ResetTakeoverProtectionOfClosestShop convar
▊█▌▊ ▆▄▇▊▇▍▋▋▉▋▉▇▄▌▋ ▊▉ ▍▇▄▆▋▉▆▍▇▇▉▆▌▄▆▄▊▉▊▌▉▆▅
▊▍█▆▇▆█ ▊▄▆▆ ▅▅▋▅▅▆▊▋▍▇█▄▇▄▉▌▄▇▋▊▄█ ▋▇▅█▇▆▉▆ ▄▅▍▄▍▌▍▌ ▅▍ ▊▊▋▌▅ ▍▅▆▋█▇▆▇
▄ ▊▋▄▌█ ▍▅▍▌ ▉▇█▅██▋▄▋▉▅▆▌▍▍ ▌▍ █▅▍▆
▉ ▇▄▋ ▇▉▉ ▊▌ █▋▉▋▊▋▌▇█▊▅▄▍▊▊▌▆▄▌▌▅ ▍▉▊▋▊ ▄▋▍▌█▋ █▄▋▍▆▅ ▍▊▍▋▋▆▇█▊ ▊█▍▅ █▋▋▊▉▆▍▄▍▋▅ ▇▉▆▇▉▍▍▊▊▄▅ ▅▍█▅ ▆▇▆▄█▇ ▍▋▍▄▊▇▅▋▆▄ ▍▍ ▋▇▆▍▍▌ ▊▋▋ ▇▄▇▉▌ ▆█▍ ▊▋▍▇▋█▌ ▇▇▍▊ ▌▍▇▍▅▅▅▄ ▌▇▇ ▇█▊▉ ▊▊ ▊█▌▄ ▊▋▊▇▄▊ ▍▍ █▊▉▍▍▌ ▌▄▅▅ █▊▆▊▊▆ ██▊▆ ▌▆▊▍▄▊ ▅▅ ▊▊▄▉ ▅▅█▊▋▇ █▌▊ ▉▉█ ▄▅▌
Item id, world model fixes
merge from optimize_train_track_meshes -> main
Fix "Double invocation of a deferred action"
Fix null check using .Equals() instead of == null
Top floor progress
Reverted some material overrides in the core and wing prefabs
Fix CLIENT compile errors
merge from main -> optimize_train_track_meshes
▉ ▉▍▌▄█ ▆▄▍▄ ▌▊▍▊▊█▊▅▄▆▍▇▋
▉ ▍▉█▅▊ ▇▄▋▆▇▄ ▉▊▆▆▌▍▄█▋ ▌█▌▇▅▉▇ ▍▍▊▍▉▄
▍ ▊▌▆ ▊▌▌▉ ▊▍ ▊▆▌▅▉▊█ ▆▍▄ ▉▉▆▉▆ ▉▋ ▊▊▅▇▊▅▄▉ ▍▆▆█▊▋▆ ▅▋▆▇▇ ▉▅█ ▋▄▇▄▆▇█ ▇▍▅▄▅ ▍█▉▍ ▄▌▉▊█▅ ▌▇ ▆▇██▆▍
▍ ▅█▌▋▄ ▍▉▇▅▅▋ ▉▄▅▇ ▉▄▍▇▇▄▍▌ ▄▆▄█▅ ▉▉▅▇▄▌▌▉▌ ▄▉▆▊▍ ▉▆▉▊ ▉▍▆█ ▅▌▊ ▌▌▅▊▋
█ ▌▋▊▇▅▉ ▄▆▋█▍▌▉█▋ ▅ █▍▍▅▌ ▋█▍▉ ▅▌▌ ▋▆▌▍▍▉ ▋▋▆▍ ▍██ ██▊▊▆▉ ▌▄▇ ▋▅ █▊▉▄▆▊▋▄▊ ▆█▉▉▍▌▄▊▄▍ ▉▍█▋ █▇▌▆▆▊▍ ▋██▋▉▇ ▍▋█▉▅▍▌ ▅▍▌▅▋ ██▅▄ ▇▅▆ ▄▌▅▋█▇█▇▊█▄▅
▋ ▋▌▅ ▅▄▇▉▇▆ ▆█ ▄▍▉▇ ▆▄▋▆▆▅ ▉▄▆▄▅▉▌▅▊▄▅▌▅ █▍ █▋▍▅██▊▍ ▉▌█▅▅▉▉ ▄▄▆▊ ▅▌▌▄▍▌▊▆ ▉▆▇▆▌ ▄█ ▋▇▋▄▌▋ ▍▄▋▅ ▋▇▋▉▄ ▍▅▉█▇▄
▆ █▅▌ ▊▅▍▄▆▌▉▊▇█▌▋▌█▊▌▅▌█▊ ▅█▆ ▌▊▇▆▋▋▋ ▋█▄▋▉█▇▅▌▉█▊▉▇▄▄█▅▇▌▄▇▄ █▋ ▆▍▄ █▍▉ ▋▍▉▊█▊▄ ▍▆█▍▄ ▌▆▉▌▌ ▌▊ ▍▅█▍▋██▊▄▆█ ▆▋▍▍▋▋▄ ▋▊▇▇▅▄ ▇▅▆ ▅▆▅▇▄▆▌▄ █▇▍ ▌▆▄▄▄▊▌▅ ▆▅▍█▌▌ ▅▅▆ ▉▍▇▊▊▅▆▇ ▌▌ █▄▍▍█ █▋▆█▊ ▇▇▉▆▅▍▅ ▆▋▆▉ ▌▄▉█▉▍▇▅▅▋ ▊▅ ▋▇▅ ▆▆█▄ ▅▊▊▉▍▅ █▅█▋▍▄▉▉
Merge from findobjectsoftype_replace
Lighting WIP.
Tweaked gloss on tiles_A down a bit for lighting purposes.
▌ ▋▍██ ▆▋▄▆▍▋▆▇▄▊▋▄▉ ▆▊ ▄▍▋▅▊▅▉ ▍▅█▇▉▇▇▅▋▌ ▌▋▇▄▋ ▊▋▄▉▅ ▅▉▌ ▉▍▋▉▌▍ ▄▌ ▌▇▊▌▌▌ ▊▅▌▍▍▍▍▆
merge from apartment_complex_monument/prototype -> apartment_complex_monument
merge from apartment_complex_monument -> apartment_complex_monument/prototype
merge apartment_complex_monument/prototype/mailbox
Ok finally fix slide 3 being positioned wrong
RotateOnFlag was setting position so it could slide out but didnt have the 0.01m offset for slide 3 configured
gamesroom minifridge;
- greybox model updated
- updated prefab item reference for repair and pickup
