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
..
Antagonist	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-13 04:35:52 +03:00
Cargo	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-09 22:32:37 +03:00
ChemicalTabs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-08 02:55:27 +03:00
Controls	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-09 03:03:59 +03:00
Engineering	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
Medical	upstream	2024-09-16 12:40:23 +03:00
Mobs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-16 23:44:23 +03:00
NewPlayer	Guidebook typo fixes (#31159)	2024-08-18 11:31:48 -04:00
ReferenceTables	[RU] Полный перевод (#236)	2024-08-14 21:44:32 +03:00
Science	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-13 02:10:38 +03:00
Security	починил говно	2025-02-04 03:42:10 +03:00
ServerRules	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
Service	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-29 19:02:59 +03:00
Chemicals.xml	Special reagents now appear in the guidebook (#34265)	2025-01-07 18:45:02 +01:00
Command.xml	Апстрим перевода (#327)	2024-08-28 22:28:37 +03:00
Glossary.xml	Guidebook typo fixes (#31159)	2024-08-18 11:31:48 -04:00
Jobs.xml	Большие изменения (#345)	2024-09-16 19:05:38 +03:00
References.xml	[RU] Полный перевод (#236)	2024-08-14 21:44:32 +03:00
SpaceStation14.xml	new station and shifts guide (#28799)	2024-06-09 14:03:47 -04:00
Survival.xml	Guidebook typo fixes (#31159)	2024-08-18 11:31:48 -04:00
Writing.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00