# Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml # Resources/migration.yml |
||
|---|---|---|
| .. | ||
| containers.yml | ||
| examine_messages.yml | ||
| groups.yml | ||
| modifier_sets.yml | ||
| types.yml | ||