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
Plykiya
75e469738c
Fixes debug assertion crash when inserting cash ( #34812 )
2025-02-02 20:39:23 +01:00
Milon
5be5ee9832
fix BankClientComponent never updating ( #33123 )
...
* fix
* oh right
2025-01-30 17:49:03 +01:00
Vigers Ray
cef39bc293
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Controls/RadialContainer.cs
# Content.Server/Lathe/LatheSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/migration.yml
2025-01-30 11:33:49 +03:00
ScarKy0
253a9fbdf1
Seperate EMAG into EMAG and Authentication Disruptor ( #34337 )
2025-01-29 23:05:47 -05:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03: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
VigersRay
911c3b3fb4
Реворк карго, реалистичный роадмап
2024-08-30 20:05:19 +03:00
Plykiya
01e1624567
Move PaperSystem to Shared ( #30592 )
...
* Fix paper system late localization
* IS THIS WHAT YOU WANT
* well I guess this is happening now
* fix the BUI
* did that even do anything before?
* again with the escapeformatting...
* Dirtying
* Move dirty to function
* Rename PaperSystem to PaperVisualizerSystem
* Fix namespace
* how many namespace changes must I suffer through
* SetContent is for Setting Content
* minor shuffling
* review
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-08-05 14:23:23 +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
lzk
c3720f9fd9
Add order quantity to cargo invoice label ( #28821 )
2024-06-13 10:36:38 -08:00
eoineoineoin
229f6d697c
Objects ordered through cargo system shouldn't start anchored ( #28115 )
...
* Order normal space heater instead of anchored variant
* Make sure ordered objects don't spawn anchored
* Order space heater flatpack instead of a regular space heater
* Remove obsolete TODO
* Remove unnecessary name
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-05-25 16:26:48 -04:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10: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
wafehling
c0bbbc33c1
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>
2024-03-14 10:26:25 +11:00
Flesh
aa4e7c0619
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.
2024-02-25 18:36:22 +11:00
themias
3933490962
Fix centcom cargo gifts ( #24701 )
2024-01-30 04:05:20 -07:00
Nemanja
21e77dffb0
Fix cargo product groups ( #24212 )
2024-01-20 14:47:08 +11:00
metalgearsloth
f82fd23f2c
Clear cargo orders on approval ( #24278 )
2024-01-19 20:32:33 +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
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10: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
