]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Trading Outpost now has half buy-only and half sell-only pallets (#25955)
authorwafehling <wafehling@users.noreply.github.com>
Wed, 13 Mar 2024 23:26:25 +0000 (18:26 -0500)
committerGitHub <noreply@github.com>
Wed, 13 Mar 2024 23:26:25 +0000 (10:26 +1100)
commitc0bbbc33c19eafcc8defaa7f1ec2df42e485b435
tree20928d1555394ed5f76581737080021f929a8c56
parent85e0a5328a28b02fc29575648cfa7421f5bfb410
Trading Outpost now has half buy-only and half sell-only pallets (#25955)

* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Content.Server/Cargo/Components/CargoPalletComponent.cs
Content.Server/Cargo/Systems/CargoSystem.Orders.cs
Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
Resources/Maps/Shuttles/trading_outpost.yml
Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png [new file with mode: 0644]
Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png [new file with mode: 0644]
Resources/Textures/Structures/cargo_pallets.rsi/meta.json [new file with mode: 0644]