Commit Graph

47 Commits

Author SHA1 Message Date
LordCarve 00c952a1d5 Cleanup - Use `RemoveAllChildren()` over `DisposeAllChildren()` (#39848)
* Content - change the (should-be-obsolete) DisposeAllChildren into the more robust RemoveAllChildren.

* Remove duplicate calls.

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-12-29 11:39:11 -06:00
Pieter-Jan Briers b7f297f612 Fix usages of TryIndex() (#39124)
* Fix usages of TryIndex()

Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)

This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)

This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.

Fixes #39115

Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.

* fix tests

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:03 -06:00
pathetic meowmeow a1f3ca6a69 Allow cargo request computers to send orders to the primary account (#37943) 2025-08-07 01:57:30 +02:00
pathetic meowmeow a465f6d0a5
Revert traitor reputation (#3823) 2025-05-22 23:59:12 +01:00
Nemanja 7f7847f043 Salvage Job Board (#37549)
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
2025-05-18 18:21:06 +01:00
deltanedas ac1b82d406
traitor reputation real (#2913)
* add reputation system

* add contracts button to PDA

* give traitors contracts

* add GetRandomObjective to SharedObjectivesSystem

* add TryRemoveObjective overload

* add everything needed for reputation store and objectives

* "ui"

* giant uplink reputation tagging

* prevent buying reputation-locked gear with uplink implant

* :trollface:

* more ui stuff

* :trollface:

* :trollface:

* remove default objectives

* :trollface:

* UI fixes

* stuff

* objective component changes

* add offerings and stuff to yml

* make some objectives work

* make rcd objective real

* more ui fix

* :trollface:

* ui usable

* bunch of low risk objectives

* syndie jail wip

* more wip

* massive amount of work

* add bad guidebooks

* prevent fultoning anchored things

* fixes

* disable claim buttons when no slots are open

* :trollface:

* :trollface:

* :trollface:

* update ui when a slot unlocks

* move rejecting to offerings, remove rescan (automatic now)

* add verb to attach fulton, fix

* dont get objective to ransom/kill someone you already ransomed

* make offering slots random + maximum count in rep level

* :trollface:

* rela

* update syndie jail

* more syndie jail update

* make marshal real

* fix

* fix power room power

* remove access from timer

* :trollface:

* engine

* allow syndicate items on syndie jail

* add ransom ui

* update map loading

* add ransom purchasing to cargo request console

* warn not error for loading

* ui fixes

* final fixy

* mg book fix

* final fixy II

* remove redundant Announcement word

* more []

* end ransom when leaving the jail

* :trollface:

* 10 tc for roundstart traitors

* make nuke core objective work for traitor

* guidebook gaming

* early merge of guidebook comments

* update bunch of objectives

* add min reputation to kill fellow traitor

* guidebook gaming

* evil

* giant stuff

* dont offer dupe objectives

* evil

* pronoun

* fix

* grr

* blacklist assist and DAGD from assist objective

* grr

* fix linter

* remove objectives from traitor rule test

* nuke disk anti-troll

* evil test

* add objectives test to find bad objective groups

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixy

* fix

* fix stuff

* reword ransom announcement

* pro

* goida

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-12 17:16:22 -04:00
pathetic meowmeow 460f8bde37
Speedmerge make departmental orders consoles print slips (#3658)
* Make departmental orders consoles print slips (#36944)

* Make departmental orders consoles print slips

* feed back cycle

(cherry picked from commit cfba56c2b43347b3c31be73c1f5c7e8ffcd7469b)

* DeltaV integration for departmental orders consoles

* test fail unreal

* fix
2025-05-09 23:16:18 +01:00
pathetic meowmeow 1ebfc27635
Make funding allocation computer more configurable (#36790) (#3555)
* Make funding allocation computer more configurable (#36790)

* Make funding allocation computer more configurable

* admin logging

* unused

* ccvar enabled

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
(cherry picked from commit 907f4b39cd40eb0ca4a555400e8088faa3d61d7d)

* It's called logistics

* dv extensions
2025-04-22 19:23:40 +00:00
pathetic meowmeow fd728fdd08
Early cherrypick of Departmental Economy (#36445) (#3458)
* Departmental Economy (#36445)

* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
(cherry picked from commit 12b75beeab27f8905d6d3f07b7bbda2cfd859b5e)

* Fix station income instantly accumulating roundstart (#36572)

Fix station money accumulating roundstart

(cherry picked from commit ed3e4c7d4ea82f000ef963e393d01f73484417a9)

* DeltaV departmental economy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-16 22:05:13 +00:00
BarryNorfolk 18182a7a85 Add history tab to bounty console (#33932)
* Add struct for holding historical data on cargo bounties

* Add localisation strings for bounty history

* Add new XAML entry for display bounty history

* Expand cargo bounty menu to include tabs

* Ensure station databases hold historical bounty data

* Add to the bounty history when removing one from active

* Feed bounty history into cargo's bounty system

* Move tab title setting to constructor

* Remove redundant access specifications

* Remove un-needed override

* Fixup BountyHistoryEntry backing code

* Fix formatting in CargoBountyMenu

* Reformat BountyHistoryData

* Rework TryRemoveBounty to use new Entity type

* Add Enum for showing bounty results

* Rework look and feel of History tab

* Add visible text when no bounties have been completed yet

* Remove control

* Swap default to null

* Reverse ordering of bounties so last entry comes first

* Remove redundant Visible

* Move enum docs into the enum
2025-02-14 16:09:49 +00:00
BarryNorfolk ee50aa7273
Bounty/history improvements (#2743)
* Remove redundant access specifications

* Remove un-needed override

* Fixup BountyHistoryEntry backing code

* Fix formatting in CargoBountyMenu

* Reformat BountyHistoryData

* Rework TryRemoveBounty to use new Entity type

* Add Enum for showing bounty results

* Rework look and feel of History tab

* Add visible text when no bounties have been completed yet

* Remove control

* Swap default to null

* Reverse ordering of bounties so last entry comes first
2025-01-16 20:21:13 +00:00
BarryNorfolk 600ef0e5a6
Add history tab to bounty console (#2473)
* Add struct for holding historical data on cargo bounties

* Add localisation strings for bounty history

* Add new XAML entry for display bounty history

* Expand cargo bounty menu to include tabs

* Ensure station databases hold historical bounty data

* Add to the bounty history when removing one from active

* Feed bounty history into cargo's bounty system
2024-12-18 13:36:06 +00:00
metalgearsloth 87a4203267 Reapply "Remove some BUI boilerplate" (#30214) (#30219)
* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be38677d248ce11f809221230ebe89642.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
2024-08-09 17:52:22 +01:00
Nemanja ac0a73c039 Revert "Remove some BUI boilerplate" (#30214)
Revert "Remove some BUI boilerplate (#28399)"

This reverts commit cbf329a82d77eed2bb5e51666dab5d8a21fd3fff.
2024-08-09 17:52:21 +01:00
metalgearsloth 7af5d3dbaf Remove some BUI boilerplate (#28399)
* Remove some BUI boilerplate

- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.

* More

* moar

* weh

* done

* More BUIs

* More updates

* weh

* moar

* look who it is

* weh

* merge

* weh

* fixes
2024-08-09 17:51:47 +01:00
Killerqu00 e0333ee9de
Skipping bounties (#26537)
* add button to menu

* networking and component work

* try to add access stuff

* main functionality done

* add access lock? I think?

* remove extra line

* fix access system

* move SkipTime to StationCargoBountyDatabaseComponent

* Disable/Enable skip button based on cooldown

* remove debugging

* add access denied sound

* remove DataField tags

* dynamic timer

(cherry picked from commit fd067731b544eb219493338a8fe446c154e880f4)
2024-04-21 21:47:43 +02:00
MODERN ee8e5b4f2f
CargoConsoleMenu localization (#25931)
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons

(cherry picked from commit 6e38b992cfc607e09178efc178b86f35152f0cde)
2024-03-17 14:46:09 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Flesh 34287d692c
Cargo request console search now includes crate descriptions (#25708)
added condition checking description to cargo search

(cherry picked from commit c83ad11be170f860a0fbd5dde257fd0537e89712)
2024-03-07 01:12:17 +01:00
Pieter-Jan Briers ccea85136b
Random spontaneous cleanup PR (#25131)
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
2024-02-18 23:02:29 +01:00
Nemanja 47d24fc3e5
Fix cargo product groups (#24212)
(cherry picked from commit 21e77dffb00d631ea0e6a5c0ad55bed5dcbaa809)
2024-01-26 23:13:54 +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
Vasilis e0988e5c6f Remove cringe hardcodes for background (#20374) 2023-09-27 21:59:12 +02: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 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
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
metalgearsloth ad7a851e27
Cargo economy balance (#11123)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2022-09-15 11:53:17 +10:00
corentt c4fde3b3eb
Add informations to cargo order form (#10513) 2022-09-14 13:20:38 +10:00
wrexbe 56c2ad6a16
Move/Rename stuff (#11209)
-     Change namespace, and folder of FancyWindow to Content.Client.UserInterface.Controls
-     Change xaml reference from ui to controls in some places
-     Change ClientAlertsSystem from internal to public
-     Change namespace, and folder of HighDivider to Content.Client.UserInterface.Controls
2022-09-11 18:56:21 -07:00
Visne e1a0de3bcf
Fix cargo request computer category sorting (#11147)
* Revert "Automatic changelog update"

This reverts commit 18f714efce.

* Fix cargo request computer category sorting
2022-09-09 20:14:17 -07: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
EmoGarbage404 b03bd20ad3
sweeeet carolineeee. bum ba bumb. (#9213) 2022-06-27 13:58:06 +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
20kdc 2e0fcbab5a
Remove GalacticMarket component (#7914) 2022-05-03 19:51:25 -07:00
mirrorcult ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
wrexbe cea1b21832
Fixing some warnings (#6250)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
metalgearsloth bdead40a80
Thrusters (shuttle go nyoom) (#5352) 2021-11-21 17:09:49 +11:00
Visne ac78145b94
Remove encapsulation for previously protected XAML UI fields (#4975) 2021-10-28 14:23:17 +02:00
Visne 86607e4fd6
Cargo console to XAML (#4973)
* Add and rename files

* CargoConsoleOrderMenu to XAML

* Cleanup imports

* Add and rename files

* CargoConsoleMenu to XAML

* Improve code

* CargoOrderRow/CargoProductRow to seperate files

* CargoOrderRow to XAML

* CargoProductRow to XAML
2021-10-22 02:53:18 -07:00
Visne bf493c39b7
Replace most VBox/HBoxContainers with BoxContainers (#4274) 2021-07-18 18:39:31 +02:00
Visne b7dc3c81ae
Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
Galactic Chimp 1b8fb8df1d
#4213 translation string fixes (#4217)
* #4213 some translation string fixes

* #4213 cargo localization string fixes

* #4213 more localization tweaks and fixes

* #4213 - fixed some translation string issues

* #4213 - fixed some translation string issues
2021-07-10 01:14:06 -07:00
Galactic Chimp 392b820796
Removed old Loc.GetString() use instances (#4155)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00
DrSmugleaf ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00