]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Fix udder wooly reagent creation V2 (#32905)
authorBaa <9057997+Baa14453@users.noreply.github.com>
Mon, 16 Dec 2024 12:53:21 +0000 (12:53 +0000)
committerGitHub <noreply@github.com>
Mon, 16 Dec 2024 12:53:21 +0000 (13:53 +0100)
commit1f4241341603a23b6b8b4f2b60afb0f0a8e81e29
treefecc00edc706cd6097182b3631195555b8fd392a
parentd5323332a682a4be1143cc439d7dd2b4f7a61733
Fix udder wooly reagent creation V2 (#32905)

* Changed comments to be more clear and uniform.
EggLayer uses NextGrowth instead of frame accumulation.
Egglayer uses much less energy to make eggs, and lay time is randomized for player and AI chicken.

* UdderComponent ReagentId can be changed now
UdderSystem and WoolySystem use SharedSolutionContainerSystem now

* Entities with udders can be examined to see a rough hunger level
udders and wooly stop reagent generation/extra nutrient usage once the solution container is full

* Moved stuff to Shared
AutoPausedField now

* Cleanup moving stuff to Shared

* Oops. Make UdderSystem sealed instead of abstract.

* Switch PopupEntity for PopupClient

* Didn't mean to delete Access

* new() instead of default! prototype
revert egglayer balance change
NextGrowth += timespan   in egglayer

* forgot [Datafield] for NextGrowth

* forgot NetworkedComponent again...

* Renaming Shared Animal to Shared Animals to match Server
Hopefully also resolve merge conflicts.

* Fix incorrect filename

* Update with requested changes
Put UdderSystem dependencies in alphabetical order.
Initialise NextGrowth for Udder and Wooly components on MapInitEvent.
Clean-up EggLayerSystem a little.
Re-write OnExamine function for UdderSystem, improving clarity.
Add full stops to end of udder examine locales.
And more :)

* Add some additional descriptions for cow hunger levels.

* Add Udder and Wooly quantity to AutoNetworkedField

* Account for less than starving threshold.

---------

Co-authored-by: sirionaut <sirionaut@gmail.com>
Co-authored-by: Sirionaut <148076704+Sirionaut@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Content.Server/Animals/Components/EggLayerComponent.cs
Content.Server/Animals/Components/UdderComponent.cs [deleted file]
Content.Server/Animals/Systems/EggLayerSystem.cs
Content.Server/Polymorph/Systems/PolymorphSystem.cs
Content.Shared/Animals/UdderComponent.cs [new file with mode: 0644]
Content.Shared/Animals/UdderSystem.cs [moved from Content.Server/Animals/Systems/UdderSystem.cs with 62% similarity]
Content.Shared/Animals/WoolyComponent.cs [moved from Content.Server/Animals/Components/WoolyComponent.cs with 66% similarity]
Content.Shared/Animals/WoolySystem.cs [moved from Content.Server/Animals/Systems/WoolySystem.cs with 74% similarity]
Content.Shared/Nutrition/IngestionEvents.cs [moved from Content.Server/Nutrition/IngestionEvents.cs with 96% similarity]
Resources/Locale/en-US/animals/udder/udder-system.ftl