Commit Graph

214 Commits

Author SHA1 Message Date
Jake Huxell 7be31aab33
Reduced Warning Count By 130 For Full Rebuilds (#26518)
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50

* final toCoords Removed

* Remove all unused variables and dead code paths

* remove always true variable, should be a cvar or something instead

* remove superfluous variables from tests

(cherry picked from commit 59e46aab93ca38f8d57fcad4e3a2c893737d9ad4)
2024-04-07 14:11:06 +02:00
blueDev2 3b03c5d498 Allow cargo bounties to be sold off-station (#26469)
closes #955

* Ported over code for delta-v to fix bounties

* Added requested changes

* Removed the station arg from "IsBountyComplete". It is unneeded and all calls just use a null value for it anyways
2024-03-28 17:14:50 +00:00
wafehling 14b72975df
Added 18 new bounties to cargo (#26160)
* Added 18 new bounties + tags, couple of balance tweaks

* Oops, 2 corn tags.

* Fixed another duplicate from merge conflict

* Fixed all arbitrage issues

* Removed metamorphic glass/manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Changed hiviz tag, removed commented out bounty

* Removed extra line

* Change HiViz tag

* Removed unused tag

* Removed LaceupShoes, changed HiViz

* Changed flavor text for fruit bounty

* Removed live mouse bounty

(cherry picked from commit 4357b9ef08fee0e08c4fdf4eeef714fa8eb38112)
2024-03-23 23:51:36 +01:00
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
Debug 6bd5092853
Fix some trading post oopsies (#956)
Fix 2 oopsies
2024-03-11 19:57:03 +00: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 7573dba496
Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades

* eek

(cherry picked from commit a9e89ab37221c4f5eff5a9e1d42e97c6f3e0753b)
2024-01-27 23:43:49 +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
ike709 fcebd56e8e
Appraisal tools check for cargo bounty completion (#23760)
Co-authored-by: ike709 <ike709@github.com>
(cherry picked from commit b8e8e6141a2115b43d79109b7f00c9fbfb863a5e)
2024-01-26 22:15:02 +01:00
AJCM-git 6b7e8b4f5b
UseDelay + ItemCooldown merge (#22502)
(cherry picked from commit 9c522c8b19f7a6f6b396c66342413572a22d7845)
2024-01-26 21:32:09 +01:00
Nemanja 30fccbbc8d
Chill bounties + fixes (#23411)
* Chill bounties + fixes

* localize

* fix arbitage

(cherry picked from commit 4662d463b8f5cbef5d93ca00b67bae6d8bf5db47)
2024-01-26 21:30:40 +01:00
TemporalOroboros ce27944275
Revert 'Revert 'Solution Entities'' (#23168)
(cherry picked from commit d23c8d5c19e56a582b6b12f832bd318efbdac7c7)
2024-01-23 23:00:42 +01:00
Leon Friedrich b87fcdb622 Remove uses of `TransformComponent.ChildEntities` (#22442)
* Make output of ChildEnumerator non-nullable

* Remove uses of ChildEntities

* poke tests

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-16 20:38:06 +01:00
metalgearsloth b1ee2d48ff Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
Nemanja 87b6876720 Fix double counting bounties (#21399) 2023-11-12 20:35:52 +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
TemporalOroboros 8c55d3e5ce Moves SolutionContainerManagerComponent to Shared. (#20944) 2023-10-14 22:07:17 +02:00
Debug ea39152f39
Reimplement pallet selling (#66) 2023-09-30 01:24:04 +02:00
Jezithyr 363a3b97ff Refactoring body system to use containers and general body cleanup (#20202)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02:00
metalgearsloth f38f0ab614 Predict StorageComponent (#19682) 2023-09-27 21:59:12 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
Leon Friedrich e4ca6f4fb9
Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00
metalgearsloth d1236ff995
Fix cargo trading post (#19656) 2023-08-30 21:02:58 +10:00
DrSmugleaf a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Kara afead24f1e
Rename spacebucks to spesos (#18805) 2023-08-06 23:43:34 -06:00
Leon Friedrich 9c2af43af6
Deduplicate & fix prediction reconciliation test (#18635) 2023-08-04 12:21:44 +10:00
Nemanja da72b802e9
Longer bounties (#18053) 2023-07-15 12:15:12 -06: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
Nemanja 7ab5127286
Cargo Bounties (#17344)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-22 21:49:33 +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
metalgearsloth 7d178555e1
Cargo shuttle fixes (#17118) 2023-06-05 13:37:00 +10:00
metalgearsloth 57858f802f
Shuttle drone improvements (#16931) 2023-05-31 11:13: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
Nemanja 252f0be372
Telepad revival (#16664) 2023-05-21 20:09:31 +10:00
Moony e92a8fedab
Refactor stations to properly use entity prototypes. (stationsv3) (#16570)
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-05-19 15:45:09 -05: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
Nemanja dfc5bcdc12
Convert materials to use PhysicalComposition (#15414) 2023-04-29 14:53:41 +10:00
metalgearsloth e75d9d7e33
Fix accidentally selling mobs (#15578) 2023-04-20 22:09:48 +10:00
Nemanja 57f2a768a0
Material Reclaimer (#14969)
* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary
2023-04-09 23:38:20 -05:00
metalgearsloth b65bfd1fcf
Don't sell non-dead mobs on cargo (#15228) 2023-04-09 11:59:41 +10:00
metalgearsloth a8130f177f
Fix static pricing for stacks (#14865)
Removed BaseItem price as it was always a placeholder and easier to just change without it.
Ensure staticprice is never used if stackprice is present.
Added StackComponent to the test so the behavior matches expectation.
2023-03-26 12:01:42 -05:00
metalgearsloth 377f473ced
Change pricingsystem a bit (#14470) 2023-03-24 15:27:55 +11:00
metalgearsloth 92dff4a630
Fix cargo (again) (#14800) 2023-03-23 19:21:12 +11:00
metalgearsloth 569f30b721
Cargo shuttle changes (#14363) 2023-03-23 16:10:49 +11:00
Checkraze b329abc9ee
Cargo Pallet Sale Console (#14422) 2023-03-13 16:36:35 -04:00
metalgearsloth 86895f9735
Don't preload content maps in tests (#14577) 2023-03-11 12:45:48 +11:00
metalgearsloth 6157dfa3c0
Salvage dungeons (#14520) 2023-03-10 16:41:22 +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
Visne 7f8860187e
Make pricing system aware of SpawnItemsOnUseComponent (#13626)
* Make appraisal tool aware of SpawnItemsOnUseComponent

* Move to SpawnItemsOnUseSystem
2023-02-28 07:55:25 -08:00
Visne c6d3e4f3bd
Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
eoineoineoin bda5f8248f
Improve Paper UI, allow an to entity configure how it's UI looks (#13494)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-17 19:32:46 +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
Jezithyr eeb5b17b34
Mobstate Refactor (#13389)
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-01-13 16:57:10 -08:00
Checkraze 66a01ccbf2
cargo system cleanup (#13396) 2023-01-10 20:55:59 +11:00
Leon Friedrich 1f5bae751f
MaterialComponent cleanup (#13326) 2023-01-07 14:36:32 -08:00
Checkraze 1edd00e50c
makes GetDocks and FoundOrganics public (#13260) 2023-01-01 17:44:30 +11:00
Nemanja faca40b8d5
more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-25 05:28:21 +01:00
Jezithyr 5f9b4adf47
Cleaned up obsolete properties from MobStateComponent (#13097)
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-12-19 21:25:35 -06:00
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Pieter-Jan Briers 55c61b9c35
Config presets system. (#12824) 2022-12-16 23:26:24 +01:00
Chief-Engineer eb18363bd2
Add multiple logs (#12857) 2022-12-15 19:33:27 +01:00
metalgearsloth 3b3963083b
Replace GridEntityId with Owner (#12743) 2022-12-12 14:59:02 +11:00
metalgearsloth 6c76061887
Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
DrSmugleaf 7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
corentt f9bf24f903
Price of food depends on its nutritional capacity (#11752)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
fixes https://github.com/space-wizards/space-station-14/issues/11464
2022-11-15 22:51:30 +11:00
metalgearsloth 6ab864fcda
Update content to mapsystem (#12387) 2022-11-13 17:47:48 +11:00
metalgearsloth c0abea8047
Content side for removing IMap / IMapGrid comps (#12357) 2022-11-04 10:12:25 +11:00
metalgearsloth c9a2ab1cee
Remove transform methods from mapgrid (#12233) 2022-11-01 11:27:18 +11:00
Leon Friedrich 12503e57a5
Fix construction/crafting and maybe cargo selling (#12306) 2022-10-31 13:26:05 +11:00
DrSmugleaf f323fb7644
ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-10-22 15:46:28 -07:00
metalgearsloth fae8b0173b
Fix cargo order amounts (#12070) 2022-10-22 14:55:13 -07:00
metalgearsloth 434da2df36
Use query for cargo sell blacklist (#11887) 2022-10-15 13:17:03 -07:00
metalgearsloth 0b38589728
Raise power events by ref and not broadcast (#11923)
Also some other minor stuff.
2022-10-14 23:08:15 -05:00
Leon Friedrich 41b1044ddb
Unrevert "Remove references to obsolete GridId" (#11531) (#11801) 2022-10-10 08:41:32 +11:00
metalgearsloth 0c7d4acd7b
Revert "Remove references to obsolete GridId" (#11790) 2022-10-09 17:33:23 +11:00
SpaceManiac 0048dc5919
Remove references to obsolete GridId (#11531) 2022-10-09 16:23:49 +11:00
Nemanja 2e7dcb1ed8
Lathe Refactor and ECS (#11201)
* lathe and material storage refactor

* materialStorage ECS

it kinda sus tho

* beginning the lathe shitcode dive

* couple lathe visuals and lathe system

* lathe changes and such

* dynamic lathe databases

* rewrote internal logic

on to ui

* da newI

* material display clientside

* misc ui changes

* component state handling and various other things

* moar

* Update Content.Shared/Lathe/LatheComponent.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* first volley of sloth review

* more fixes

* losin' my mind

* all da changes

* test fix and other review

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-09-16 18:49:05 -05:00
metalgearsloth ed442a7d3b
Cargo price tweaks 2 (#11307)
* Cargo price tweaks 2

* Allow cargo selling dead organics
2022-09-15 12:29:07 -05:00
metalgearsloth ad7a851e27
Cargo economy balance (#11123)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2022-09-15 11:53:17 +10:00
rolfero d793a538af
appraisal verb (#11226)
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
2022-09-13 23:19:04 +10:00
Leon Friedrich c65d1c51ce
Load grid error related changes (#10817) 2022-08-25 23:33:40 +10:00
metalgearsloth 797a11a6ed
Fix cargo shuttle (#10397) 2022-08-08 09:22:46 +10:00
Kara 5784c248ac
Nuke anchor fixes + cargo sell blacklist (#10286) 2022-08-03 20:01:14 -07:00
Leon Friedrich c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
Rane 491a1f3b60
Add public method to update cargo bank account (again) (#9761) 2022-07-15 06:20:35 -07:00
Leon Friedrich e17c89eac4
Identity popup fixes (#9743) 2022-07-15 01:10:52 -07:00
metalgearsloth 1251b3aeda
Add FTL destinations (#9685) 2022-07-15 14:11:41 +10:00
Rane f88104ed4f
public method to add/subtract from cargo bank account (#9614) 2022-07-10 18:59:24 -05: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 5885e108ae
Fix master merge (#9254) 2022-06-28 23:39:48 +10:00
metalgearsloth e72e060972
Don't load cargo shuttle by default (#9194)
* Don't load cargo shuttle by default

Realistically only I am going to care and it wastes a few seconds per test / debugging locally.

* Make it a general cvar instead

* a
2022-06-27 14:58:40 +10:00
Kara 732400e0f6
Rename credits to spacebucks & integrate with cargo (#9119) 2022-06-24 07:43:44 -07:00
metalgearsloth 77a8e16104
Add cargo shuttle (#8686) 2022-06-23 14:36:47 +10:00