VigersRay 7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml		2024-06-07 11:28:58 +03:00
..
Consumable	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-07 11:28:58 +03:00
Decoration	Stalagmite Changes (#25646)	2024-02-27 22:24:17 +03:00
Devices	Респрайт скафандра ниндзя и аплинка (#29)	2024-06-07 11:11:45 +03:00
Economy/cash.rsi	Plates & Cash gridinv visuals (#24075)	2024-01-14 11:44:17 -05:00
Fun	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Magic/magicactions.rsi	Infinity books (#25840)	2024-04-01 14:00:10 -07:00
Materials	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Misc	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Power	Portable Recharger: Arsenal T3 (#26655)	2024-04-28 13:19:33 +10:00
Specific	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 23:38:42 +03:00
Storage	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Tanks	Emergency Tank + Plasma Can visible on suit storage slot (#27598)	2024-05-06 00:42:22 +03:00
Tiles	Clockwork structures and furniture (#24673)	2024-03-06 03:25:59 +03:00
Tools	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Vehicles	ATV resprite (#25885)	2024-03-07 08:36:00 +03:00
Weapons	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00