]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Tearable Deliveries V2 (#36815)
authorScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Thu, 24 Apr 2025 19:47:46 +0000 (21:47 +0200)
committerGitHub <noreply@github.com>
Thu, 24 Apr 2025 19:47:46 +0000 (21:47 +0200)
commita16504fa42bc2d41d1659db2bf96e1e70dcaafba
treef5cb0bf883f00ebaf33addfed70cd3ed68d6c0c9
parent6a567cbcb8df760319646399d5b83cb66ebc2278
Tearable Deliveries V2 (#36815)

* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* init or smth

* minor tweaks

* I KEEP MERGE CONFLICTING MYSELF

* comments

* no icon

* slight increase

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* partial review

* message

* review

* pain

* stuff

---------

Co-authored-by: Lmorgan89 <billsmith116@gmail.com>
Content.Shared/Delivery/SharedDeliverySystem.cs
Content.Shared/FingerprintReader/FingerprintReaderSystem.cs
Content.Shared/Tools/Components/SimpleToolUsageComponent.cs [new file with mode: 0644]
Content.Shared/Tools/Systems/SimpleToolUsageSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/delivery/delivery-component.ftl
Resources/Locale/en-US/tools/simple-tool-usage.ftl [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml