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
..
apc.rsi	apc touchup sprite (#30460)	2024-08-02 17:19:25 +10:00
borg_charger.rsi	Borgs (#18136)	2023-08-12 16:39:58 -05:00
cable_terminal.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
Cables	make laid power cables more visible v2 (#32008)	2024-09-09 13:15:22 -06:00
cage_recharger.rsi	Star Wars 14: Shuttle weapon update (#23644)	2024-01-21 19:58:40 +11:00
cell_recharger.rsi	machine parts + power cell resprite (#23913)	2024-01-10 23:06:01 -07:00
Generation	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
power.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
smes.rsi	Adds Advanced SMES, an SMES with higher capacity for mapping (#33757)	2024-12-18 00:58:53 +01:00
substation.rsi	Substation origin sprites (#2298)	2024-06-21 04:40:56 +03:00
turbo_recharger.rsi	Turbo Recharger (#23723)	2024-01-08 00:15:13 -07:00
wall_recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00