Post merge fixes

merge from main fix conflict in ConversationData, bumped VehiclePadRepaired condition type

Merge from animal_fence_sound_polish

Updated huntingtrophy prefab to allow different sheep colourings to display correctly.

Mask sheep face when shaving (only disappear when fully shaved), have shaved areas more organic looking and wavy

Fix sheep failing the network range audit tests Dont advise reductions when an object is using just regular unity lods - forgot binoculars would scale unity lods

Fix through collider wrong layer, breaking groundwatch

S2P ferry terminal, radtown and oil rig

Merge from main Had to text merge all the Test fixture/runner merges as semantic merge hates those files for some reason WIll need to S2P some monuments

Reverts my changes to odds for good and bad genes, instead make white sheep the good one

Fix non-inbred cows being more solid on the whole body instead of just masking/tinting specific parts

Hunting trophy sheep model updated

Hooked up mount/dismount animations for cow

Fixed cow using croc protection

Hooked up temp icons for new pies

Added visual food entries for the cooking workbench for the new pies

Swapped icon for milk interaction

Removed the list of ovenCookingFlagItems from CookingWorkbench, replaced with a new ItemModCookingWorkbench Makes it easier to setup new items and removes a big string comparison client side

Swapped the eat sfx for drink on milk

Shave two pixels off each category button in the crafting menu, fixes categories overflowing

Compile fix

Harvesting a sheep will now reward you with the wool that was on it at the time of death Fixed server compilation causing the visible lead mechanic not working in builds

Lambs no longer drop dung (syncs them up with calves)

Fix sheep not dropping dung

Client compile fix

New mutton pie with rich version Increases the speed that livestock animals bond to the player, also prevents bulls from charging Regular pie halves time to reach Bonded status (can be led), rich pie reduces takes another 30s off the time it takes to reach bonded

Cow animation updates

New beef pie Increases the maximum amount of food that can be consumed by a player for a duration by +75% (875 calories) More food = more chance to recover when downed, if hunger bar is full after eating a beef pie recovery chance is 75% (calculated after medkit which still guarantees recovery) Also included a rich verison, can go up to 1000 calories and takes recovery chance to 100%

Don't show the mount animal prompt if no animal is being led by the player Allow a mounting slot to control which animal type it supports (large/small) Cows no longer fit in the small flatbed, need to use the large flatbed

Hooked up mounting animations

Make bad genes more common, most sheep / cows then look generic, and good genes ones eg black sheep become rarer to find (else because of dominant good genes we get a massive majority of black sheep)

Fix sheep material looking wrong when dung gene is maxed out

Experimental livestock name localizations

Lamb & sheep shear FX

FX progress

merge from critter_animals -> Livestock_animals

FX progress

Shear FX texture tweaks.

Shearing FX wip.

sheep mount animation update with root motion

Added sheep trophy head to hunting trophy prefab. Fixed issue displaying male calf in female ragdoll.

Sheep mount animation update and cow look animator updated to use all neck bones not one

Merge from mounting

Use more bones for the sheep look at

Make livestock more deterministic at high timescales, to be able to run long running tests faster

Set up wool dropped world model and item icon hooked up .item with new icon and .worldmodel

Add visual rope when leading livestock, same as horses, and fix leading interaction failing intermittently

Fix sheep using old material system mixed with procedural material, fix some ragdolls don't having same material as live animal

Livestock small fixes: - increase livestock headbutt damage, you better dodge this sideways like croc or 2 shot naked - fix "stop leading" prompt appearing when someone else is leading the cow - fix grazing through walls - fix bulls attacking in safezones - make leading bull strop fighting others - fix calves not having father genes if father dies between conception and birth

Make autotest_run refuse when another process already holds the game server port