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
..
Assorted	Разумная болезнь опять (#157)	2024-08-14 22:17:14 +03:00
TraitSystem.cs	Fix imports	2024-11-19 21:16:49 -08:00