Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +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
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	Генератор Супер материи (#399)	2024-09-26 20:09:27 +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