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
..
Names	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
adjectives.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03:00
ion_storm.yml	Upstream #1532 locale Patch (#1536)	2023-10-30 02:37:31 +03:00
news.yml	Perform CentCom-ification (#9876)	2022-07-19 21:08:24 -07:00
rat_king_commands.yml	Translate rat_king_commands.yml (#1456)	2023-09-25 15:35:29 +03:00
tips.yml	Minor tips update (#20505)	2023-09-26 09:13:55 -08:00
verbs.yml	remove sus codewords (#20060)	2023-09-12 00:37:43 -05:00