Morb0 caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/wrench.rsi/meta.json		2023-12-08 13:54:31 +03:00
..
Consumable	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Decoration	Cave Decoration pack (#21265)	2023-10-26 21:58:27 -04:00
Devices	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Economy/cash.rsi	Space Cash Sprite Tweak (#9120)	2022-06-24 07:45:32 -07:00
Fun	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00
Magic	[Resprite] Books (#421)	2022-09-25 17:11:56 -07:00
Materials	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-09 01:09:14 +03:00
Misc	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-05 07:42:45 +03:00
Power	Potato battery update + potato AI (#21142)	2023-10-26 00:52:49 +11:00
Specific	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Storage	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00
Tanks	Adds Emergency Nitrogen Tanks (#22142)	2023-12-05 02:41:39 -07:00
Tiles	Mining things (#21909)	2023-11-27 14:25:15 -07:00
Tools	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Vehicles	[Trait] Wheelchair bound (#18785)	2023-08-07 18:28:59 -06:00
Weapons	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00