VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
Antagonist	Большие изменения (#345)	2024-09-16 19:05:38 +03:00
Cargo	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-09 22:32:37 +03:00
ChemicalTabs	upstream	2024-09-16 12:40:23 +03:00
Controls	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-09 03:03:59 +03:00
Engineering	Большие изменения (#345)	2024-09-16 19:05:38 +03:00
Medical	upstream	2024-09-16 12:40:23 +03:00
Mobs	Апстрим перевода (#327)	2024-08-28 22:28:37 +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	Guidebook typo fixes (#31159)	2024-08-18 11:31:48 -04:00
Security	upstream	2024-09-16 12:40:23 +03:00
ServerRules	актуализирован свод правил (#362)	2024-09-16 11:04:39 +03:00
Service	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
Chemicals.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03: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