Vigers Ray cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/UserInterface/Controls/RadialContainer.cs # Content.Server/Lathe/LatheSystem.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Wieldable/SharedWieldableSystem.cs # Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml # Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/RTG.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png # Resources/migration.yml		2025-01-30 11:33:49 +03:00
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +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