Morb0 918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json		2023-12-25 21:03:49 +03:00
..
AdminUI	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +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	Add a 'Copy' button to the fax UI (#22027)	2023-12-24 17:08:15 -08:00