cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,430 Commits 10 Branches 0 Tags 2.5 GiB
Commit Graph

26 Commits

Author SHA1 Message Date
wafehling 17ca360528
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>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
 2024-03-17 15:06:02 +01:00
Flesh 44613e6544
Made ordering multiple crates at cargo order multiple crates (#25518) 
* please tell me this is empty

* it wasn't empty, fixing that

* This should fix it

* fix for the fix

* address changes

* fix

* Added some comments, hoping that failed test was a fluke.

(cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)
 2024-03-08 12:54:53 +01:00
themias 554f664994
Fix centcom cargo gifts (#24701) 
(cherry picked from commit 3933490962993e839c71efea46c3e799ac824778)
 2024-03-08 12:54:52 +01:00
metalgearsloth fa3e17de86
Clear cargo orders on approval (#24278) 
(cherry picked from commit f82fd23f2c87b7cab852bdc2563cfa30c2d2a6dd)
 2024-03-08 12:54:51 +01:00
Debug 76d06416ab
Modify trade station for Delta 2024-03-08 12:54:50 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Nemanja 47d24fc3e5
Fix cargo product groups (#24212) 
(cherry picked from commit 21e77dffb00d631ea0e6a5c0ad55bed5dcbaa809)
 2024-01-26 23:13:54 +01:00
metalgearsloth b51b6f65b5
Add ability to put spesos into cargo console (#24263) 
I thought we had it already but maybe it was an unfinished pr or something.

(cherry picked from commit ad23facb7a9670bcc10e2f9e89d2e22db2052697)
 2024-01-26 23:08:06 +01:00
Leon Friedrich e66c0b5035 Un-revert IPlayerManager refactor (#21244) 2023-10-31 19:00:44 +01:00
DrSmugleaf 9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
Leon Friedrich 9c2af43af6
Deduplicate & fix prediction reconciliation test (#18635) 2023-08-04 12:21:44 +10:00
metalgearsloth 68b56878bc
Cargo selling fixes (#17876) 
- Prevent selling dead mobs (getting used as easy corpse disposal).
- Fix a broadcast event being raised O(n) times instead of O(1)
 2023-07-09 13:24:48 -06:00
TemporalOroboros 3ac4cf85db
Cleaner BoundUserInterfaces (#17736) 2023-07-09 02:02:17 +10:00
deltanedas b9f24b2681
expedition rewards (#16972) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-16 15:19:02 +10:00
Tom Leys db81e59013
NanoTrasen might send Gifts to the station via Cargo (#16556) 
* Rebase Cargo Gifts

* Remove Chaos values from gifts (for now)

* Translate CargoGifts, rename fields

* Fix gift errors, detect missing products

* Fix order Id, some crate IDs

* Fix get Station. Gifts for Sec, Med, Fire, spacing

* Minimum players for various gifts

# Conflicts:
#	Resources/Prototypes/GameRules/cargo_gifts.yml
 2023-05-22 15:55:27 -06:00
Julian Giebel 6ebd784cb6
Device Linking and better linking ui (#13645) 
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-07 16:07:24 +10:00
metalgearsloth b65bfd1fcf
Don't sell non-dead mobs on cargo (#15228) 2023-04-09 11:59:41 +10:00
metalgearsloth 569f30b721
Cargo shuttle changes (#14363) 2023-03-23 16:10:49 +11:00
eoineoineoin 6722adcd83
Cleanup cargo shuttle/telepad order code (#13591) 
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2023-03-05 15:27:30 +11:00
eoineoineoin cd10d6fb5e
Minor changes to display of cargo order manifests (#12618) 
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2023-01-14 21:49:00 -04:00
Checkraze 66a01ccbf2
cargo system cleanup (#13396) 2023-01-10 20:55:59 +11:00
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Chief-Engineer eb18363bd2
Add multiple logs (#12857) 2022-12-15 19:33:27 +01:00
Marat Gadzhiev d610f2a56c
Order manifests for shuttle orders. Now with item names and approver info. (#9464) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-07-09 06:48:57 -07:00
metalgearsloth 77a8e16104
Add cargo shuttle (#8686) 2022-06-23 14:36:47 +10:00