1,641 Commits over 579 Days - 0.12cph!
Fix the 20 cases where flags are colliding by reassigning to a free one
RidableHorse had 1 left, lucky me
Also catch flags declared inside static helper classes like VendingMachine.VendingMachineFlags, finds one more case
The existing PrintDefinedFlags tool also didn't account for this, works now
New automated test that looks for flag collisions between entity types
Finds 19 cases (most harmless, e.g. reusing DemolishFlag on entities that don't support demolishing, but still good practice to clean them up)
merge from supermarketceiling_lowobjectquality_fix
▆▅ ▇▊▄█▇ ▅▊▊▆ ▇▆▄▋▍▄█▅▉▉█▍▅▆█▍▇▋█▍▍▄▆▍▆▉█
merge from sculpt_admingui_fix/better_panel
merge from 3p_hatchet_aiming_anim_fix
merge from NettingImpactFX
merge from autoturrets_LODcomponent_fix
merge from foundation_guide_fix
merge from sunglasses_lens_material_fix
merge from blueberry_med_LOD_fix
merge from minifridge_emissiveleak_fix
merge from sculptures_blurry_textures_fix
merge from convar_rounding_fix
merge from rentableshop_deepseamanager_pool_fix
▆▉ ▄▉█▌▌ ▉▇▊▆ █▅▅█▄▄▊▉▆▄▋▋▉▇▆▉▊▉▅▍▍█▋
Also reapply
138986 "Fixed shadows inside radtown master house building with a custom shadow proxy"
Reapply
138981 "Fixed shadows inside oilrig level6 rooms. Modelled custom shadow proxy" from 9 month old branch
S2P large oilrig
▌ ▅▊▌▉▉ ▍▉▊█ ▄▆▄▋▄▇▋▄▍▊▄▇▄▌▅▅
Fixed static chairs on gas station roof never being mountable due to being ever so slightly clipped into the ground (S2P)
https://files.facepunch.com/cipeax/2026/August/18_11-18-MajorGalapagostortoise.jpg
▆ ▍▆▆▅▆ ▋▍▄▍ ▍▅▄▇▉▆▌▅▋▆▅▇▇▅▋▅
merge from automated_testing
merge from automated_testing
merge from main
need to reapply 2 changes
Regenerate testlist, all new ones pass
Manually reduce network range of VineSwingMountable and GenericMissionLootContainerReusable(not in tests due to not having LODs, but should be good to reduce)
Reduce network range to 128m for:
- loot_trash
- door.hinged.cargo_ship
- door.hinged.vent
- fogmachine
- turret_attackheli
- door.hinged.tugboat.door
- _base_car_chassis.entity
- modular_car_camper_storage
- ziplinemountable
- _cardtable_base
- cctv.static
- clan.table
- audioalarm
- cabletunnel
- doormanipulator
- pressbutton_officeelevatordown
- pressbutton_trainstairwell
- wheelswitch
- big_wheel
- bigwheelbettingterminal
- smallcandleset
- marketterminal
- sled.deployed
- dynamicmissionstash
- logstash
- missionstash
- explosive.timed.deployed
- explosive.timed.entity
- metal_detector_flag_deepsea.entity
- metal_detector_flag.entity
- survey_charge
- gunnertest
- boombox.static
- cassetterecorder.deployed
- connectedspeaker.deployed.static
- microphonestand.deployed.static
New automated test looking for entities that cull <128m but have network range 256m (can safely be reduced to 128m), uses Ian's network range audit tool
Finds 36 leftover cases, need to double check none of them cause issues when reduced
merge from static_chair_variant
Reapply gas station chair fileID change
merge from main
stomp gas station
merge from train_tracks_not_connecting_fix
merge from automated_testing
merge from misc_fixes_aug_26
merge from fix_spectate_chat
▊ ▌▇▍▍▊ █▄▆▆ ▌▄█▆█▋▄▌▇▉▌▇▆▋▄
▅ ▉▊▋█▌ ▄▉▅▌ ▄▆▋▋▋▅▊▆▇▅▊▅▄█▍▍█▇▇▉▄▅▆▆▆▊
▊ ▆▍▉▄▍ ▉▍▄█ ▇█▄▆▄█▆▊▇▋▉▌▍▄▌▆▉▋▄▋▋▌▌▆▌▊
