Morb0 804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Structures/Piping/disposal.rsi/meta.json # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/steel.png		2023-11-22 20:22:45 +03:00
..
Antagonist	Add guidebook for revolutionaries (#20957)	2023-10-13 09:36:41 -08:00
Cargo	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Controls	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Engineering	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
Medical	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Science	Translate Upstream #1512 (#1513)	2023-10-18 23:56:11 +03:00
Security	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Service	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Chemicals.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Jobs.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
SpaceStation14.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Survival.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Writing.xml	Translate Upstream #1362 (#1366)	2023-08-27 04:45:39 +03:00