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
..
Guidebook	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
Gameplay.txt	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Intro.txt	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
RP_Rules.txt	Revolutionary rules (#19654)	2023-08-31 02:30:08 -05:00
Rules.txt	Minor rule change to include disability slurs in rules (#21518)	2023-11-07 17:54:42 -06:00
RulesCorvax.txt	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Sandbox.txt	Rename "Server Info" to ServerInfo (#15436)	2023-04-16 10:55:59 +10:00