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	Hivelord mob (#31322)	2024-09-11 09:52:27 -04:00
Events	Fix stun baton throwing and visual effect (#18777)	2023-08-08 12:19:31 -08:00
ForceSay	Fix glorfcode for real (#22838)	2023-12-21 16:23:22 -08:00
Prototypes	Added localization of groups and types: damage, metabolism (#27368)	2024-04-28 14:48:19 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-20 17:50:33 +03:00
DamageModifierSet.cs	fix cauterization (#23264)	2024-01-01 00:08:25 -08:00
DamageSpecifier.cs	Хирургия (#607)	2024-11-13 04:05:51 +03:00
DamageSpecifierDictionarySerializer.cs	Add SaveLoadSavePrototype test (#18859)	2023-08-08 17:27:16 +10:00
DamageVisualizerKeys.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00