VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Systems	Rodents can be Faxecuted (executed via Fax machine) (#21461)	2024-04-27 23:50:57 +10:00
AdminFaxEui.cs	Add an option to the admin fax menu to lock papers such that they can't be edited by cybersun pens (#28972)	2024-07-10 15:28:36 +10:00
DamageOnFaxecuteEvent.cs	Rodents can be Faxecuted (executed via Fax machine) (#21461)	2024-04-27 23:50:57 +10:00
FaxVisuals.cs	Fax Machine (#11704)	2022-12-12 05:06:11 +11:00
SharedFax.cs	feat(fax): Fax machines print, copy, and send paper labels (#25979)	2024-04-28 16:12:45 +10:00