133,176 Commits over 4,262 Days - 1.30cph!
AddIslandBounds now uses a TryAdd, unsure how duplicates are ending up here
Merge from main
HoldType.Construction override controller conflicted, used the version on this branch as it's more likely to be up to date with newer animations
building_planner.entity conflicted, used the version from main
PlayerAnimation.controller, 1module_cockpit_with_engine, player_model, PlayerModel.cs and PlayerModel.IK.cs all merged with no issues
Fix s2p failing on tropical4 when trying to pop terrains from an empty buffer list.
Rebake tropical4 mesh + s2p
Rebake tropical3 mesh + s2p
Rebake tropical2 mesh + s2p
Clean up mesh chunk folders + remove old versions
Rebake tropical1 mesh + s2p, set chunks/collider to terrain layer.
Moved a trash bag on docks C that was blocking movement annoyingly.
Renamed a mat to be more descriptive instead of Test.
Improved it.
Fixed deep sea editor flags and dupes.
Added meshterrain script to decor boats A & B
Commit the material changes that keep showing up.
▊█▉▇▄ ▌▉▌▋ ▍▊█▊▉▍_▆▆▌▊_▊▋█▊▆▆.
▉▆▌▊▇ ▉▉ ▌▇▇▇ ▊▉▌▍▆▅ & ▌▊█▆▅▇ █▉▊▍▌▌█▆▋▆▄▉▉/▊▆█▇▄.
▊▇▅▉▉▊ ▍▊█ ▉▉▄▌▄▇▍█▄▊▊▋▍▍ ▅▉ ██▇▇ ▉▍ █▇▇ ▊▌▅▌ ▍▍▍▅█▌▊▋█ ▄▅▊▆▅ ▋▊▆▊ █▄▍▅▅▊.
▇▌▊▅▋ █ █▉▋▉▅ ▋▊ ▊█ ▄█▌▄█▅ ▋▇▋ ▋▊▄▍█▄▍▋ ▋▆▋▉▅▉. ▄▍▊▊▌ ~▊▍ ▄▍▊ ▅▇▊▅ ▅▋▉▊ ▉▍█▄▇█▄ ▋▊ █▍█▌▌▍▍▋ ▄▋▉▌▋ ▋▊ ▋█▋▅ █▌▊▄▋▅▄▆ ▅▄▉▅▊▅▄.
▉▅▉▋▆▇▋▇ ▄▍▄▋▌▅▋++
Baked all heightmaps just in case
Bridged/eased more jump puzzles on high seas.
Added rowboat spawns to all docks variants.
Compacted ore spawns on 2
Added top ruins on 2
Unsaved splats apparently from 1.
Can specify chance of enabling effect.
Add a random delay on enabling.
Coords for ore spawners on 1
Hidden items have been removed from the item list. (removed a bunch of the junk items)
if the item is stackable, you'll recieve a random amount between 1 and the max stack size.
Bridged jump puzzles for these deep sea ruins.
Terrain adjustment for dwellings.
Cherrypick from
138740 (fix player teams error in kill entity mission event)
Merge from naval_missions
- Don't process 'kill entity' mission events if the kill came from a suicide
- When processing kill entity mission events replace the checks for InATeam() (which was checking current team ID value) with a check that the current team is not null
- Add a guard and warning log to InATeam() in case current team ID is valid but Team is null. After removing my usages there is nothing else presently using this function
Damage FX.
Added HealthVisuals.
Setup on smallengine.
merge from main/space_station_weapon_skin
fix missing sound class and template assignments on space lr300 sound defs 🤔
make one specific damaged boat sting sound less stupid
merge from main/naval_update/floating_cities/island_ambience
couple minor volume tweaks
merge from main/naval_update
New sound for deep sea wipe alarm
Add warning for missing spawn groups instead of just silencing them
