# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Clothing/Systems/ChameleonClothingSystem.cs # Content.Server/PDA/PdaSystem.cs # Resources/Prototypes/Entities/Objects/Devices/pda.yml |
||
|---|---|---|
| .. | ||
| Ringer | ||
| PdaSystem.cs | ||
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Clothing/Systems/ChameleonClothingSystem.cs # Content.Server/PDA/PdaSystem.cs # Resources/Prototypes/Entities/Objects/Devices/pda.yml |
||
|---|---|---|
| .. | ||
| Ringer | ||
| PdaSystem.cs | ||