NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-17 14:21:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
CatStation/Content.Server/Fax
History
Exact
Morb0 1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
..
AdminUI Remove ghost compref (#19478) 2023-08-25 18:50:46 +10:00
FaxConstants.cs Improve Paper UI, allow an to entity configure how it's UI looks (#13494) 2023-01-17 19:32:46 +11:00
FaxMachineComponent.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-24 22:01:46 +03:00
FaxSystem.cs Remove usages of obsolete MetaDataComponent setters (#19582) 2023-08-28 19:20:31 +10:00