Vigers Ray 5d2cdd3f44 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Server/Roles/Jobs/JobSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Entities/Objects/Tools/lighters.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Recipes/Lathes/machine_boards.yml # Resources/Prototypes/Species/vox.yml		2025-04-21 08:56:50 +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	change MV cable outline (#36751)	2025-04-20 16:30:37 -04: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 'space-wizards/master'	2025-03-25 11:30:01 +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