Vigers Ray
4c5854ea7b
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/smites.ftl
# Resources/Locale/en-US/_strings/reagents/frostoil.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/migration.yml
2025-02-04 04:18:31 +03:00
BarryNorfolk
18592148f7
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-01-30 09:27:36 -08:00
Vigers Ray
486b666199
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/migration.yml
2025-01-02 21:12:06 +03:00
Dylan Hunter Whittingham
39ee853801
Added pricegun sound ( #34119 )
...
added pricegun sound
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
2025-01-02 17:46:13 +01:00
Rinary
612f8ca9aa
Фикс всей локализации ( #496 )
...
* cargo product loc
* first cargo product translate
* second cargoproduct translate
* roadmap has optional localization
* upd
* 2024 roadmap translate
* full ru roadmap goals translate moved to russian loc
* translate some roadmap 2025
* roadmap fully translate
* holidays translate
* donation plinks rework
* translate categories
* translate planet prison objective
* translate evil twin objectives
* translate fugitive objectives
* fix planet prisoner dir
* upd
* no more planet prison dir
* partial toys translate
* fully translate toys
* lockbox loc fix
* fix Suntick loc
* fix tape loc
* borg modules translate
* translate borg tools and nanopaste
* upd
* boombox translate
* translate pda's and hand_teleporter
* reinforcement radio translate
* donation plinks translate
* barber items translate
* tape player translate
* ID cards translate
* computers translate
* translate corporate laws
* pepper spray translate
* flippo lighter translate
* magistrat's rubber stamp translate
* translate some ammunition
* clear no need desc
* translate SMGS
* fix
* Finaly guns translating
* translate clocks
* translate misc
* some cloaks translate
* fully cloaks translate
* belts translate
* translate all masks
* translate boots
* all backpacks translate
* glasses translate
* gloves translate
* bras translate
* fix rsi validator
* translate jumpskirt's
* jumpsuits translate
* security pilot's jumpsuit translate
* translate hardsuit helmets
* translate hood
* hats translate
* helmets translate
* men's underpants translate
* translate women's pants
* hardsuits translate
* fix pant desc
* translate armor
* translate coats
* translate captain's overcoat
* socks translate
* big boxes translate
* translate lockers
* power translate
* translate barber pole
* poster translate
* translate chairs
* translate vending_machines
* translate pacificator
* translate computers
* clowns ghost role translate
* translate eviltwin ghost role
* translate predator name
* another player species translate
* translate foliant
* translate borg chassis
* shuttle markers translate
* translate job spawners
* ghost roles spawners translate
* actions translate
* stacks translate
* some fixes
* uplink catalog fully translate
* return hypo on uplink
* sponsor uplink catalog translate start
* new sponsor uplink translation
* fully translate sponsor uplink catalog
* translate lockers
* translate kits
* translate syndicate boombox bundle
* predator organs translate
* body prototypes translate
* humanoid xeno organs translate
* predator body parts translate
* xenomorph body parts translate
* tajaran body parts translate
* translate disease
* species translate
* translate speech emotes
* upd
* translate frontier rules
* translate lust rules
* translate default rules
* crafting translate
* holy shit, last fixes
* no checks if you not changes prototypes
* fix
* fix linter
* fix sponsor uplink catalog
* second fix
* fix socks
* last fix
* xd
* fix
* upd locale, ALL En-US prototypes translated
* upd
* upd locale validator, checks for non lokalized strings in ru-RU
* some translations
* clear
* gaaaaaaaaaay pin
* upd
* upd
* fix
* fix linter
* translate toys
* translate
* upd
* fix
* upd
* fix
* fix linter
* upd
* fix
* better construction graph translation
* start reworking construction menu translation
* some new translations
* fix
* upd translations
* пу-пу-пу
* fix
* upd
* upd, sunrise strings in en-us
* upd
* translate voice-mask
* translate guns
* energy gun translate
* server info translate
* bar signs translate
* translate ui tabs
* translate reagent effect
* translate revenant-catalog
* translate categories
* general translate
* friends translate
* Sponsor uplink fixes|Translate
* some fixes
* translate Security, Hos, QM sponsor uplink
2024-10-30 10:04:15 +03:00
beck-thompson
7485411ab2
Predict appraisal tool verb! ( #32496 )
...
* First commit
* Network :(
2024-09-28 14:40:24 +10:00
Fildrance
6380a9adca
feat: now when research is unlocked in console, approver of reasearch is radio-ed too ( #31170 )
...
* feat: now when research is unlocked in console, approver of reasearch is radio-ed too
* refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms)
* refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders
* remove unused check
* refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore)
* refactor: removed unuseed usings
* feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2024-09-03 23:01:38 +10:00
metalgearsloth
a89d4c750b
Power stuff ( #31314 )
...
* Power stuff
- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.
* big update
* boing
2024-08-25 22:18:42 +10:00
lzk
da5918c951
FINALLY FIX APPROVER IN CARGO INVOICE!!! ( #29690 )
...
* OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!!
* change some logic
2024-07-28 23:19:43 -07:00
deltanedas
87f7ea8aa9
make cargo balance ui updating its own component ( #28295 )
...
* add BankClientComponent and event
* query BankClient instead of hardcoded CargoOrderConsole for updating
* add BankClient to all ordering consoles
* :trollface:
* add Balance field to BankClient
* forgor
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* m
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-13 16:11:14 +10:00
slarticodefast
c740fbc68c
Cargo bounty corrections ( #28255 )
...
cargo bounty corrections
2024-05-27 17:51:50 -07:00
Nemanja
1bfc63c546
fix cargo teleporter ( #27255 )
...
* fix cargo teleporter
* don't delete orders
* basado
2024-04-23 22:07:12 +10:00
icekot8
fd109d61b8
cargo console radio messages on approving ( #27038 )
...
* 1
* void --> "Unknown"
2024-04-17 17:32:21 -07:00
Killerqu00
fd067731b5
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
2024-04-09 18:18:07 -04:00
Nemanja
a9e89ab372
Rip out remaining machine upgrades ( #24413 )
...
* Rip out remaining machine upgrades
* eek
2024-01-23 09:13:04 +11:00
Nemanja
21e77dffb0
Fix cargo product groups ( #24212 )
2024-01-20 14:47:08 +11:00
metalgearsloth
ad23facb7a
Add ability to put spesos into cargo console ( #24263 )
...
I thought we had it already but maybe it was an unfinished pr or something.
2024-01-19 18:23:07 +11:00
metalgearsloth
a7388e5c05
Add trade stations ( #23863 )
...
* puters
* Start on fulfillment
* weh
* Smol update
* FTL sound fixes or smth iunno
* Add consoles
* More tweaks
* Make it unanchorable
* final wehs
* weh
* Fix 1 test
* Shrimply bump the distance
* cat
2024-01-19 13:02:28 +11:00
Nemanja
4662d463b8
Chill bounties + fixes ( #23411 )
...
* Chill bounties + fixes
* localize
* fix arbitage
2024-01-03 17:34:47 -07:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
b0b1597aad
Fix cargo gifts ( #18449 )
...
Some of the IDs were invalid and no typeserializer.
2023-07-30 12:53:54 -06:00
Leon Friedrich
385b587cfc
Validate prototype ids in c# fields ( #18224 )
2023-07-30 03:34:51 +10:00
Leon Friedrich
f2bfdd8e17
Remove superseded machine linking code ( #18244 )
2023-07-24 12:07:35 +10:00
LankLTE
1dadc70757
Buff the Cargo Telepad Delay. ( #17781 )
2023-07-01 12:00:33 -07: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
57858f802f
Shuttle drone improvements ( #16931 )
2023-05-31 11:13:02 +10:00
Nemanja
252f0be372
Telepad revival ( #16664 )
2023-05-21 20:09:31 +10:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +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
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
DrSmugleaf
7fbc2608e8
Remove redundant read-only VV from datafields ( #12626 )
2022-11-16 20:22:11 +01:00
corentt
caea631ac6
Allow aghost to accept order from cargo request console ( #11552 )
2022-09-29 12:23:31 +10: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
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
a3c87f5d62
Update CargoShuttleComponent.cs ( #9333 )
2022-07-01 13:33:18 -07:00
metalgearsloth
77a8e16104
Add cargo shuttle ( #8686 )
2022-06-23 14:36:47 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
20kdc
2e0fcbab5a
Remove GalacticMarket component ( #7914 )
2022-05-03 19:51:25 -07:00
Paul Ritter
2ff40d5a1f
Serv3 rework content changes ( #7145 )
2022-04-03 02:01:22 +02:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
metalgearsloth
334568dad2
ECS cargo telepad and cleanup ( #6450 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-02-15 15:01:45 +11:00
wrexbe
17db0775c8
Auto comp ( #6416 )
2022-02-02 14:35:40 +11:00
metalgearsloth
2b3e144549
Add test for cargo products ( #5470 )
2021-11-28 22:24:09 +11:00
