Morb0 918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json		2023-12-25 21:03:49 +03:00
..
Consumable	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Decoration	Added ashtrays (#22837)	2023-12-21 21:21:01 -07:00
Devices	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-25 21:03:49 +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-12-23 02:53:18 +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-12-18 01:51:30 +03:00
Misc	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-25 21:03:49 +03:00
Power	Potato battery update + potato AI (#21142)	2023-10-26 00:52:49 +11:00
Specific	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Storage	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
Tanks	Add extended/double emergency nitrogen tanks (#22354)	2023-12-13 20:35:38 -08:00
Tiles	Faux astro-tiles for science & mappers (#22586)	2023-12-16 01:20:57 -07:00
Tools	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Vehicles	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-25 21:03:49 +03:00