Vigers Ray 8d0ab85920 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Construction/UI/ConstructionMenuPresenter.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl # Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl # Resources/Prototypes/Datasets/Names/borer.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml # Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml # Resources/migration.yml		2024-11-20 17:50:33 +03:00
..
CargoSystem.Bounty.cs	Fix bounties(and potentially other things) running out of ids (#32700)	2024-10-10 16:35:35 +02:00
CargoSystem.cs	feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)	2024-09-03 23:01:38 +10:00
CargoSystem.Orders.cs	upstream	2024-09-16 12:40:23 +03:00
CargoSystem.Shuttle.cs	upstream	2024-09-16 12:40:23 +03:00
CargoSystem.Telepad.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
PriceGunSystem.cs	Predict appraisal tool verb! (#32496)	2024-09-28 14:40:24 +10:00
PricingSystem.cs	.NET 9 forward compatibility changes (#33421)	2024-11-20 11:17:45 +11:00