corvax-team/ss14-wl
1
0
Fork 0
mirror of https://github.com/corvax-team/ss14-wl.git synced 2026-02-15 03:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7966a9b158d3d3db3fad198f33d4ea3ec4dbbbbc
ss14-wl/Content.Server/Telephone
History
Morb0 6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Telephone/TelephoneSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Chemicals.xml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2025-01-12 19:59:31 +03:00
..
TelephoneSystem.cs
Merge remote-tracking branch 'wizards/master' into upstream-sync
2025-01-12 19:59:31 +03:00