13,101 Commits over 2,376 Days - 0.23cph!
Don't save child storage containers of a workcart if the workcart itself isn't going to save
Disable deep sea in Bill B test map and move it to the Dev submenu
Restrict vehicle checks to PlayerHelicopter and BaseBoat just in case
Updated deep sea teleport checks to check for all vehicles, not just helicopters (still checks list of vehicles on deep sea manager)
Should fix submarine smuggling
blockPlacementOnChildEntities toggle on Socket_Specific entities now runs the player boat check from SocketMod_BoatBuildingBlock
This should ensure any entities that are blocked on the tugboat should be blocked on player boats
Merge from space_station_skin_fixes_jan26
▋▇▄▊▉▌ █▍▉▄▇ ▅▇▄▉▌▄▌▄▇▆ ▍▌ ▍▇▅ ▋▅▍▄▋▌▋█▌ ▋▉█▅▄ ▇▄▅▊▅▋▇▌▆ ▄▆▋▌█▌ ▌▉▄▇▇ ▄▆▄█▆██▌▅▋▆▊▋▄▍▆▋▅▌▉▌▍▌▍▋▍▄▆▉▄▅█▄▋▍▅▄▊▇▊▇█▊█▋▊▍▋█▊▄▇▆▋▉▅▇▅▋▆▇▅▆▅▊▌▉▄▅▌▆▄▌▅▆▇▆█▅▅▄▆▋▍▍▋▆▆▆▋▋▌▍▅▇▅▅█▌▌▄▍▊▊▇▍▉▄▉▅▍▍▍▊▆▄█▇▆▌▉▇▌▇▅▇▅▋▌▅▅▋▊▆▄▄▊▅▉▍▆▆▋▄▌▌▍▇▌▆▋▌▆▍▇▋▅▆▉▄▌▌▅█▍▅▇▊▉▅▇▆▋▆▊▇▉▋▉▆█▌▌▊
▅▇▅▅ █▋▆█▊ █▅▊▉▇▊█▅▉▌ ▊▇ ▆▊▉ ▊▊▋▌▍█▅▄▌ ▆▇█▋▊▍▄▄▄▅▌█▉▍▋▉▄█▊▋▄█▌▋▊▉▋▍██▆▆▅▋▆▍▅▋█▊▌▊▆▄▌▅▄▋▄▆▌▍▉▇▌▌▉▋▅▅▅▄▉▊▌▉▇▌▋▋▇▇▍▍▌▇▆▌▌▉▉▍▍▆▉▇▊▌▍███▊▇█▌▅▊▅▆▌▆▍▆▌▉▍▉██▉▊▌▊▉▆▄▇▄▉▌▉▌▇▆▌▋▊▉▄▆▉▊▊▋▆▍▋▇▄█▅▇█▌▌▊▍▋▆▋▋▉▊▇▇▇▊▍▍▋▇▄▇▅▄▍▅▍▇▆▇▍▄▅▋▅███▆▋▌▆▇▉▄▄▇▇▍▇▋▇▆▄▄▄▇▌▌▉▄█▄▇▋██▉▅▍▆▉▋▍█▋▍▊▍▌▌▉█▍▊▊▋▄▋▄▅▊▉▋▊▇▆▍▋▉▊▋▅▍▄▅▊▆▊▆▅▊▌▍▊▉▄▅▋▅▋▇▌▅▌▉▄▄▇▄▉▍▍▇▆▄▇█▌█▄███▍█▋▉▄▄▇▅▆▉▌▆▍▄▅▉▅▉▍▉▋▅▋▉▊▉▆▊
Enlarge props_culled_base culling bounds on Y axis on all three oil rig feet, fixes junkpiles getting culled while players were standing on them (as they were just outside of the bounds)
S2P all floating cities
██▌▅▉▇ ▌▋█▆ ▉▉▌▌▆█▋▅▉▌▌▍▊▄█▋▊▋█
▇▌█▋ ▊▊▍▋▆ ▉▅ ▄█▌▌▆ ▌▌█▄▊█▆ ▇▆▉▍▉▍▋ ▌▍▅▌▇█ ▌▊▆▆▉▇ ▍▄ ▌▊▍▌ ▉▄▊ ▉▌██▍▉▄▉▄▊█▌█ ▊▅▌▉▉▇█ ▆▊▅ █▆█▅▉▊▉▅▄ ▌▅ ▆▅▊██ ▍▋▅
▆▊▊▍▋▅ ▅▋▋▄▅▌▊▋▄▋ ▆▇ ▇█▄█▉▍▌▍▉▄▌▉▇▌▉▋▍▆█▌ ▉▄█
Suppress PropRenderer warning in builds
Merge from main, very spicy merge
Vert.metal.female.prefab directory conflict - deleted on this branch but modified on main, kept the delete
Merged 388 prefabs
Manual conflicts, kept version on this branch:
sunglasses_blocky.prefab
FemaleUnderwear_twitch_legs.prefab
FemaleUnderwear_twitch_torso.prefab
MaleUnderwear_twitch_legs.prefab
Egg.suit.prefab
swimwear_01_legs.prefab
swimwear_01_tors.prefab
swimwear_02_legs.prefab
swimwear_02_torso.prefab
swimwear_02_torso.prefab
swimwear_06_legs.prefab
frankensteins_moster_01_legs.prefab
frankestenis_monster_01_torso.prefab
frankensteins_monster_02_head.prefab
frankensteins_monster_02_legs.prefab
frankensteins_monster_02_torso.prefab
FemaleUnderwear_mummywraps_bottom.prefab
FemaleUnderwear_mummywraps_fullbody_bottom.prefab
FemaleUnderwear_mummywraps_fullbody_top.prefab
MaleUnderwear_mummywraps_bottom.prefab
cake.entity.prefab
MaleUnderwear_coconut_Legs.prefab
MaleUnderwear_coconut_top.prefab
Underwear_female_coconut_bottoms.prefab
Underwear_female_grassskirt_bottoms.prefab
Underwear_female_grassskirt_top.prefab
▍▊▄▋▅▅ ▄▍▌█▆▋█ █▄█ ▌▅▌▇▍▉▌▆▋▄▄▄▋▄▉▋▉▆▇▇██▋▌▇█ ▉▉ ▅▍▅▊▅▋ ▋█▉▍▉▇▌▌ ▍▄▅▄▅▋▌▉ ▆▆▅▊▍█▇▄▄ █▄▆▄▋▍█ ▌▍▇▄ ▅▊▊▍▉▉█ ▋▋▇▆▋ ▊▊ ▋▌██ ▋▇ ▄▉▍▄▆▉ ▌▅▄▊▅▆█▌█▉▉▅▅▇ ▍▊▇▊▆▆▉█▄▄▍▇▆▄▍▉▊▊▊▍▋ ▇▊▄▅▄▇▌▆▅▇ ▆▇ ▇▇█▆▆▋▍▍ █▅▄▊▋▍█▌▌▍▌▉▅▊▊▍▆█▅▍▋▅▌▋▋ ▄▌▊▉▇█▌ ▊▄▇ ▅▊▇▇▄▍▍█▆█ ▋▅▋▊█▍▋▊▄▆
▋▇█▄▉▅█ ▍▌█ ▇▉▍▆███▆▊ ▆▌▊ ▉█▍▍▅▄ ▉▊ ▉▊▇ ▄▉▄▌▍ █▆▆ ▆▍▊▍ ▍▇█ ▇▊▌▌▋▇▍▅▌▄▄▉▍▇▇ ▅▌▋▅▍▋ █▊▉▋▇▄ ▊▊▌█▄▉
Removed more colliders from shadow proxies on leg_shared_geo
S2P all floating cities
Merge from floating_cities
Remove overlapping couch on Ghost ship 1 (not using remove_static_couch branch due to conflict)
Merge from boatplanner_worldmodel
Merge from artist_pack_dlc
Ensure InitLOD is called before GetBounds, prevents unit cube bounds
Fixed UpdateBuoys NRE in demos
NRE's caused by setting the demo time will no longer stop shots from working
Merge from Reserialize_Prefabs_2
Restore module_1200x1800_2way
Movable colliders on reactive target are now parented to regular colliders
Possible fix for UGC items getting duplicated/incorrect images applied when entering network range of a player boat
Merge from artist_pack_dlc
Fixed reactive target collider not updating on the server
Reactive target gibs are simplified, gib meshes are no longer r/w
Reactive target fixes
Fixed ground watch floating in the air
Simplified placement sockets to 4 corners and middle, expanded all sockets
Fixed rotation axis
Lowered HLOD distance of floating cities 200 -> 100
Update ignore list to include new boxes
Merge from storage_adaptor_box_collisions
