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
..
Components	Partial buckling refactor (#29031)	2024-06-20 01:14:18 +10:00
Cryostorage	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-20 17:50:33 +03:00
BedSystem.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00