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
..
barricades.rsi	Ports /vg/station barricade sprites & slightly buffs them (#19840)	2023-09-16 05:50:48 -07:00
cargo_pallets.rsi	Make cargo pallets smoothing with eachother (#27049)	2024-04-17 23:22:09 +10:00
cargo_telepad.rsi	Telepad revival (#16664)	2023-05-21 20:09:31 +10:00
catwalk.rsi
conveyor.rsi
cryostorage.rsi	Cryogenic Sleep Units (#24096)	2024-01-14 23:35:28 -07:00
Decoration	Роли СССП для Ивентов, и их вещи. (#882)	2024-12-21 18:06:05 +03:00
dispensers.rsi
Doors	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
Furniture	Fixes some common iconsmoothing oddities (#32051)	2024-09-10 17:20:49 -06:00
Holo	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Hydroponics	Made hydroponics alert light more orange (#31088)	2024-08-18 20:48:47 -06:00
Lighting/LightPosts/small_light_post.rsi	Post light update (#25814)	2024-03-06 04:39:47 +03:00
Machines	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-16 20:00:41 +03:00
Magic
meat_spike.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
monitors.rsi	[QOL] Removed unnecessary delays in some old texture meta.json files (#15378)	2023-04-16 23:50:37 -06:00
Piping	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
plastic_flaps.rsi
Power	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
Shuttles
smalldispensers.rsi
Specific	Christmas anomaly (#33889)	2024-12-16 22:23:31 +03:00
stairs.rsi	Stairs palette resprite (#2223)	2024-06-09 01:27:10 +03:00
Storage	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +03:00
Wallmounts	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
Walls	Sunrise Plasma Station (#1161)	2025-01-22 05:55:27 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-14 03:15:01 +03:00